diff --git a/terraform/azure/high-availability-existing-vnet/main.tf b/terraform/azure/high-availability-existing-vnet/main.tf
index cd020475..934102da 100755
--- a/terraform/azure/high-availability-existing-vnet/main.tf
+++ b/terraform/azure/high-availability-existing-vnet/main.tf
@@ -360,7 +360,7 @@ resource "azurerm_virtual_machine" "vm-instance-availability-set" {
   }
 
   os_profile {
-    computer_name = "${var.cluster_name}${count.index+1}"
+    computer_name = "${lower(var.cluster_name)}${count.index+1}"
     admin_username = module.common.admin_username
     admin_password = module.common.admin_password
     custom_data = templatefile("${path.module}/cloud-init.sh", {
@@ -454,7 +454,7 @@ resource "azurerm_virtual_machine" "vm-instance-availability-zone" {
   }
 
   os_profile {
-    computer_name = "${var.cluster_name}${count.index+1}"
+    computer_name = "${lower(var.cluster_name)}${count.index+1}"
     admin_username = module.common.admin_username
     admin_password = module.common.admin_password
     custom_data = templatefile("${path.module}/cloud-init.sh", {
diff --git a/terraform/azure/high-availability-new-vnet/main.tf b/terraform/azure/high-availability-new-vnet/main.tf
index 56495095..1506b913 100755
--- a/terraform/azure/high-availability-new-vnet/main.tf
+++ b/terraform/azure/high-availability-new-vnet/main.tf
@@ -379,7 +379,7 @@ resource "azurerm_virtual_machine" "vm-instance-availability-set" {
   }
 
   os_profile {
-    computer_name = "${var.cluster_name}${count.index+1}"
+    computer_name = "${lower(var.cluster_name)}${count.index+1}"
     admin_username = module.common.admin_username
     admin_password = module.common.admin_password
     custom_data = templatefile("${path.module}/cloud-init.sh", {
@@ -473,7 +473,7 @@ resource "azurerm_virtual_machine" "vm-instance-availability-zone" {
   }
 
   os_profile {
-    computer_name = "${var.cluster_name}${count.index+1}"
+    computer_name = "${lower(var.cluster_name)}${count.index+1}"
     admin_username = module.common.admin_username
     admin_password = module.common.admin_password
     custom_data = templatefile("${path.module}/cloud-init.sh", {
diff --git a/terraform/azure/management-existing-vnet/main.tf b/terraform/azure/management-existing-vnet/main.tf
index 7b0d1ffe..a471b842 100755
--- a/terraform/azure/management-existing-vnet/main.tf
+++ b/terraform/azure/management-existing-vnet/main.tf
@@ -259,7 +259,7 @@ resource "azurerm_virtual_machine" "mgmt-vm-instance" {
   }
 
   os_profile {
-    computer_name = var.mgmt_name
+    computer_name = lower(var.mgmt_name)
     admin_username = module.common.admin_username
     admin_password = module.common.admin_password
     custom_data = templatefile("${path.module}/cloud-init.sh", {
diff --git a/terraform/azure/management-new-vnet/main.tf b/terraform/azure/management-new-vnet/main.tf
index 969a62cc..77c16ac6 100755
--- a/terraform/azure/management-new-vnet/main.tf
+++ b/terraform/azure/management-new-vnet/main.tf
@@ -264,7 +264,7 @@ resource "azurerm_virtual_machine" "mgmt-vm-instance" {
   }
 
   os_profile {
-    computer_name = var.mgmt_name
+    computer_name = lower(var.mgmt_name)
     admin_username = module.common.admin_username
     admin_password = module.common.admin_password
     custom_data = templatefile("${path.module}/cloud-init.sh", {
diff --git a/terraform/azure/mds-existing-vnet/main.tf b/terraform/azure/mds-existing-vnet/main.tf
index ff654c86..0c8719f1 100755
--- a/terraform/azure/mds-existing-vnet/main.tf
+++ b/terraform/azure/mds-existing-vnet/main.tf
@@ -259,7 +259,7 @@ resource "azurerm_virtual_machine" "mds-vm-instance" {
   }
 
   os_profile {
-    computer_name = var.mds_name
+    computer_name = lower(var.mds_name)
     admin_username = module.common.admin_username
     admin_password = module.common.admin_password
     custom_data = templatefile("${path.module}/cloud-init.sh", {
diff --git a/terraform/azure/mds-new-vnet/main.tf b/terraform/azure/mds-new-vnet/main.tf
index f3162e70..7f2c1de9 100755
--- a/terraform/azure/mds-new-vnet/main.tf
+++ b/terraform/azure/mds-new-vnet/main.tf
@@ -265,7 +265,7 @@ resource "azurerm_virtual_machine" "mds-vm-instance" {
   }
 
   os_profile {
-    computer_name = var.mds_name
+    computer_name = lower(var.mds_name)
     admin_username = module.common.admin_username
     admin_password = module.common.admin_password
     custom_data = templatefile("${path.module}/cloud-init.sh", {
diff --git a/terraform/azure/single-gateway-existing-vnet/main.tf b/terraform/azure/single-gateway-existing-vnet/main.tf
index 5a61f135..81ced59f 100755
--- a/terraform/azure/single-gateway-existing-vnet/main.tf
+++ b/terraform/azure/single-gateway-existing-vnet/main.tf
@@ -202,7 +202,7 @@ resource "azurerm_virtual_machine" "single-gateway-vm-instance" {
   }
 
   os_profile {
-    computer_name = var.single_gateway_name
+    computer_name = lower(var.single_gateway_name)
     admin_username = module.common.admin_username
     admin_password = module.common.admin_password
     custom_data = templatefile("${path.module}/cloud-init.sh", {
diff --git a/terraform/azure/single-gateway-new-vnet/main.tf b/terraform/azure/single-gateway-new-vnet/main.tf
index b4642666..dcb817bf 100755
--- a/terraform/azure/single-gateway-new-vnet/main.tf
+++ b/terraform/azure/single-gateway-new-vnet/main.tf
@@ -202,7 +202,7 @@ resource "azurerm_virtual_machine" "single-gateway-vm-instance" {
   }
 
   os_profile {
-    computer_name = var.single_gateway_name
+    computer_name = lower(var.single_gateway_name)
     admin_username = module.common.admin_username
     admin_password = module.common.admin_password
     custom_data = templatefile("${path.module}/cloud-init.sh", {
diff --git a/terraform/azure/vmss-existing-vnet/main.tf b/terraform/azure/vmss-existing-vnet/main.tf
index 7cc4399a..70e7169a 100755
--- a/terraform/azure/vmss-existing-vnet/main.tf
+++ b/terraform/azure/vmss-existing-vnet/main.tf
@@ -274,7 +274,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "vmss" {
     }
   }
 
-  computer_name_prefix = var.vmss_name
+  computer_name_prefix = lower(var.vmss_name)
   admin_username = module.common.admin_username
   admin_password = module.common.admin_password
   custom_data = base64encode(templatefile("${path.module}/cloud-init.sh", {
diff --git a/terraform/azure/vmss-new-vnet/main.tf b/terraform/azure/vmss-new-vnet/main.tf
index 967fd8c8..2438915d 100755
--- a/terraform/azure/vmss-new-vnet/main.tf
+++ b/terraform/azure/vmss-new-vnet/main.tf
@@ -270,7 +270,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "vmss" {
     }
   }
 
-  computer_name_prefix = var.vmss_name
+  computer_name_prefix = lower(var.vmss_name)
   admin_username = module.common.admin_username
   admin_password = module.common.admin_password
   custom_data = base64encode(templatefile("${path.module}/cloud-init.sh", {