diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json
index 7951a2b..2974cfa 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.15.4",
+            "defaultValue": "7.17.4",
             "toolTip": "Version of Artifactory to deploy",
             "constraints": {
               "allowedValues": [
@@ -155,7 +155,11 @@
 	        {
                   "label": "7.15.4",
                   "value": "0.0.12"
-                }
+                },
+		{
+	          "label": "7.17.4",
+		  "value": "0.0.14"
+		}
               ],
               "required": true
             },
diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
index ae98cfb..b52a453 100644
--- a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
+++ b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
@@ -79,13 +79,14 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.12",
+      "defaultValue": "0.0.14",
       "allowedValues": [
 	    "0.0.8",
             "0.0.9",
 	    "0.0.10",
 	    "0.0.11",
-	    "0.0.12"
+	    "0.0.12",
+	    "0.0.14"
       ],
       "metadata": {
         "description": "Artifactory-vm image version to deploy."
diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json
index 7f605b1..86bf03c 100644
--- a/AzureResourceManager/Artifactory/azuredeploy.json
+++ b/AzureResourceManager/Artifactory/azuredeploy.json
@@ -79,13 +79,14 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.12",
+      "defaultValue": "0.0.14",
       "allowedValues": [
 	    "0.0.8",
             "0.0.9",
 	    "0.0.10",
 	    "0.0.11",
-	    "0.0.12"
+	    "0.0.12",
+	    "0.0.14"
       ],
       "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 78e7241..d0ecccb 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.15.4"
+            "value": "7.17.4"
         },
         "scriptName": {
             "value": "install_pro7_to_vm.sh"
diff --git a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
index bb7694e..823ff12 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.18.0",
+            "defaultValue": "3.21.2",
             "toolTip": "Version of Xray to deploy",
             "constraints": {
               "allowedValues": [
@@ -146,6 +146,10 @@
 		{
 		  "label": "3.18.0",
 		  "value": "0.0.15"
+		},
+		{
+	          "label": "3.21.2",
+		  "value": "0.0.17"
 		}
               ],
               "required": true
diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json
index 0402c49..635c339 100644
--- a/AzureResourceManager/Xray/MP_submission/mainTemplate.json
+++ b/AzureResourceManager/Xray/MP_submission/mainTemplate.json
@@ -19,13 +19,14 @@
     },
     "xrayVersion": {
       "type": "string",
-      "defaultValue": "0.0.15",
+      "defaultValue": "0.0.17",
       "allowedValues": [
         "0.0.10",
         "0.0.11",
         "0.0.13",
         "0.0.14",
-	"0.0.15"
+	"0.0.15",
+	"0.0.17"
       ],
       "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 6a7a9e3..5bedf89 100644
--- a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
+++ b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
@@ -19,13 +19,14 @@
     },
     "xrayVersion": {
       "type": "string",
-      "defaultValue": "0.0.15",
+      "defaultValue": "0.0.17",
       "allowedValues": [
         "0.0.10",
         "0.0.11",
 	"0.0.13",
 	"0.0.14",
-	"0.0.15"
+	"0.0.15",
+	"0.0.17"
       ],
       "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 41f88e6..8f7e4a5 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.18.0"
+            "value": "3.21.2"
         },
         "scriptName": {
             "value": "install_xray_to_vm.sh"