diff --git a/modules/management/cloud-init.sh b/modules/management/cloud-init.sh
index cd7c697..58fd101 100644
--- a/modules/management/cloud-init.sh
+++ b/modules/management/cloud-init.sh
@@ -3,7 +3,7 @@
 installationType="${installation_type}"
 allowUploadDownload="${allow_upload_download}"
 osVersion="${os_version}"
-templateName="${module_name}"
+templateName="${template_name}"
 templateVersion="${module_version}"
 templateType="${template_type}"
 isBlink="${is_blink}"
diff --git a/modules/management/locals.tf b/modules/management/locals.tf
index 86aa0eb..951a7b5 100644
--- a/modules/management/locals.tf
+++ b/modules/management/locals.tf
@@ -1,6 +1,7 @@
 locals {
   module_name    = "management_terraform_registry"
   module_version = "1.0.9"
+  template_name  = var.enable_ipv6 ? "management_terraform_registry_dual_stack" : "management_terraform_registry"
 
   // Calculate IPv6 NIC address - use vnet module output for consistency with IPv4
   nic_ipv6_address = var.enable_ipv6 ? cidrhost(module.vnet.subnet_ipv6_prefixes[0], 10) : null
diff --git a/modules/management/main.tf b/modules/management/main.tf
index 07e0a4d..4879822 100644
--- a/modules/management/main.tf
+++ b/modules/management/main.tf
@@ -193,7 +193,7 @@ resource "azurerm_virtual_machine" "mgmt_vm_instance" {
       installation_type              = module.common.installation_type
       allow_upload_download          = module.common.allow_upload_download
       os_version                     = module.common.os_version
-      module_name                    = module.common.module_name
+      template_name                  = local.template_name
       module_version                 = module.common.module_version
       template_type                  = "terraform"
       is_blink                       = module.common.is_blink
diff --git a/modules/single-gateway/cloud-init.sh b/modules/single-gateway/cloud-init.sh
index ff60d82..a2d209c 100644
--- a/modules/single-gateway/cloud-init.sh
+++ b/modules/single-gateway/cloud-init.sh
@@ -3,7 +3,7 @@
 installationType="${installation_type}"
 allowUploadDownload="${allow_upload_download}"
 osVersion="${os_version}"
-templateName="${module_name}"
+templateName="${template_name}"
 templateVersion="${module_version}"
 templateType="${template_type}"
 isBlink="${is_blink}"
diff --git a/modules/single-gateway/locals.tf b/modules/single-gateway/locals.tf
index 6238f35..59491bd 100644
--- a/modules/single-gateway/locals.tf
+++ b/modules/single-gateway/locals.tf
@@ -3,4 +3,5 @@ locals {
   module_version = "1.0.9"
   vm_os_sku = var.installation_type == "standalone" ? "mgmt-byol" : var.vm_os_sku
   is_blink = var.installation_type == "gateway"
+  template_name  = var.enable_ipv6 ? "single_terraform_registry_dual_stack" : "single_terraform_registry"
 }
diff --git a/modules/single-gateway/main.tf b/modules/single-gateway/main.tf
index b75bbaf..4c7c9c4 100644
--- a/modules/single-gateway/main.tf
+++ b/modules/single-gateway/main.tf
@@ -295,7 +295,7 @@ resource "azurerm_virtual_machine" "single_gateway_vm_instance" {
       installation_type              = module.common.installation_type
       allow_upload_download          = module.common.allow_upload_download
       os_version                     = module.common.os_version
-      module_name                    = module.common.module_name
+      template_name                  = local.template_name
       module_version                 = module.common.module_version
       template_type                  = "terraform"
       is_blink                       = local.is_blink