diff --git a/azure/nested/psmp-nested-template-v11.3.json b/azure/nested/psmp-nested-template-hybrid.json
similarity index 100%
rename from azure/nested/psmp-nested-template-v11.3.json
rename to azure/nested/psmp-nested-template-hybrid.json
diff --git a/azure/nested/psmp-nested-template-since-v10.7.json b/azure/nested/psmp-nested-template-since-v10.7.json
deleted file mode 100644
index 382664fb..00000000
--- a/azure/nested/psmp-nested-template-since-v10.7.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "VMname": {
-            "type": "string"
-        },
-        "computerName": {
-            "type": "string"
-        },
-        "pvwaUrl": {
-        	"type": "string"
-        },
-        "adminUsername": {
-            "type": "string"
-        },
-        "adminPassword": {
-            "type": "SecureString"
-        },
-        "vmSize": {
-            "type": "string"
-        },
-        "Imageid": {
-            "type": "string"
-        },
-        "NetworkInterfaceName": {
-            "type": "string"
-        },
-        "VaultAdminUser": {
-            "type": "string"
-        },
-        "VaultAdminPassword": {
-            "type": "SecureString"
-        },
-        "VaultPrivateIP": {
-            "type": "string"
-        },
-        "Guid": {
-            "type": "string"
-        }
-    },
-    "variables": {
-        "GuidSubstring": "[take(parameters('Guid'), 15)]"
-    },
-    "resources": [
-        {
-            "type": "Microsoft.Compute/virtualMachines",
-            "name": "[parameters('VMname')]",
-            "apiVersion": "2017-03-30",
-            "location": "[resourceGroup().location]",
-            "properties": {
-                "osProfile": {
-                    "computerName": "[parameters('computerName')]",
-                    "adminUsername": "[parameters('adminUsername')]",
-                    "adminPassword": "[parameters('adminPassword')]"
-                },
-                "hardwareProfile": {
-                    "vmSize": "[parameters('vmSize')]"
-                },
-                "storageProfile": {
-                    "imageReference": {
-                        "id": "[parameters('ImageID')]"
-                    },
-                    "osDisk": {
-                        "createOption": "fromImage",
-                        "managedDisk": {
-                            "storageAccountType": "Premium_LRS"
-                        }
-                    }
-                },
-                "networkProfile": {
-                    "networkInterfaces": [
-                        {
-                            "id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaceName'))]"
-                        }
-                    ]
-                }
-            },
-            "dependsOn": []
-        },
-        {
-            "type": "Microsoft.Compute/virtualMachines/extensions",
-            "name": "[concat(parameters('computerName'),'/', 'customscriptpsmp')]",
-            "apiVersion": "2015-06-15",
-            "location": "[resourceGroup().location]",
-            "tags": {
-                "displayName": "config-component-psmp"
-            },
-            "properties": {
-                "publisher": "Microsoft.Azure.Extensions",
-                "type": "CustomScript",
-                "typeHandlerVersion": "2.0",
-                "autoUpgradeMinorVersion": true,
-                "settings": {
-                    "skipDos2Unix": false
-                },
-                "protectedSettings": {
-                    "commandToExecute": "[concat('/etc/opt/register_and_activation.sh ', parameters('VaultAdminUser'), ' ', parameters('VaultAdminPassword'), ' ',  parameters('VaultPrivateIP'),' ', variables('GuidSubstring'), ' ', parameters('adminUsername'))]",
-                    "fileUris": []
-                }
-            },
-            "dependsOn": [
-                "[concat('Microsoft.Compute/virtualMachines/', parameters('computerName'))]"
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/azure/nested/psmp-nested-template-v11.4.json b/azure/nested/psmp-nested-template-v11.4.json
deleted file mode 100644
index 6168385e..00000000
--- a/azure/nested/psmp-nested-template-v11.4.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "VMname": {
-            "type": "string"
-        },
-        "computerName": {
-            "type": "string"
-        },
-        "adminUsername": {
-            "type": "string"
-        },
-        "adminPassword": {
-            "type": "SecureString"
-        },
-        "vmSize": {
-            "type": "string"
-        },
-        "Imageid": {
-            "type": "string"
-        },
-        "NetworkInterfaceName": {
-            "type": "string"
-        },
-        "VaultAdminUser": {
-            "type": "string"
-        },
-        "VaultAdminPassword": {
-            "type": "SecureString"
-        },
-		"AvailablitySetName": {
-            "type": "string"
-        },
-        "VaultPrivateIP": {
-            "type": "string"
-        }
-    },
-    "variables": {
-        "GuidSubstring": "[uniqueString( resourceGroup().id, deployment().name )]"
-    },
-    "resources": [
-        {
-            "type": "Microsoft.Compute/virtualMachines",
-            "name": "[parameters('VMname')]",
-            "apiVersion": "2017-03-30",
-            "location": "[resourceGroup().location]",
-            "properties": {
-                "osProfile": {
-                    "computerName": "[parameters('computerName')]",
-                    "adminUsername": "[parameters('adminUsername')]",
-                    "adminPassword": "[parameters('adminPassword')]"
-                },
-                "hardwareProfile": {
-                    "vmSize": "[parameters('vmSize')]"
-                },
-                "storageProfile": {
-                    "imageReference": {
-                        "id": "[parameters('ImageID')]"
-                    },
-                    "osDisk": {
-                        "createOption": "fromImage",
-                        "managedDisk": {
-                            "storageAccountType": "Premium_LRS"
-                        }
-                    }
-                },
-				"availabilitySet": {
-                    "id": "[resourceId('Microsoft.Compute/availabilitySets', parameters('AvailablitySetName'))]"
-                },
-                "networkProfile": {
-                    "networkInterfaces": [
-                        {
-                            "id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaceName'))]"
-                        }
-                    ]
-                }
-            },
-            "dependsOn": []
-        },
-        {
-            "type": "Microsoft.Compute/virtualMachines/extensions",
-            "name": "[concat(parameters('computerName'),'/', 'customscriptpsmp')]",
-            "apiVersion": "2015-06-15",
-            "location": "[resourceGroup().location]",
-            "tags": {
-                "displayName": "config-component-psmp"
-            },
-            "properties": {
-                "publisher": "Microsoft.Azure.Extensions",
-                "type": "CustomScript",
-                "typeHandlerVersion": "2.0",
-                "autoUpgradeMinorVersion": true,
-                "settings": {
-                    "skipDos2Unix": false
-                },
-                "protectedSettings": {
-                    "commandToExecute": "[concat('/etc/opt/register_and_activation.sh ', parameters('VaultAdminUser'), ' ', parameters('VaultAdminPassword'), ' ',  parameters('VaultPrivateIP'),' ', variables('GuidSubstring'), ' ', parameters('adminUsername'))]",
-                    "fileUris": []
-                }
-            },
-            "dependsOn": [
-                "[concat('Microsoft.Compute/virtualMachines/', parameters('computerName'))]"
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/azure/nested/psmp-nested-template-v11.5.json b/azure/nested/psmp-nested-template-v11.5.json
deleted file mode 100644
index 10e9a74d..00000000
--- a/azure/nested/psmp-nested-template-v11.5.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "VMname": {
-            "type": "string"
-        },
-        "computerName": {
-            "type": "string"
-        },
-        "adminUsername": {
-            "type": "string"
-        },
-        "adminPassword": {
-            "type": "SecureString"
-        },
-        "vmSize": {
-            "type": "string"
-        },
-        "Imageid": {
-            "type": "string"
-        },
-        "NetworkInterfaceName": {
-            "type": "string"
-        },
-        "VaultAdminUser": {
-            "type": "string"
-        },
-        "VaultAdminPassword": {
-            "type": "SecureString"
-        },
-        "AvailabilityZone": {
-            "type": "string"
-        },
-        "VaultPrivateIP": {
-            "type": "string"
-        }
-    },
-    "variables": {
-        "GuidSubstring": "[uniqueString( resourceGroup().id, deployment().name )]"
-    },
-    "resources": [
-        {
-            "type": "Microsoft.Compute/virtualMachines",
-            "name": "[parameters('VMname')]",
-            "apiVersion": "2017-03-30",
-            "location": "[resourceGroup().location]",
-            "zones": [
-                "[parameters('AvailabilityZone')]"
-            ],
-            "properties": {
-                "osProfile": {
-                    "computerName": "[parameters('computerName')]",
-                    "adminUsername": "[parameters('adminUsername')]",
-                    "adminPassword": "[parameters('adminPassword')]"
-                },
-                "hardwareProfile": {
-                    "vmSize": "[parameters('vmSize')]"
-                },
-                "storageProfile": {
-                    "imageReference": {
-                        "id": "[parameters('ImageID')]"
-                    },
-                    "osDisk": {
-                        "createOption": "fromImage",
-                        "managedDisk": {
-                            "storageAccountType": "Premium_LRS"
-                        }
-                    }
-                },
-                "networkProfile": {
-                    "networkInterfaces": [
-                        {
-                            "id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaceName'))]"
-                        }
-                    ]
-                }
-            },
-            "dependsOn": []
-        },
-        {
-            "type": "Microsoft.Compute/virtualMachines/extensions",
-            "name": "[concat(parameters('computerName'),'/', 'customscriptpsmp')]",
-            "apiVersion": "2015-06-15",
-            "location": "[resourceGroup().location]",
-            "tags": {
-                "displayName": "config-component-psmp"
-            },
-            "properties": {
-                "publisher": "Microsoft.Azure.Extensions",
-                "type": "CustomScript",
-                "typeHandlerVersion": "2.0",
-                "autoUpgradeMinorVersion": true,
-                "settings": {
-                    "skipDos2Unix": false
-                },
-                "protectedSettings": {
-                    "commandToExecute": "[concat('/etc/opt/register_and_activation.sh ', parameters('VaultAdminUser'), ' ', parameters('VaultAdminPassword'), ' ',  parameters('VaultPrivateIP'),' ', variables('GuidSubstring'), ' ', parameters('adminUsername'))]",
-                    "fileUris": []
-                }
-            },
-            "dependsOn": [
-                "[concat('Microsoft.Compute/virtualMachines/', parameters('computerName'))]"
-            ]
-        }
-    ]
-}
diff --git a/azure/nested/psmp-nested-template.json b/azure/nested/psmp-nested-template.json
index c830faad..10e9a74d 100644
--- a/azure/nested/psmp-nested-template.json
+++ b/azure/nested/psmp-nested-template.json
@@ -1,101 +1,107 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "VMname": {
-            "type": "string"
-        },
-        "computerName": {
-            "type": "string"
-        },
-        "adminUsername": {
-            "type": "string"
-        },
-        "adminPassword": {
-            "type": "SecureString"
-        },
-        "vmSize": {
-            "type": "string"
-        },
-        "Imageid": {
-            "type": "string"
-        },
-        "NetworkInterfaceName": {
-            "type": "string"
-        },
-        "VaultAdminUser": {
-            "type": "string"
-        },
-        "VaultAdminPassword": {
-            "type": "SecureString"
-        },
-        "VaultPrivateIP": {
-            "type": "string"
-        }
-    },
-    "variables": {
-        "GuidSubstring": "[uniqueString( resourceGroup().id, deployment().name )]"
-    },
-    "resources": [
-        {
-            "type": "Microsoft.Compute/virtualMachines",
-            "name": "[parameters('VMname')]",
-            "apiVersion": "2017-03-30",
-            "location": "[resourceGroup().location]",
-            "properties": {
-                "osProfile": {
-                    "computerName": "[parameters('computerName')]",
-                    "adminUsername": "[parameters('adminUsername')]",
-                    "adminPassword": "[parameters('adminPassword')]"
-                },
-                "hardwareProfile": {
-                    "vmSize": "[parameters('vmSize')]"
-                },
-                "storageProfile": {
-                    "imageReference": {
-                        "id": "[parameters('ImageID')]"
-                    },
-                    "osDisk": {
-                        "createOption": "fromImage",
-                        "managedDisk": {
-                            "storageAccountType": "Premium_LRS"
-                        }
-                    }
-                },
-                "networkProfile": {
-                    "networkInterfaces": [
-                        {
-                            "id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaceName'))]"
-                        }
-                    ]
-                }
-            },
-            "dependsOn": []
-        },
-        {
-            "type": "Microsoft.Compute/virtualMachines/extensions",
-            "name": "[concat(parameters('computerName'),'/', 'customscriptpsmp')]",
-            "apiVersion": "2015-06-15",
-            "location": "[resourceGroup().location]",
-            "tags": {
-                "displayName": "config-component-psmp"
-            },
-            "properties": {
-                "publisher": "Microsoft.Azure.Extensions",
-                "type": "CustomScript",
-                "typeHandlerVersion": "2.0",
-                "autoUpgradeMinorVersion": true,
-                "settings": {
-                    "skipDos2Unix": false
-                },
-                "protectedSettings": {
-                    "commandToExecute": "[concat('/etc/opt/register_and_activation.sh ', parameters('VaultAdminUser'), ' ', parameters('VaultAdminPassword'), ' ',  parameters('VaultPrivateIP'),' ', variables('GuidSubstring'), ' ', parameters('adminUsername'))]",
-                    "fileUris": []
-                }
-            },
-            "dependsOn": [
-                "[concat('Microsoft.Compute/virtualMachines/', parameters('computerName'))]"
-            ]
-        }
-    ]
-}
\ No newline at end of file
+{
+    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {
+        "VMname": {
+            "type": "string"
+        },
+        "computerName": {
+            "type": "string"
+        },
+        "adminUsername": {
+            "type": "string"
+        },
+        "adminPassword": {
+            "type": "SecureString"
+        },
+        "vmSize": {
+            "type": "string"
+        },
+        "Imageid": {
+            "type": "string"
+        },
+        "NetworkInterfaceName": {
+            "type": "string"
+        },
+        "VaultAdminUser": {
+            "type": "string"
+        },
+        "VaultAdminPassword": {
+            "type": "SecureString"
+        },
+        "AvailabilityZone": {
+            "type": "string"
+        },
+        "VaultPrivateIP": {
+            "type": "string"
+        }
+    },
+    "variables": {
+        "GuidSubstring": "[uniqueString( resourceGroup().id, deployment().name )]"
+    },
+    "resources": [
+        {
+            "type": "Microsoft.Compute/virtualMachines",
+            "name": "[parameters('VMname')]",
+            "apiVersion": "2017-03-30",
+            "location": "[resourceGroup().location]",
+            "zones": [
+                "[parameters('AvailabilityZone')]"
+            ],
+            "properties": {
+                "osProfile": {
+                    "computerName": "[parameters('computerName')]",
+                    "adminUsername": "[parameters('adminUsername')]",
+                    "adminPassword": "[parameters('adminPassword')]"
+                },
+                "hardwareProfile": {
+                    "vmSize": "[parameters('vmSize')]"
+                },
+                "storageProfile": {
+                    "imageReference": {
+                        "id": "[parameters('ImageID')]"
+                    },
+                    "osDisk": {
+                        "createOption": "fromImage",
+                        "managedDisk": {
+                            "storageAccountType": "Premium_LRS"
+                        }
+                    }
+                },
+                "networkProfile": {
+                    "networkInterfaces": [
+                        {
+                            "id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaceName'))]"
+                        }
+                    ]
+                }
+            },
+            "dependsOn": []
+        },
+        {
+            "type": "Microsoft.Compute/virtualMachines/extensions",
+            "name": "[concat(parameters('computerName'),'/', 'customscriptpsmp')]",
+            "apiVersion": "2015-06-15",
+            "location": "[resourceGroup().location]",
+            "tags": {
+                "displayName": "config-component-psmp"
+            },
+            "properties": {
+                "publisher": "Microsoft.Azure.Extensions",
+                "type": "CustomScript",
+                "typeHandlerVersion": "2.0",
+                "autoUpgradeMinorVersion": true,
+                "settings": {
+                    "skipDos2Unix": false
+                },
+                "protectedSettings": {
+                    "commandToExecute": "[concat('/etc/opt/register_and_activation.sh ', parameters('VaultAdminUser'), ' ', parameters('VaultAdminPassword'), ' ',  parameters('VaultPrivateIP'),' ', variables('GuidSubstring'), ' ', parameters('adminUsername'))]",
+                    "fileUris": []
+                }
+            },
+            "dependsOn": [
+                "[concat('Microsoft.Compute/virtualMachines/', parameters('computerName'))]"
+            ]
+        }
+    ]
+}
diff --git a/azure/pas-single-component-deploy-in-pas-hybrid-network.json b/azure/pas-single-component-deploy-in-pas-hybrid-network.json
index 5ef30f26..45a87396 100644
--- a/azure/pas-single-component-deploy-in-pas-hybrid-network.json
+++ b/azure/pas-single-component-deploy-in-pas-hybrid-network.json
@@ -122,7 +122,7 @@
             "properties": {
                 "mode": "Incremental",
                 "templateLink": {
-                    "uri": "https://pasnestedtemplates.blob.core.windows.net/nested/psmp-nested-template-v11.4.json",
+                    "uri": "https://raw.githubusercontent.com/cyberark/pas-on-cloud/v12.0/azure/nested/psmp-nested-template-hybrid.json",
                     "contentVersion": "1.0.0.0"
                 },
                 "parameters": {
@@ -132,9 +132,6 @@
                     "computerName": {
                         "value": "[parameters('Component VM Host Name')]"
                     },
-                    "pvwaUrl": {
-                        "value": "[parameters('Password Vault Web Access FQDN')]"
-                    },
                     "adminUsername": {
                         "value": "[parameters('Component VM Admin User')]"
                     },
diff --git a/azure/pas-single-component-deploy.json b/azure/pas-single-component-deploy.json
index 7ec3b35c..609f9bf2 100644
--- a/azure/pas-single-component-deploy.json
+++ b/azure/pas-single-component-deploy.json
@@ -120,7 +120,7 @@
             "properties": {
                 "mode": "Incremental",
                 "templateLink": {
-                    "uri": "https://pasnestedtemplates.blob.core.windows.net/nested/psmp-nested-template-v11.5.json",
+                    "uri": "https://raw.githubusercontent.com/cyberark/pas-on-cloud/v12.0/azure/nested/psmp-nested-template.json",
                     "contentVersion": "1.0.0.0"
                 },
                 "parameters": {