diff --git a/jenkins-on-ubuntu/jenkmaster-resources.json b/jenkins-on-ubuntu/jenkmaster-resources.json
index d783a87..4afae70 100644
--- a/jenkins-on-ubuntu/jenkmaster-resources.json
+++ b/jenkins-on-ubuntu/jenkmaster-resources.json
@@ -26,6 +26,9 @@
     "vmSize": {
       "type": "string"
     },
+    "dnsName": { 
+      "type": "string"
+    },
     "slaveNodes": {
       "type": "int"
     },
@@ -88,7 +91,7 @@
     {
       "apiVersion": "2015-05-01-preview",
       "type": "Microsoft.Compute/virtualMachines",
-      "name": "[concat(parameters('namespace'), concat(parameters('vmbasename'), 'vm'))]",
+      "name": "[concat(parameters('namespace'), parameters('vmbasename'), 'vm')]",
       "location": "[parameters('region')]",
       "dependsOn": [
         "[concat('Microsoft.Network/networkInterfaces/', concat(parameters('namespace'), concat(parameters('vmbasename'), 'nic')))]"
@@ -107,7 +110,7 @@
           "osDisk": {
             "name": "osdisk",
             "vhd": {
-              "uri": "[concat('http://', parameters('storageAccountName'),'.blob.core.windows.net/vhds/', variables('vmbasename'), '-osdisk.vhd')]"
+              "uri": "[concat('http://', parameters('storageAccountName'),'.blob.core.windows.net/vhds/', parameters('vmbasename'), '-osdisk.vhd')]"
             },
             "caching": "ReadWrite",
             "createOption": "FromImage"
diff --git a/jenkins-on-ubuntu/jenkslave-resources.json b/jenkins-on-ubuntu/jenkslave-resources.json
index a12631a..01126c7 100644
--- a/jenkins-on-ubuntu/jenkslave-resources.json
+++ b/jenkins-on-ubuntu/jenkslave-resources.json
@@ -85,7 +85,7 @@
           "osDisk": {
             "name": "osdisk",
             "vhd": {
-              "uri": "[concat('http://', parameters('storageAccountName'),'.blob.core.windows.net/vhds/', variables('vmbasename'), '-osdisk.vhd')]"
+              "uri": "[concat('http://', parameters('storageAccountName'),'.blob.core.windows.net/vhds/', parameters('vmbasename'), '-osdisk.vhd')]"
             },
             "caching": "ReadWrite",
             "createOption": "FromImage"