diff --git a/datastax-on-ubuntu/azuredeploy.json b/datastax-on-ubuntu/azuredeploy.json
index 9ea7ba9..ec73bb4 100644
--- a/datastax-on-ubuntu/azuredeploy.json
+++ b/datastax-on-ubuntu/azuredeploy.json
@@ -78,10 +78,11 @@
     }
   },
   "variables": {
-    "templateBaseUrl": "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/datastax-on-ubuntu/",
+    "templateBaseUrl": "https://raw.githubusercontent.com/trentmswanson/azure-quickstart-templates/master/datastax-on-ubuntu/",
     "sharedTemplateUrl": "[concat(variables('templateBaseUrl'), 'shared-resources.json')]",
     "clusterNodesTemplateUrl": "[concat(variables('templateBaseUrl'), 'ephemeral-nodes-resources.json')]",
     "opsCenterTemplateUrl": "[concat(variables('templateBaseUrl'), 'opscenter-resources.json')]",
+    "opsCenterInstallTemplateUrl": "[concat(variables('templateBaseUrl'), 'opscenter-install-resources.json')]",
     "opsCenterVmSize": "Standard_A1",
     "networkSettings": {
       "virtualNetworkName": "[parameters('virtualNetworkName')]",
@@ -192,9 +193,6 @@
       "name": "ops-center-nodes",
       "type": "Microsoft.Resources/deployments",
       "apiVersion": "2015-01-01",
-      "dependsOn": [
-        "[concat('Microsoft.Resources/deployments/', 'cluster-nodes')]"
-      ],
       "properties": {
         "mode": "Incremental",
         "templateLink": {
@@ -229,6 +227,39 @@
           "vmSize": {
             "value": "[variables('opsCenterVmSize')]"
           },
+          "osSettings": {
+            "value": "[variables('osSettings')]"
+          }
+        }
+      }
+    },
+    {
+      "name": "ops-center-install-nodes",
+      "type": "Microsoft.Resources/deployments",
+      "apiVersion": "2015-01-01",
+      "dependsOn": [
+        "[concat('Microsoft.Resources/deployments/', 'cluster-nodes')]",
+        "[concat('Microsoft.Resources/deployments/', 'ops-center-nodes')]"
+      ],
+      "properties": {
+        "mode": "Incremental",
+        "templateLink": {
+          "uri": "[variables('opsCenterInstallTemplateUrl')]",
+          "contentVersion": "1.0.0.0"
+        },
+        "parameters": {
+          "adminUsername": {
+            "value": "[parameters('adminUsername')]"
+          },
+          "adminPassword": {
+            "value": "[parameters('adminPassword')]"
+          },
+          "namespace": {
+            "value": "opc"
+          },
+          "region": {
+            "value": "[parameters('region')]"
+          },
           "osSettings": {
             "value": "[variables('osSettings')]"
           },
diff --git a/datastax-on-ubuntu/opscenter-install-resources.json b/datastax-on-ubuntu/opscenter-install-resources.json
new file mode 100644
index 0000000..e14f1c8
--- /dev/null
+++ b/datastax-on-ubuntu/opscenter-install-resources.json
@@ -0,0 +1,44 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "region": {
+      "type": "string"
+    },
+    "adminUsername": {
+      "type": "string"
+    },
+    "adminPassword": {
+      "type": "securestring"
+    },
+    "namespace": {
+      "type": "string"
+    },
+    "osSettings": {
+      "type": "object"
+    },
+    "opsCenterSettings": {
+      "type": "object"
+    }
+  },
+  "variables": {
+  },
+  "resources": [
+    {
+      "type": "Microsoft.Compute/virtualMachines/extensions",
+      "name": "[concat(parameters('namespace'), 'vm', '/installopscenter')]",
+      "apiVersion": "2015-05-01-preview",
+      "location": "[parameters('region')]",
+      "properties": {
+        "publisher": "Microsoft.OSTCExtensions",
+        "type": "CustomScriptForLinux",
+        "typeHandlerVersion": "1.2",
+        "settings": {
+          "fileUris": "[parameters('osSettings').scripts]",
+          "commandToExecute": "[concat('bash opscenter.sh -n \"', parameters('opsCenterSettings').clusterName , '\" -u ', parameters('adminUsername'), ' -p ', parameters('adminPassword'), ' -k ' , parameters('opsCenterSettings').adminPassword , ' -ed ', parameters('opsCenterSettings').nodeList)]"
+        }
+      }
+    }
+  ],
+  "outputs": {}
+}
\ No newline at end of file
diff --git a/datastax-on-ubuntu/opscenter-resources.json b/datastax-on-ubuntu/opscenter-resources.json
index 815c8cc..9d2e9fd 100644
--- a/datastax-on-ubuntu/opscenter-resources.json
+++ b/datastax-on-ubuntu/opscenter-resources.json
@@ -29,9 +29,6 @@
     "staticIp": {
       "type": "string"
     },
-    "opsCenterSettings": {
-      "type": "object"
-    },
     "dnsName": {
       "type": "string"
     }
@@ -146,25 +143,6 @@
           ]
         }
       }
-    },
-    {
-      "type": "Microsoft.Compute/virtualMachines/extensions",
-      "name": "[concat(parameters('namespace'), 'vm', '/installopscenter')]",
-      "apiVersion": "2015-05-01-preview",
-      "location": "[parameters('region')]",
-      "dependsOn": [
-        "[concat('Microsoft.Compute/virtualMachines/', parameters('namespace'), 'vm')]",
-        "[concat('Microsoft.Network/networkInterfaces/', parameters('namespace'), 'nic')]"
-      ],
-      "properties": {
-        "publisher": "Microsoft.OSTCExtensions",
-        "type": "CustomScriptForLinux",
-        "typeHandlerVersion": "1.2",
-        "settings": {
-          "fileUris": "[parameters('osSettings').scripts]",
-          "commandToExecute": "[concat('bash opscenter.sh -n \"', parameters('opsCenterSettings').clusterName , '\" -u ', parameters('adminUsername'), ' -p ', parameters('adminPassword'), ' -k ' , parameters('opsCenterSettings').adminPassword , ' -ed ', parameters('opsCenterSettings').nodeList)]"
-        }
-      }
     }
   ],
   "outputs": {}
diff --git a/postgresql-on-ubuntu/database-8disk-resources.json b/postgresql-on-ubuntu/database-8disk-resources.json
index 251a291..4655318 100644
--- a/postgresql-on-ubuntu/database-8disk-resources.json
+++ b/postgresql-on-ubuntu/database-8disk-resources.json
@@ -170,7 +170,7 @@
               "createOption": "Empty"
             },
             {
-              "name": "datadisk7",
+              "name": "datadisk8",
               "diskSizeGB": "[parameters('machineSettings').diskSize]",
               "lun": 7,
               "vhd": {