diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
index 806d01b..ea8c658 100644
--- a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
+++ b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://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": {
     "vmSku": {
diff --git a/AzureResourceManager/Artifactory/MP_submission/nested/MSSQL_deploy.json b/AzureResourceManager/Artifactory/MP_submission/nested/MSSQL_deploy.json
index aee6e70..36a2309 100644
--- a/AzureResourceManager/Artifactory/MP_submission/nested/MSSQL_deploy.json
+++ b/AzureResourceManager/Artifactory/MP_submission/nested/MSSQL_deploy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://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": {
     "db_user": {
@@ -46,7 +46,6 @@
     {
       "name": "[parameters('db_server')]",
       "type": "Microsoft.Sql/servers",
-      "kind": "v12.0",
       "location": "[parameters('db_location')]",
       "apiVersion": "2020-08-01-preview",
       "tags": {
diff --git a/AzureResourceManager/Artifactory/MP_submission/nested/MSSQL_existing.json b/AzureResourceManager/Artifactory/MP_submission/nested/MSSQL_existing.json
index 4d7aa07..ed7da50 100644
--- a/AzureResourceManager/Artifactory/MP_submission/nested/MSSQL_existing.json
+++ b/AzureResourceManager/Artifactory/MP_submission/nested/MSSQL_existing.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://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": {
     "db_user": {
diff --git a/AzureResourceManager/Artifactory/MP_submission/nested/Postgresql_deploy.json b/AzureResourceManager/Artifactory/MP_submission/nested/Postgresql_deploy.json
index 064f77d..e300492 100644
--- a/AzureResourceManager/Artifactory/MP_submission/nested/Postgresql_deploy.json
+++ b/AzureResourceManager/Artifactory/MP_submission/nested/Postgresql_deploy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://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": {
     "db_user": {
diff --git a/AzureResourceManager/Artifactory/MP_submission/nested/Postgresql_existing.json b/AzureResourceManager/Artifactory/MP_submission/nested/Postgresql_existing.json
index e8757f3..0b66236 100644
--- a/AzureResourceManager/Artifactory/MP_submission/nested/Postgresql_existing.json
+++ b/AzureResourceManager/Artifactory/MP_submission/nested/Postgresql_existing.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://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": {
     "db_user": {
diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json
index 4c623f2..d53acf3 100644
--- a/AzureResourceManager/Artifactory/azuredeploy.json
+++ b/AzureResourceManager/Artifactory/azuredeploy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://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": {
     "vmSku": {
diff --git a/AzureResourceManager/Artifactory/nested/MSSQL_deploy.json b/AzureResourceManager/Artifactory/nested/MSSQL_deploy.json
index aee6e70..36a2309 100644
--- a/AzureResourceManager/Artifactory/nested/MSSQL_deploy.json
+++ b/AzureResourceManager/Artifactory/nested/MSSQL_deploy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://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": {
     "db_user": {
@@ -46,7 +46,6 @@
     {
       "name": "[parameters('db_server')]",
       "type": "Microsoft.Sql/servers",
-      "kind": "v12.0",
       "location": "[parameters('db_location')]",
       "apiVersion": "2020-08-01-preview",
       "tags": {
diff --git a/AzureResourceManager/Artifactory/nested/MSSQL_existing.json b/AzureResourceManager/Artifactory/nested/MSSQL_existing.json
index 4d7aa07..ed7da50 100644
--- a/AzureResourceManager/Artifactory/nested/MSSQL_existing.json
+++ b/AzureResourceManager/Artifactory/nested/MSSQL_existing.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://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": {
     "db_user": {
diff --git a/AzureResourceManager/Artifactory/nested/Postgresql_deploy.json b/AzureResourceManager/Artifactory/nested/Postgresql_deploy.json
index 064f77d..e300492 100644
--- a/AzureResourceManager/Artifactory/nested/Postgresql_deploy.json
+++ b/AzureResourceManager/Artifactory/nested/Postgresql_deploy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://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": {
     "db_user": {
diff --git a/AzureResourceManager/Artifactory/nested/Postgresql_existing.json b/AzureResourceManager/Artifactory/nested/Postgresql_existing.json
index e8757f3..0b66236 100644
--- a/AzureResourceManager/Artifactory/nested/Postgresql_existing.json
+++ b/AzureResourceManager/Artifactory/nested/Postgresql_existing.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://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": {
     "db_user": {