diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json
index dca1a73..c252e47 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.17.5",
+            "defaultValue": "7.18.6",
             "toolTip": "Version of Artifactory to deploy",
             "constraints": {
               "allowedValues": [
@@ -163,6 +163,10 @@
 		{
 	          "label": "7.17.5",
 		  "value": "0.0.15"
+		},
+		{
+		  "label": "7.18.6",
+		  "value": "0.0.18"
 		}
               ],
               "required": true
diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
index dc480d1..e341b22 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.15",
+      "defaultValue": "0.0.18",
       "allowedValues": [
 	    "0.0.8",
             "0.0.9",
@@ -87,7 +87,8 @@
 	    "0.0.11",
 	    "0.0.12",
 	    "0.0.14",
-	    "0.0.15"
+	    "0.0.15",
+	    "0.0.18"
       ],
       "metadata": {
         "description": "Artifactory-vm image version to deploy."
diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json
index 7339d16..5e5c37b 100644
--- a/AzureResourceManager/Artifactory/azuredeploy.json
+++ b/AzureResourceManager/Artifactory/azuredeploy.json
@@ -79,7 +79,7 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.15",
+      "defaultValue": "0.0.18",
       "allowedValues": [
 	    "0.0.8",
             "0.0.9",
@@ -87,7 +87,8 @@
 	    "0.0.11",
 	    "0.0.12",
 	    "0.0.14",
-	    "0.0.15"
+	    "0.0.15",
+	    "0.0.18"
       ],
       "metadata": {
         "description": "Artifactory-vm image version to deploy."
diff --git a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json
index 35d9401..16b1a74 100644
--- a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json
+++ b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json
@@ -90,7 +90,7 @@
             "value": "OWERWRITE_THE_PASSWORD"
         },
         "artifactoryVersion": {
-            "value": "7.17.5"
+            "value": "OWERWRITE_LATEST_VERSION"
         },
         "scriptName": {
             "value": "install_pro7_to_vm.sh"
diff --git a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
index ff59bf0..8d0fea5 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.22.1",
+            "defaultValue": "3.24.2",
             "toolTip": "Version of Xray to deploy",
             "constraints": {
               "allowedValues": [
@@ -154,6 +154,14 @@
 		{
 		  "label": "3.22.1",
 		  "value": "0.0.18"
+		},
+	        {
+	          "label": "3.23.0",
+		  "value": "0.0.20"
+		},
+		{
+	          "label": "3.24.2",
+		  "value": "0.0.21"
 		}
               ],
               "required": true
diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json
index cd14efa..1043535 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.18",
+      "defaultValue": "0.0.21",
       "allowedValues": [
         "0.0.10",
         "0.0.11",
@@ -27,7 +27,9 @@
         "0.0.14",
 	"0.0.15",
 	"0.0.17",
-	"0.0.18"
+	"0.0.18",
+	"0.0.20",
+	"0.0.21"
       ],
       "metadata": {
         "description": "Xray-vm image version to deploy."
diff --git a/AzureResourceManager/Xray/azuredeploy_xray.parameters.json b/AzureResourceManager/Xray/azuredeploy_xray.parameters.json
index e18b6d9..859ec7b 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.15"
+      "value": "0.0.21"
     },
     "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 3cdbe84..37e1a49 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.18",
+      "defaultValue": "0.0.21",
       "allowedValues": [
         "0.0.10",
         "0.0.11",
@@ -27,7 +27,9 @@
 	"0.0.14",
 	"0.0.15",
 	"0.0.17",
-	"0.0.18"
+	"0.0.18",
+	"0.0.20",
+	"0.0.21"
       ],
       "metadata": {
         "description": "Xray-vm image version to deploy."
diff --git a/AzureResourceManager/Xray/vm_install/vm_parameters.json b/AzureResourceManager/Xray/vm_install/vm_parameters.json
index e4779ed..e9b0674 100644
--- a/AzureResourceManager/Xray/vm_install/vm_parameters.json
+++ b/AzureResourceManager/Xray/vm_install/vm_parameters.json
@@ -90,7 +90,7 @@
             "value": "OWERWRITE_THE_PASSWORD"
         },
         "xrayVersion": {
-            "value": "3.22.1"
+            "value": "OWERWRITE_LATEST_VERSION"
         },
         "scriptName": {
             "value": "install_xray_to_vm.sh"