diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json
index 2974cfa..dca1a73 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.4",
+            "defaultValue": "7.17.5",
             "toolTip": "Version of Artifactory to deploy",
             "constraints": {
               "allowedValues": [
@@ -159,6 +159,10 @@
 		{
 	          "label": "7.17.4",
 		  "value": "0.0.14"
+		},
+		{
+	          "label": "7.17.5",
+		  "value": "0.0.15"
 		}
               ],
               "required": true
diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
index b52a453..dc480d1 100644
--- a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
+++ b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
@@ -79,14 +79,15 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.14",
+      "defaultValue": "0.0.15",
       "allowedValues": [
 	    "0.0.8",
             "0.0.9",
 	    "0.0.10",
 	    "0.0.11",
 	    "0.0.12",
-	    "0.0.14"
+	    "0.0.14",
+	    "0.0.15"
       ],
       "metadata": {
         "description": "Artifactory-vm image version to deploy."
diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json
index 86bf03c..7339d16 100644
--- a/AzureResourceManager/Artifactory/azuredeploy.json
+++ b/AzureResourceManager/Artifactory/azuredeploy.json
@@ -79,14 +79,15 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.14",
+      "defaultValue": "0.0.15",
       "allowedValues": [
 	    "0.0.8",
             "0.0.9",
 	    "0.0.10",
 	    "0.0.11",
 	    "0.0.12",
-	    "0.0.14"
+	    "0.0.14",
+	    "0.0.15"
       ],
       "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 d0ecccb..35d9401 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.4"
+            "value": "7.17.5"
         },
         "scriptName": {
             "value": "install_pro7_to_vm.sh"
diff --git a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
index 823ff12..ff59bf0 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.21.2",
+            "defaultValue": "3.22.1",
             "toolTip": "Version of Xray to deploy",
             "constraints": {
               "allowedValues": [
@@ -150,6 +150,10 @@
 		{
 	          "label": "3.21.2",
 		  "value": "0.0.17"
+		},
+		{
+		  "label": "3.22.1",
+		  "value": "0.0.18"
 		}
               ],
               "required": true
diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json
index 635c339..cd14efa 100644
--- a/AzureResourceManager/Xray/MP_submission/mainTemplate.json
+++ b/AzureResourceManager/Xray/MP_submission/mainTemplate.json
@@ -19,14 +19,15 @@
     },
     "xrayVersion": {
       "type": "string",
-      "defaultValue": "0.0.17",
+      "defaultValue": "0.0.18",
       "allowedValues": [
         "0.0.10",
         "0.0.11",
         "0.0.13",
         "0.0.14",
 	"0.0.15",
-	"0.0.17"
+	"0.0.17",
+	"0.0.18"
       ],
       "metadata": {
         "description": "Xray-vm image version to deploy."
diff --git a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
index 5bedf89..3cdbe84 100644
--- a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
+++ b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
@@ -19,14 +19,15 @@
     },
     "xrayVersion": {
       "type": "string",
-      "defaultValue": "0.0.17",
+      "defaultValue": "0.0.18",
       "allowedValues": [
         "0.0.10",
         "0.0.11",
 	"0.0.13",
 	"0.0.14",
 	"0.0.15",
-	"0.0.17"
+	"0.0.17",
+	"0.0.18"
       ],
       "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 8f7e4a5..e4779ed 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.21.2"
+            "value": "3.22.1"
         },
         "scriptName": {
             "value": "install_xray_to_vm.sh"