diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json
index 17eb95f..f35ed86 100644
--- a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json
+++ b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json
@@ -132,7 +132,7 @@
             "name": "artifactoryVersion",
             "type": "Microsoft.Common.DropDown",
             "label": "Artifactory-vm image version to deploy.",
-            "defaultValue": "7.21.12",
+            "defaultValue": "7.24.3",
             "toolTip": "Version of Artifactory to deploy",
             "constraints": {
               "allowedValues": [
@@ -183,6 +183,10 @@
 		{
 	          "label": "7.21.12",
 		  "value": "0.0.23"
+		},
+		{
+		  "label": "7.24.3",
+		  "value": "0.0.25"
 		}
               ],
               "required": true
diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
index 285706a..abf78fb 100644
--- a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
+++ b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
@@ -79,7 +79,7 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.23",
+      "defaultValue": "0.0.25",
       "allowedValues": [
 	    "0.0.8",
             "0.0.9",
@@ -92,7 +92,8 @@
 	    "0.0.19",
 	    "0.0.21",
 	    "0.0.22",
-	    "0.0.23"
+	    "0.0.23",
+	    "0.0.25"
       ],
       "metadata": {
         "description": "Artifactory-vm image version to deploy."
diff --git a/AzureResourceManager/Artifactory/MP_submission/nested/Postgresql_deploy.json b/AzureResourceManager/Artifactory/MP_submission/nested/Postgresql_deploy.json
index e300492..bf36b44 100644
--- a/AzureResourceManager/Artifactory/MP_submission/nested/Postgresql_deploy.json
+++ b/AzureResourceManager/Artifactory/MP_submission/nested/Postgresql_deploy.json
@@ -45,7 +45,7 @@
     },
     "version": {
       "type": "string",
-      "defaultValue": "9.6"
+      "defaultValue": "11"
     },
     "backupRetentionDays": {
       "type": "int",
@@ -175,4 +175,4 @@
       "value": "[parameters('manual_db_url')]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json
index d6de6bd..24ae66d 100644
--- a/AzureResourceManager/Artifactory/azuredeploy.json
+++ b/AzureResourceManager/Artifactory/azuredeploy.json
@@ -79,7 +79,7 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.23",
+      "defaultValue": "0.0.25",
       "allowedValues": [
 	    "0.0.8",
             "0.0.9",
@@ -92,7 +92,8 @@
 	    "0.0.19",
 	    "0.0.21",
 	    "0.0.22",
-	    "0.0.23"
+	    "0.0.23",
+	    "0.0.25"
       ],
       "metadata": {
         "description": "Artifactory-vm image version to deploy."
diff --git a/AzureResourceManager/Artifactory/nested/Postgresql_deploy.json b/AzureResourceManager/Artifactory/nested/Postgresql_deploy.json
index e300492..bf36b44 100644
--- a/AzureResourceManager/Artifactory/nested/Postgresql_deploy.json
+++ b/AzureResourceManager/Artifactory/nested/Postgresql_deploy.json
@@ -45,7 +45,7 @@
     },
     "version": {
       "type": "string",
-      "defaultValue": "9.6"
+      "defaultValue": "11"
     },
     "backupRetentionDays": {
       "type": "int",
@@ -175,4 +175,4 @@
       "value": "[parameters('manual_db_url')]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
index b4af6a5..f29a002 100644
--- a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
+++ b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
@@ -123,7 +123,7 @@
             "name": "xrayVersion",
             "type": "Microsoft.Common.DropDown",
             "label": "Xray-vm image version to deploy.",
-            "defaultValue": "3.29.0",
+            "defaultValue": "3.29.2",
             "toolTip": "Version of Xray to deploy",
             "constraints": {
               "allowedValues": [
@@ -178,7 +178,11 @@
                 {
 	          "label": "3.29.0",
                   "value": "0.0.25"
-	        }
+	        },
+		{
+		  "label": "3.29.2",
+		  "value": "0.0.26"
+		}
               ],
               "required": true
             },
diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json
index 2c178c9..2f135d2 100644
--- a/AzureResourceManager/Xray/MP_submission/mainTemplate.json
+++ b/AzureResourceManager/Xray/MP_submission/mainTemplate.json
@@ -19,7 +19,7 @@
     },
     "xrayVersion": {
       "type": "string",
-      "defaultValue": "0.0.25",
+      "defaultValue": "0.0.26",
       "allowedValues": [
         "0.0.10",
         "0.0.11",
@@ -33,7 +33,8 @@
         "0.0.22",
         "0.0.23",
         "0.0.24",
-        "0.0.25"
+        "0.0.25",
+	"0.0.26"
       ],
       "metadata": {
         "description": "Xray-vm image version to deploy."
diff --git a/AzureResourceManager/Xray/MP_submission/nested/Postgresql_deploy.json b/AzureResourceManager/Xray/MP_submission/nested/Postgresql_deploy.json
index 01e6dcf..cac2f8b 100644
--- a/AzureResourceManager/Xray/MP_submission/nested/Postgresql_deploy.json
+++ b/AzureResourceManager/Xray/MP_submission/nested/Postgresql_deploy.json
@@ -40,7 +40,7 @@
     },
     "version": {
       "type": "string",
-      "defaultValue": "9.6"
+      "defaultValue": "11"
     },
     "backupRetentionDays": {
       "type": "int",
@@ -158,4 +158,4 @@
       "value": "[parameters('manual_db_url')]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/AzureResourceManager/Xray/azuredeploy_xray.parameters.json b/AzureResourceManager/Xray/azuredeploy_xray.parameters.json
index 073ad55..c593434 100644
--- a/AzureResourceManager/Xray/azuredeploy_xray.parameters.json
+++ b/AzureResourceManager/Xray/azuredeploy_xray.parameters.json
@@ -33,7 +33,7 @@
       "value": "10.0.1.0/24"
     },
     "xrayVersion": {
-      "value": "0.0.25"
+      "value": "0.0.26"
     },
     "artifactoryURL": {
       "value": "http://ARTIFACTORY-URL.cloudapp.azure.com"
diff --git a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
index d16195b..ec277cf 100644
--- a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
+++ b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
@@ -19,7 +19,7 @@
     },
     "xrayVersion": {
       "type": "string",
-      "defaultValue": "0.0.25",
+      "defaultValue": "0.0.26",
       "allowedValues": [
         "0.0.10",
         "0.0.11",
@@ -33,7 +33,8 @@
         "0.0.22",
         "0.0.23",
         "0.0.24",
-        "0.0.25"
+        "0.0.25",
+	"0.0.26"
       ],
       "metadata": {
         "description": "Xray-vm image version to deploy."
@@ -201,7 +202,7 @@
     "joinKey": "[parameters('joinKey')]",
     "osType": {
       "publisher": "jfrog",
-      "offer": "x-ray-vm",
+      "offer": "x-ray-vm-preview",
       "sku": "x-ray-vm",
       "version": "[parameters('xrayVersion')]"
     },
@@ -337,7 +338,7 @@
       "plan": {
         "name": "x-ray-vm",
         "publisher": "jfrog",
-        "product": "x-ray-vm"
+        "product": "x-ray-vm-preview"
       },
       "sku": {
         "name": "[parameters('virtualMachineSize')]",
diff --git a/AzureResourceManager/Xray/nested/Postgresql_deploy.json b/AzureResourceManager/Xray/nested/Postgresql_deploy.json
index 01e6dcf..cac2f8b 100644
--- a/AzureResourceManager/Xray/nested/Postgresql_deploy.json
+++ b/AzureResourceManager/Xray/nested/Postgresql_deploy.json
@@ -40,7 +40,7 @@
     },
     "version": {
       "type": "string",
-      "defaultValue": "9.6"
+      "defaultValue": "11"
     },
     "backupRetentionDays": {
       "type": "int",
@@ -158,4 +158,4 @@
       "value": "[parameters('manual_db_url')]"
     }
   }
-}
\ No newline at end of file
+}