diff --git a/AzureResourceManager/Artifactory/vm_install/vm_deploy.json b/AzureResourceManager/Artifactory/vm_install/vm_deploy.json
index 0503514..0f8a6ff 100644
--- a/AzureResourceManager/Artifactory/vm_install/vm_deploy.json
+++ b/AzureResourceManager/Artifactory/vm_install/vm_deploy.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
     "contentVersion": "1.0.0.0",
     "parameters": {
         "location": {
diff --git a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
index 1223726..c3be75d 100644
--- a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
+++ b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
@@ -227,11 +227,11 @@
               "password": "Xray master Key",
               "confirmPassword": "Confirm master Key"
             },
-            "toolTip": "Master key for Xray instance. Generate master.key using command '$openssl rand -hex 16'",
+            "toolTip": "Master key for Xray instance. Generate master.key using command '$openssl rand -hex 32'",
             "constraints": {
               "required": true,
-              "regex": "^[a-z0-9A-Z]{12,32}$",
-              "validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-32 characters long."
+              "regex": "^[a-z0-9A-Z]{12,64}$",
+              "validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-64 characters long."
             },
             "options": {
               "hideConfirmation": true
@@ -247,8 +247,8 @@
             "toolTip": "Join key from Artifactory cluster. You can copy Join key from the Artifactory UI, Security -> Settings -> Connection details",
             "constraints": {
               "required": true,
-              "regex": "^[a-z0-9A-Z]{12,32}$",
-              "validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-32 characters long."
+              "regex": "^[a-z0-9A-Z]{12,64}$",
+              "validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-64 characters long."
             },
             "options": {
               "hideConfirmation": true
diff --git a/AzureResourceManager/Xray/vm_install/vm_deploy.json b/AzureResourceManager/Xray/vm_install/vm_deploy.json
index eef02c2..35042ec 100644
--- a/AzureResourceManager/Xray/vm_install/vm_deploy.json
+++ b/AzureResourceManager/Xray/vm_install/vm_deploy.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+    "$schema": "http://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
     "contentVersion": "1.0.0.0",
     "parameters": {
         "location": {
diff --git a/AzureResourceManager/Xray/vm_install/vm_parameters.json b/AzureResourceManager/Xray/vm_install/vm_parameters.json
index ffd11e4..e9b0674 100644
--- a/AzureResourceManager/Xray/vm_install/vm_parameters.json
+++ b/AzureResourceManager/Xray/vm_install/vm_parameters.json
@@ -87,10 +87,10 @@
             "value": "vmuser"
         },
         "adminPassword": {
-            "value": "Password!123"
+            "value": "OWERWRITE_THE_PASSWORD"
         },
         "xrayVersion": {
-            "value": "3.45.1"
+            "value": "OWERWRITE_LATEST_VERSION"
         },
         "scriptName": {
             "value": "install_xray_to_vm.sh"