diff --git a/terraform/modules/vpc/main.tf b/terraform/modules/vpc/main.tf
index 629be9f1..dbbe4bfa 100644
--- a/terraform/modules/vpc/main.tf
+++ b/terraform/modules/vpc/main.tf
@@ -81,7 +81,7 @@ resource "azurerm_subnet" "gateway" {
 
 
 resource "azurerm_public_ip" "vpn_ip" {
-  name                = "test"
+  name                = "${var.name}-${var.environment}-vpn-ip"
   location            = azurerm_resource_group.vpc.location
   resource_group_name = azurerm_resource_group.vpc.name
 
@@ -89,7 +89,7 @@ resource "azurerm_public_ip" "vpn_ip" {
 }
 
 resource "azurerm_virtual_network_gateway" "vnet_gateway" {
-  name                = "test"
+  name                = "${var.name}-${var.environment}-gateway"
   location            = azurerm_resource_group.vpc.location
   resource_group_name = azurerm_resource_group.vpc.name