diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json
index 2390a20..9adc80b 100644
--- a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json
+++ b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json
@@ -140,10 +140,14 @@
                   "label": "7.12.5",
                   "value": "0.0.8"
                 },
-		        {
+		{
                   "label": "7.12.6",
                   "value": "0.0.9"
-                }
+                },
+		{
+                  "label": "7.12.8",
+		  "value": "0.0.10"
+		}
               ],
               "required": true
             },
diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
index ea8c658..a63ae0f 100644
--- a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
+++ b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
@@ -79,10 +79,11 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.9",
+      "defaultValue": "0.0.10",
       "allowedValues": [
 	    "0.0.8",
-        "0.0.9"
+            "0.0.9",
+	    "0.0.10"
       ],
       "metadata": {
         "description": "Artifactory-vm image version to deploy."
diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json
index d53acf3..bd63191 100644
--- a/AzureResourceManager/Artifactory/azuredeploy.json
+++ b/AzureResourceManager/Artifactory/azuredeploy.json
@@ -79,10 +79,11 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.9",
+      "defaultValue": "0.0.10",
       "allowedValues": [
 	    "0.0.8",
-        "0.0.9"
+            "0.0.9",
+	    "0.0.10"
       ],
       "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 3699c89..aa718fb 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.11.5"
+            "value": "7.12.8"
         },
         "scriptName": {
             "value": "install_pro7_to_vm.sh"
diff --git a/AzureResourceManager/JCR/MP_submission_7/createUiDefinition.json b/AzureResourceManager/JCR/MP_submission_7/createUiDefinition.json
index d7c9d94..6d1e31b 100644
--- a/AzureResourceManager/JCR/MP_submission_7/createUiDefinition.json
+++ b/AzureResourceManager/JCR/MP_submission_7/createUiDefinition.json
@@ -136,7 +136,11 @@
                 {
                   "label": "7.11.2",
                   "value": "0.0.61"
-                }
+                },
+		{
+                  "label": "7.12.8",
+		  "value": "0.0.10"
+		}
               ],
               "required": true
             },
diff --git a/AzureResourceManager/JCR/MP_submission_7/mainTemplate.json b/AzureResourceManager/JCR/MP_submission_7/mainTemplate.json
index d5a1a06..0a83453 100644
--- a/AzureResourceManager/JCR/MP_submission_7/mainTemplate.json
+++ b/AzureResourceManager/JCR/MP_submission_7/mainTemplate.json
@@ -25,7 +25,7 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.61",
+      "defaultValue": "0.0.10",
       "allowedValues": [
         "7.2.1",
         "7.3.2",
@@ -34,7 +34,8 @@
         "0.0.3",
         "0.0.4",
         "0.0.5",
-	    "0.0.61"
+        "0.0.61",
+	"0.0.10"
       ],
       "metadata": {
         "description": "JFrog Container Registry-vm image version to deploy."
diff --git a/AzureResourceManager/JCR/azuredeploy.json b/AzureResourceManager/JCR/azuredeploy.json
index bab9aee..568b8fa 100644
--- a/AzureResourceManager/JCR/azuredeploy.json
+++ b/AzureResourceManager/JCR/azuredeploy.json
@@ -25,7 +25,7 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.7",
+      "defaultValue": "0.0.10",
       "allowedValues": [
         "7.2.1",
         "7.3.2",
@@ -35,7 +35,8 @@
         "0.0.4",
 	"0.0.5",
 	"0.0.61",
-        "0.0.7"
+        "0.0.7",
+	"0.0.10"
       ],
       "metadata": {
         "description": "JFrog Container Registry-vm image version to deploy."
diff --git a/AzureResourceManager/JCR/vm_install/vm_parameters.json b/AzureResourceManager/JCR/vm_install/vm_parameters.json
index a94297b..6516526 100644
--- a/AzureResourceManager/JCR/vm_install/vm_parameters.json
+++ b/AzureResourceManager/JCR/vm_install/vm_parameters.json
@@ -81,7 +81,7 @@
             "value": "OWERWRITE_THE_PASSWORD"
         },
         "artifactoryVersion": {
-            "value": "7.11.5"
+            "value": "7.12.8"
         },
         "scriptName": {
             "value": "install_jcr7_to_vm.sh"
diff --git a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
index 47a9623..179877e 100644
--- a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
+++ b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
@@ -134,7 +134,11 @@
                 {
                   "label": "3.15.3",
                   "value": "0.0.11"
-                }
+                },
+		{
+                  "label": "3.17.2",
+		  "value": "0.0.13"
+		}
               ],
               "required": true
             },
diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json
index 3361f54..f2a0345 100644
--- a/AzureResourceManager/Xray/MP_submission/mainTemplate.json
+++ b/AzureResourceManager/Xray/MP_submission/mainTemplate.json
@@ -19,10 +19,11 @@
     },
     "xrayVersion": {
       "type": "string",
-      "defaultValue": "0.0.11",
+      "defaultValue": "0.0.13",
       "allowedValues": [
         "0.0.10",
-	    "0.0.11"
+	"0.0.11",
+	"0.0.13"
       ],
       "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 c583136..9657c9d 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.11"
+      "value": "0.0.13"
     },
     "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 d905234..23fce93 100644
--- a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
+++ b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
@@ -19,10 +19,11 @@
     },
     "xrayVersion": {
       "type": "string",
-      "defaultValue": "0.0.11",
+      "defaultValue": "0.0.13",
       "allowedValues": [
         "0.0.10",
-        "0.0.11"
+        "0.0.11",
+	"0.0.13"
       ],
       "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 cb3b111..d0b8280 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.12.0"
+            "value": "3.17.2"
         },
         "scriptName": {
             "value": "install_xray_to_vm.sh"