diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json
index b32569a..6eddd56 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.3",
+            "defaultValue": "7.21.8",
             "toolTip": "Version of Artifactory to deploy",
             "constraints": {
               "allowedValues": [
@@ -173,8 +173,12 @@
 		  "value": "0.0.19"
 		},
 		{
-		  "lable": "7.21.3",
+		  "label": "7.21.3",
 		  "value": "0.0.21"
+		},
+		{
+	          "label": "7.21.8",
+		  "value": "0.0.22"
 		}
               ],
               "required": true
diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
index 3b36e37..d95209b 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.21",
+      "defaultValue": "0.0.22",
       "allowedValues": [
 	    "0.0.8",
             "0.0.9",
@@ -90,7 +90,8 @@
 	    "0.0.15",
 	    "0.0.18",
 	    "0.0.19",
-	    "0.0.21"
+	    "0.0.21",
+	    "0.0.22"
       ],
       "metadata": {
         "description": "Artifactory-vm image version to deploy."
diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json
index 5c69e2a..dde2b3a 100644
--- a/AzureResourceManager/Artifactory/azuredeploy.json
+++ b/AzureResourceManager/Artifactory/azuredeploy.json
@@ -79,10 +79,10 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.21",
+      "defaultValue": "0.0.22",
       "allowedValues": [
 	    "0.0.8",
-        "0.0.9",
+            "0.0.9",
 	    "0.0.10",
 	    "0.0.11",
 	    "0.0.12",
@@ -90,7 +90,8 @@
 	    "0.0.15",
 	    "0.0.18",
 	    "0.0.19",
-	    "0.0.21"
+	    "0.0.21",
+	    "0.0.22"
       ],
       "metadata": {
         "description": "Artifactory-vm image version to deploy."
diff --git a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
index fd36608..7291b52 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.27.2",
+            "defaultValue": "3.27.4",
             "toolTip": "Version of Xray to deploy",
             "constraints": {
               "allowedValues": [
@@ -170,6 +170,10 @@
 		{
 		  "label": "3.27.2",
 		  "value": "0.0.23"
+		},
+		{
+		  "label": "3.27.4",
+		  "value": "0.0.24"
 		}
               ],
               "required": true
diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json
index 1c0a173..83dce1a 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.23",
+      "defaultValue": "0.0.24",
       "allowedValues": [
         "0.0.10",
         "0.0.11",
@@ -31,7 +31,8 @@
 	"0.0.20",
 	"0.0.21",
 	"0.0.22",
-	"0.0.23"
+	"0.0.23",
+	"0.0.24"
       ],
       "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 9f24d86..26822ae 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.23"
+      "value": "0.0.24"
     },
     "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 4dea195..b15e0fa 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.23",
+      "defaultValue": "0.0.24",
       "allowedValues": [
         "0.0.10",
         "0.0.11",
@@ -31,7 +31,8 @@
         "0.0.20",
         "0.0.21",
         "0.0.22",
-	"0.0.23"
+	"0.0.23",
+	"0.0.24"
       ],
       "metadata": {
         "description": "Xray-vm image version to deploy."