diff --git a/builder/azure/arm/template_factory_test.TestPlanInfo01.approved.json b/builder/azure/arm/template_factory_test.TestPlanInfo01.approved.json
index 30ede3ae4..eb841ab4d 100644
--- a/builder/azure/arm/template_factory_test.TestPlanInfo01.approved.json
+++ b/builder/azure/arm/template_factory_test.TestPlanInfo01.approved.json
@@ -8,6 +8,9 @@
     "adminUsername": {
       "type": "string"
     },
+    "dataDiskName": {
+      "type": "string"
+    },
     "dnsNameForPublicIP": {
       "type": "string"
     },
diff --git a/builder/azure/arm/template_factory_test.TestPlanInfo02.approved.json b/builder/azure/arm/template_factory_test.TestPlanInfo02.approved.json
index 657af585d..9a9f6e523 100644
--- a/builder/azure/arm/template_factory_test.TestPlanInfo02.approved.json
+++ b/builder/azure/arm/template_factory_test.TestPlanInfo02.approved.json
@@ -8,6 +8,9 @@
     "adminUsername": {
       "type": "string"
     },
+    "dataDiskName": {
+      "type": "string"
+    },
     "dnsNameForPublicIP": {
       "type": "string"
     },
diff --git a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment03.approved.json b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment03.approved.json
index cda8c56dc..1f0e43265 100644
--- a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment03.approved.json
+++ b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment03.approved.json
@@ -8,6 +8,9 @@
     "adminUsername": {
       "type": "string"
     },
+    "dataDiskName": {
+      "type": "string"
+    },
     "dnsNameForPublicIP": {
       "type": "string"
     },
diff --git a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment04.approved.json b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment04.approved.json
index 8c922bfa5..24d96726a 100644
--- a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment04.approved.json
+++ b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment04.approved.json
@@ -8,6 +8,9 @@
     "adminUsername": {
       "type": "string"
     },
+    "dataDiskName": {
+      "type": "string"
+    },
     "dnsNameForPublicIP": {
       "type": "string"
     },
diff --git a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment05.approved.json b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment05.approved.json
index 9e66583fb..f4cc6f3ab 100644
--- a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment05.approved.json
+++ b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment05.approved.json
@@ -8,6 +8,9 @@
     "adminUsername": {
       "type": "string"
     },
+    "dataDiskName": {
+      "type": "string"
+    },
     "dnsNameForPublicIP": {
       "type": "string"
     },
diff --git a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment06.approved.json b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment06.approved.json
index ce8b43ed8..0f29794ce 100644
--- a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment06.approved.json
+++ b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment06.approved.json
@@ -8,6 +8,9 @@
     "adminUsername": {
       "type": "string"
     },
+    "dataDiskName": {
+      "type": "string"
+    },
     "dnsNameForPublicIP": {
       "type": "string"
     },
diff --git a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment07.approved.json b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment07.approved.json
index 66cf47288..191719eec 100644
--- a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment07.approved.json
+++ b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment07.approved.json
@@ -8,6 +8,9 @@
     "adminUsername": {
       "type": "string"
     },
+    "dataDiskName": {
+      "type": "string"
+    },
     "dnsNameForPublicIP": {
       "type": "string"
     },
diff --git a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment08.approved.json b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment08.approved.json
index cdabe3c93..f411e5a6e 100644
--- a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment08.approved.json
+++ b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment08.approved.json
@@ -8,6 +8,9 @@
     "adminUsername": {
       "type": "string"
     },
+    "dataDiskName": {
+      "type": "string"
+    },
     "dnsNameForPublicIP": {
       "type": "string"
     },
diff --git a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment09.approved.json b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment09.approved.json
index 5af5b01bc..b9a8c8d79 100644
--- a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment09.approved.json
+++ b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment09.approved.json
@@ -8,6 +8,9 @@
     "adminUsername": {
       "type": "string"
     },
+    "dataDiskName": {
+      "type": "string"
+    },
     "dnsNameForPublicIP": {
       "type": "string"
     },
diff --git a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment10.approved.json b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment10.approved.json
index a9c3d267c..c330259ae 100644
--- a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment10.approved.json
+++ b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment10.approved.json
@@ -8,6 +8,9 @@
     "adminUsername": {
       "type": "string"
     },
+    "dataDiskName": {
+      "type": "string"
+    },
     "dnsNameForPublicIP": {
       "type": "string"
     },
diff --git a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment11.approved.json b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment11.approved.json
index 5ac3905c0..1d777f432 100644
--- a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment11.approved.json
+++ b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment11.approved.json
@@ -8,6 +8,9 @@
     "adminUsername": {
       "type": "string"
     },
+    "dataDiskName": {
+      "type": "string"
+    },
     "dnsNameForPublicIP": {
       "type": "string"
     },
@@ -144,9 +147,9 @@
               "createOption": "Empty",
               "diskSizeGB": 32,
               "lun": 0,
-              "name": "datadisk-1",
+              "name": "[concat(parameters('dataDiskName'),'-1'",
               "vhd": {
-                "uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),'/datadisk-', '1','.vhd')]"
+                "uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),parameters('dataDiskName'), '-1','.vhd')]"
               }
             }
           ],
diff --git a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment12.approved.json b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment12.approved.json
index 4339b1864..ba14d9fd6 100644
--- a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment12.approved.json
+++ b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment12.approved.json
@@ -8,6 +8,9 @@
     "adminUsername": {
       "type": "string"
     },
+    "dataDiskName": {
+      "type": "string"
+    },
     "dnsNameForPublicIP": {
       "type": "string"
     },
@@ -147,7 +150,7 @@
               "managedDisk": {
                 "storageAccountType": "Standard_LRS"
               },
-              "name": "datadisk-1"
+              "name": "[concat(parameters('dataDiskName'),'-1'"
             }
           ],
           "imageReference": {
diff --git a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment13.approved.json b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment13.approved.json
index 9127c3bac..66d3689c5 100644
--- a/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment13.approved.json
+++ b/builder/azure/arm/template_factory_test.TestVirtualMachineDeployment13.approved.json
@@ -8,6 +8,9 @@
     "adminUsername": {
       "type": "string"
     },
+    "dataDiskName": {
+      "type": "string"
+    },
     "dnsNameForPublicIP": {
       "type": "string"
     },
diff --git a/builder/azure/common/template/template_builder.go b/builder/azure/common/template/template_builder.go
index 0fad25bd5..10cfc785a 100644
--- a/builder/azure/common/template/template_builder.go
+++ b/builder/azure/common/template/template_builder.go
@@ -243,7 +243,8 @@ func (s *TemplateBuilder) SetAdditionalDisks(diskSizeGB []int32, dataDiskname st
 	for i, additionalSize := range diskSizeGB {
 		dataDisks[i].DiskSizeGB = to.Int32Ptr(additionalSize)
 		dataDisks[i].Lun = to.IntPtr(i)
-		dataDisks[i].Name = to.StringPtr(fmt.Sprintf("%s-%d", dataDiskname, i+1))
+		// dataDisks[i].Name = to.StringPtr(fmt.Sprintf("%s-%d", dataDiskname, i+1))
+		dataDisks[i].Name = to.StringPtr(fmt.Sprintf("[concat(parameters('dataDiskName'),'-%d'", i+1))
 		dataDisks[i].CreateOption = "Empty"
 		dataDisks[i].Caching = cachingType
 		if isManaged {
@@ -251,7 +252,7 @@ func (s *TemplateBuilder) SetAdditionalDisks(diskSizeGB []int32, dataDiskname st
 			dataDisks[i].ManagedDisk = profile.OsDisk.ManagedDisk
 		} else {
 			dataDisks[i].Vhd = &compute.VirtualHardDisk{
-				URI: to.StringPtr(fmt.Sprintf("[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),'/%s-', '%d','.vhd')]", dataDiskname, i+1)),
+				URI: to.StringPtr(fmt.Sprintf("[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),parameters('dataDiskName'), '-%d','.vhd')]", i+1)),
 			}
 			dataDisks[i].ManagedDisk = nil
 		}
@@ -581,7 +582,10 @@ const BasicTemplate = `{
     },
     "vmName": {
       "type": "string"
-    }
+	},
+	"dataDiskName": {
+		"type": "string"
+	}
   },
   "variables": {
     "addressPrefix": "10.0.0.0/16",
diff --git a/builder/azure/common/template/template_builder_test.TestBuildLinux00.approved.json b/builder/azure/common/template/template_builder_test.TestBuildLinux00.approved.json
index 4ba861566..de63373bb 100644
--- a/builder/azure/common/template/template_builder_test.TestBuildLinux00.approved.json
+++ b/builder/azure/common/template/template_builder_test.TestBuildLinux00.approved.json
@@ -8,6 +8,9 @@
     "adminUsername": {
       "type": "string"
     },
+    "dataDiskName": {
+      "type": "string"
+    },
     "dnsNameForPublicIP": {
       "type": "string"
     },
diff --git a/builder/azure/common/template/template_builder_test.TestBuildLinux01.approved.json b/builder/azure/common/template/template_builder_test.TestBuildLinux01.approved.json
index 5e5b2ea05..981354c91 100644
--- a/builder/azure/common/template/template_builder_test.TestBuildLinux01.approved.json
+++ b/builder/azure/common/template/template_builder_test.TestBuildLinux01.approved.json
@@ -8,6 +8,9 @@
     "adminUsername": {
       "type": "string"
     },
+    "dataDiskName": {
+      "type": "string"
+    },
     "dnsNameForPublicIP": {
       "type": "string"
     },
diff --git a/builder/azure/common/template/template_builder_test.TestBuildLinux02.approved.json b/builder/azure/common/template/template_builder_test.TestBuildLinux02.approved.json
index b3a2e1e73..f7f3bed74 100644
--- a/builder/azure/common/template/template_builder_test.TestBuildLinux02.approved.json
+++ b/builder/azure/common/template/template_builder_test.TestBuildLinux02.approved.json
@@ -8,6 +8,9 @@
     "adminUsername": {
       "type": "string"
     },
+    "dataDiskName": {
+      "type": "string"
+    },
     "dnsNameForPublicIP": {
       "type": "string"
     },
diff --git a/builder/azure/common/template/template_builder_test.TestBuildWindows00.approved.json b/builder/azure/common/template/template_builder_test.TestBuildWindows00.approved.json
index 797081807..1c29ee885 100644
--- a/builder/azure/common/template/template_builder_test.TestBuildWindows00.approved.json
+++ b/builder/azure/common/template/template_builder_test.TestBuildWindows00.approved.json
@@ -8,6 +8,9 @@
     "adminUsername": {
       "type": "string"
     },
+    "dataDiskName": {
+      "type": "string"
+    },
     "dnsNameForPublicIP": {
       "type": "string"
     },
diff --git a/builder/azure/common/template/template_builder_test.TestBuildWindows01.approved.json b/builder/azure/common/template/template_builder_test.TestBuildWindows01.approved.json
index a7230706d..3929a8650 100644
--- a/builder/azure/common/template/template_builder_test.TestBuildWindows01.approved.json
+++ b/builder/azure/common/template/template_builder_test.TestBuildWindows01.approved.json
@@ -8,6 +8,9 @@
     "adminUsername": {
       "type": "string"
     },
+    "dataDiskName": {
+      "type": "string"
+    },
     "dnsNameForPublicIP": {
       "type": "string"
     },
@@ -161,7 +164,7 @@
               "managedDisk": {
                 "storageAccountType": "Premium_LRS"
               },
-              "name": "datadisk-1"
+              "name": "[concat(parameters('dataDiskName'),'-1'"
             },
             {
               "caching": "ReadWrite",
@@ -171,7 +174,7 @@
               "managedDisk": {
                 "storageAccountType": "Premium_LRS"
               },
-              "name": "datadisk-2"
+              "name": "[concat(parameters('dataDiskName'),'-2'"
             }
           ],
           "imageReference": {
diff --git a/builder/azure/common/template/template_builder_test.TestBuildWindows02.approved.json b/builder/azure/common/template/template_builder_test.TestBuildWindows02.approved.json
index ad8d94bfb..1b39bdf23 100644
--- a/builder/azure/common/template/template_builder_test.TestBuildWindows02.approved.json
+++ b/builder/azure/common/template/template_builder_test.TestBuildWindows02.approved.json
@@ -8,6 +8,9 @@
     "adminUsername": {
       "type": "string"
     },
+    "dataDiskName": {
+      "type": "string"
+    },
     "dnsNameForPublicIP": {
       "type": "string"
     },
@@ -158,9 +161,9 @@
               "createOption": "Empty",
               "diskSizeGB": 32,
               "lun": 0,
-              "name": "datadisk-1",
+              "name": "[concat(parameters('dataDiskName'),'-1'",
               "vhd": {
-                "uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),'/datadisk-', '1','.vhd')]"
+                "uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),parameters('dataDiskName'), '-1','.vhd')]"
               }
             },
             {
@@ -168,9 +171,9 @@
               "createOption": "Empty",
               "diskSizeGB": 64,
               "lun": 1,
-              "name": "datadisk-2",
+              "name": "[concat(parameters('dataDiskName'),'-2'",
               "vhd": {
-                "uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),'/datadisk-', '2','.vhd')]"
+                "uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),parameters('dataDiskName'), '-2','.vhd')]"
               }
             }
           ],
diff --git a/builder/azure/common/template/template_builder_test.TestNetworkSecurityGroup00.approved.json b/builder/azure/common/template/template_builder_test.TestNetworkSecurityGroup00.approved.json
index b318164a3..7415524d7 100644
--- a/builder/azure/common/template/template_builder_test.TestNetworkSecurityGroup00.approved.json
+++ b/builder/azure/common/template/template_builder_test.TestNetworkSecurityGroup00.approved.json
@@ -8,6 +8,9 @@
     "adminUsername": {
       "type": "string"
     },
+    "dataDiskName": {
+      "type": "string"
+    },
     "dnsNameForPublicIP": {
       "type": "string"
     },
diff --git a/builder/azure/common/template/template_builder_test.TestSharedImageGallery00.approved.json b/builder/azure/common/template/template_builder_test.TestSharedImageGallery00.approved.json
index 49f2a72a4..4c83d090d 100644
--- a/builder/azure/common/template/template_builder_test.TestSharedImageGallery00.approved.json
+++ b/builder/azure/common/template/template_builder_test.TestSharedImageGallery00.approved.json
@@ -8,6 +8,9 @@
     "adminUsername": {
       "type": "string"
     },
+    "dataDiskName": {
+      "type": "string"
+    },
     "dnsNameForPublicIP": {
       "type": "string"
     },