diff --git a/sharepoint-2016-non-ha/InstallAndConfigureSharePointServer.ps1.zip b/sharepoint-2016-non-ha/InstallAndConfigureSharePointServer.ps1.zip
index 3b352dcc..620bebb5 100644
Binary files a/sharepoint-2016-non-ha/InstallAndConfigureSharePointServer.ps1.zip and b/sharepoint-2016-non-ha/InstallAndConfigureSharePointServer.ps1.zip differ
diff --git a/sharepoint-2016-non-ha/Readme.md b/sharepoint-2016-non-ha/Readme.md
index 5db50dbc..6c9b6342 100644
--- a/sharepoint-2016-non-ha/Readme.md
+++ b/sharepoint-2016-non-ha/Readme.md
@@ -65,11 +65,11 @@ To access the SQL VM use the domain controller or the SharePoint VMs as jumpboxe
 +	sharepoint2016DownloadLink: Direct download link for the SharePoint 2016 with SP1 ISO.
 +	sharepoint2016ProductKey: Product key for SharePoint 2016 with SP1, required for SharePoint setup.
 	
-<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FAzureStack-QuickStart-Templates%2Fdevelop%2Fsharepoint-2016-non-ha%2Fazuredeploy.json" target="_blank">
+<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FAzureStack-QuickStart-Templates%2Fmaster%2Fsharepoint-2016-non-ha%2Fazuredeploy.json" target="_blank">
     <img src="http://azuredeploy.net/deploybutton.png"/>
 </a>
 
-<a href="http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FAzureStack-QuickStart-Templates%2Fdevelop%2Fsharepoint-2016-non-ha%2Fazuredeploy.json" target="_blank">
+<a href="http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FAzureStack-QuickStart-Templates%2Fmaster%2Fsharepoint-2016-non-ha%2Fazuredeploy.json" target="_blank">
     <img src="http://armviz.io/visualizebutton.png"/>
 </a>
 
@@ -125,4 +125,4 @@ New-AzurermResourceGroup -Name $resourceGroupName -Location $location
 
 #Start new Deployment
 New-AzurermResourceGroupDeployment -Name $deploymentName -ResourceGroupName $resourceGroupName `
-      -TemplateParameterFile .\azuredeploy.azurestack.parameters.json -TemplateFile .\azuredeploy.json
\ No newline at end of file
+      -TemplateParameterFile .\azuredeploy.azurestack.parameters.json -TemplateFile .\azuredeploy.json
diff --git a/sharepoint-2016-non-ha/azuredeploy.json b/sharepoint-2016-non-ha/azuredeploy.json
index 1346d704..5dc08602 100644
--- a/sharepoint-2016-non-ha/azuredeploy.json
+++ b/sharepoint-2016-non-ha/azuredeploy.json
@@ -40,8 +40,9 @@
         "sharepoint2016DownloadLink": {
             "type": "string",
             "metadata": {
-                "description": "Direct download link for the SharePoint 2016 trial ISO. For example: http://download.msdn.microsoft.com/pr/en_sharepoint_server_2013_with_sp1_x64_dvd_3823428.iso?t=XXXXXXXXXXXXXXX"
-            }
+                "description": "Direct download link for the SharePoint 2016 trial ISO. For example: http://download.msdn.microsoft.com/pr/en_sharepoint_server_2016_x64_dvd_3823428.iso?t=XXXXXXXXXXXXXXX"
+            },
+            "defaultValue": "https://download.microsoft.com/download/0/0/4/004EE264-7043-45BF-99E3-3F74ECAE13E5/officeserver.img"
         },
         "sharepoint2016ProductKey": {
             "type": "string",
@@ -55,9 +56,9 @@
         "adVMSize": "Standard_A1",
         "sqlVMSize": "Standard_A2",
         "spVMSize": "Standard_A3",
-        "spassetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/master/sharepoint-2016-non-ha",
-        "adAssetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/master/ad-non-ha",
-        "sqlAssetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/master/sql-2014-non-ha",
+        "spassetLocation": "https://raw.githubusercontent.com/NikCharlebois/AzureStack-QuickStart-Templates/Test/sharepoint-2016-non-ha/",
+        "adAssetLocation": "https://raw.githubusercontent.com/NikCharlebois/AzureStack-QuickStart-Templates/master/ad-non-ha",
+        "sqlAssetLocation": "https://raw.githubusercontent.com/NikCharlebois/AzureStack-QuickStart-Templates/master/sql-2014-non-ha",
         "location": "[resourceGroup().location]",
         "vmNetworkSubnet": "10.0.0.0/24",
         "virtualNetworkAddressRange": "10.0.0.0/16",
diff --git a/sharepoint-2016-non-ha/spVMTemplate.json b/sharepoint-2016-non-ha/spVMTemplate.json
index 7c8d58d2..2b0641f4 100644
--- a/sharepoint-2016-non-ha/spVMTemplate.json
+++ b/sharepoint-2016-non-ha/spVMTemplate.json
@@ -21,7 +21,7 @@
             "metadata": {
                 "description": "The SKU Name of Windows Image"
             },
-            "defaultValue": "2012-R2-Datacenter"
+            "defaultValue": "2016-Datacenter"
         },
         "windowsImageVersion": {
             "type": "string",