diff --git a/Playbooks/Create-AzureDevOpsTask/incident-trigger/azuredeploy.json b/Playbooks/Create-AzureDevOpsTask/incident-trigger/azuredeploy.json
index 551d19c2cc..63d742ca8a 100644
--- a/Playbooks/Create-AzureDevOpsTask/incident-trigger/azuredeploy.json
+++ b/Playbooks/Create-AzureDevOpsTask/incident-trigger/azuredeploy.json
@@ -9,7 +9,7 @@
         "entities": [], 
         "tags": ["Sync"], 
         "support": {
-            "kind": "Community" 
+            "tier": "Community" 
         },
         "author": {
             "name": "Nicholas DiCola"
diff --git a/Playbooks/Create-IBMResilientIncident/incident-trigger/azuredeploy.json b/Playbooks/Create-IBMResilientIncident/incident-trigger/azuredeploy.json
index 3bcad5184c..b1045d6882 100644
--- a/Playbooks/Create-IBMResilientIncident/incident-trigger/azuredeploy.json
+++ b/Playbooks/Create-IBMResilientIncident/incident-trigger/azuredeploy.json
@@ -9,7 +9,7 @@
             "entities": [], 
             "tags": ["Sync"], 
             "support": {
-                "kind": "Community" 
+                "tier": "Community" 
             },
             "author": {
                 "name": "Nicholas DiCola"
diff --git a/Playbooks/Get-VirusTotalDomainReport/incident-trigger/azuredeploy.json b/Playbooks/Get-VirusTotalDomainReport/incident-trigger/azuredeploy.json
index b4faec8546..6263b97b87 100644
--- a/Playbooks/Get-VirusTotalDomainReport/incident-trigger/azuredeploy.json
+++ b/Playbooks/Get-VirusTotalDomainReport/incident-trigger/azuredeploy.json
@@ -9,7 +9,7 @@
         "entities": [ "URL" ],
         "tags": [ "Enrich" ],
         "support": {
-            "kind": "Community"
+            "tier": "Community"
         },
         "author": {
             "name": "Nicholas DiCola"
diff --git a/Playbooks/Get-VirusTotalURLReport/incident-trigger/azuredeploy.json b/Playbooks/Get-VirusTotalURLReport/incident-trigger/azuredeploy.json
index f6096de397..cbdf5a6dca 100644
--- a/Playbooks/Get-VirusTotalURLReport/incident-trigger/azuredeploy.json
+++ b/Playbooks/Get-VirusTotalURLReport/incident-trigger/azuredeploy.json
@@ -9,7 +9,7 @@
         "entities": [ "URL" ],
         "tags": [ "Enrich" ],
         "support": {
-            "kind": "Community"
+            "tier": "Community"
         },
         "author": {
             "name": "Nicholas DiCola"
diff --git a/Playbooks/Isolate-MDEMachine/alert-trigger/azuredeploy.json b/Playbooks/Isolate-MDEMachine/alert-trigger/azuredeploy.json
index 3e341f5571..37189729e2 100644
--- a/Playbooks/Isolate-MDEMachine/alert-trigger/azuredeploy.json
+++ b/Playbooks/Isolate-MDEMachine/alert-trigger/azuredeploy.json
@@ -9,7 +9,7 @@
         "entities": [ "Host" ],
         "tags": [ "Remediation" ],
         "support": {
-            "kind": "Community"
+            "tier": "Community"
         },
         "author": {
             "name": "Nicholas DiCola"
diff --git a/Playbooks/Isolate-MDEMachine/incident-trigger/azuredeploy.json b/Playbooks/Isolate-MDEMachine/incident-trigger/azuredeploy.json
index d82d93ba27..354ca91957 100644
--- a/Playbooks/Isolate-MDEMachine/incident-trigger/azuredeploy.json
+++ b/Playbooks/Isolate-MDEMachine/incident-trigger/azuredeploy.json
@@ -9,7 +9,7 @@
         "entities": [ "Host" ],
         "tags": [ "Remediation" ],
         "support": {
-            "kind": "Community"
+            "tier": "Community"
         },
         "author": {
             "name": "Nicholas DiCola"
diff --git a/Playbooks/Remove-MDEAppExecution/incident-trigger/azuredeploy.json b/Playbooks/Remove-MDEAppExecution/incident-trigger/azuredeploy.json
index 087a5cb8cd..cd38ffcbca 100644
--- a/Playbooks/Remove-MDEAppExecution/incident-trigger/azuredeploy.json
+++ b/Playbooks/Remove-MDEAppExecution/incident-trigger/azuredeploy.json
@@ -9,7 +9,7 @@
         "entities": [ "Host" ],
         "tags": [ "Remediation" ],
         "support": {
-            "kind": "Community"
+            "tier": "Community"
         },
         "author": {
             "name": "Nicholas DiCola"
diff --git a/Playbooks/Restrict-MDEAppExecution/alert-trigger/azuredeploy.json b/Playbooks/Restrict-MDEAppExecution/alert-trigger/azuredeploy.json
index 20f4b568c6..af3c0a86d5 100644
--- a/Playbooks/Restrict-MDEAppExecution/alert-trigger/azuredeploy.json
+++ b/Playbooks/Restrict-MDEAppExecution/alert-trigger/azuredeploy.json
@@ -9,7 +9,7 @@
         "entities": [ "Host" ],
         "tags": [ "Remediation" ],
         "support": {
-            "kind": "Community"
+            "tier": "Community"
         }
     },
     "parameters": {
diff --git a/Playbooks/Restrict-MDEAppExecution/incident-trigger/azuredeploy.json b/Playbooks/Restrict-MDEAppExecution/incident-trigger/azuredeploy.json
index c9df3dc674..c6ba302030 100644
--- a/Playbooks/Restrict-MDEAppExecution/incident-trigger/azuredeploy.json
+++ b/Playbooks/Restrict-MDEAppExecution/incident-trigger/azuredeploy.json
@@ -9,7 +9,7 @@
         "entities": [ "Host" ],
         "tags": [ "Remediation" ],
         "support": {
-            "kind": "Community"
+            "tier": "Community"
         },
         "author": {
             "name": "Nicholas DiCola"
diff --git a/Playbooks/Restrict-MDEDomain/alert-trigger/azuredeploy.json b/Playbooks/Restrict-MDEDomain/alert-trigger/azuredeploy.json
index 63c2ec2f57..6c542783f4 100644
--- a/Playbooks/Restrict-MDEDomain/alert-trigger/azuredeploy.json
+++ b/Playbooks/Restrict-MDEDomain/alert-trigger/azuredeploy.json
@@ -9,7 +9,7 @@
         "entities": [ "Dns" ],
         "tags": [ "Remediation" ],
         "support": {
-            "kind": "Community"
+            "tier": "Community"
         },
         "author": {
             "name": "Nicholas DiCola"
diff --git a/Playbooks/Restrict-MDEDomain/incident-trigger/azuredeploy.json b/Playbooks/Restrict-MDEDomain/incident-trigger/azuredeploy.json
index efe50c6b38..4057ecc18f 100644
--- a/Playbooks/Restrict-MDEDomain/incident-trigger/azuredeploy.json
+++ b/Playbooks/Restrict-MDEDomain/incident-trigger/azuredeploy.json
@@ -9,7 +9,7 @@
         "entities": [ "Dns" ],
         "tags": [ "Remediation" ],
         "support": {
-            "kind": "Community"
+            "tier": "Community"
         },
         "author": {
             "name": "Nicholas DiCola"
diff --git a/Playbooks/Restrict-MDEFileHash/alert-trigger/azuredeploy.json b/Playbooks/Restrict-MDEFileHash/alert-trigger/azuredeploy.json
index 76d2e54821..bdbf9fdef4 100644
--- a/Playbooks/Restrict-MDEFileHash/alert-trigger/azuredeploy.json
+++ b/Playbooks/Restrict-MDEFileHash/alert-trigger/azuredeploy.json
@@ -9,7 +9,7 @@
         "entities": [ "FileHash" ],
         "tags": [ "Remediation" ],
         "support": {
-            "kind": "Community"
+            "tier": "Community"
         },
         "author": {
             "name": "Nicholas DiCola"
diff --git a/Playbooks/Restrict-MDEFileHash/incident-trigger/azuredeploy.json b/Playbooks/Restrict-MDEFileHash/incident-trigger/azuredeploy.json
index 5074631452..8ba03294e7 100644
--- a/Playbooks/Restrict-MDEFileHash/incident-trigger/azuredeploy.json
+++ b/Playbooks/Restrict-MDEFileHash/incident-trigger/azuredeploy.json
@@ -9,7 +9,7 @@
         "entities": [ "FileHash" ],
         "tags": [ "Remediation" ],
         "support": {
-            "kind": "Community"
+            "tier": "Community"
         },
         "author": {
             "name": "Nicholas DiCola"
diff --git a/Playbooks/Restrict-MDEIPAddress/alert-trigger/azuredeploy.json b/Playbooks/Restrict-MDEIPAddress/alert-trigger/azuredeploy.json
index 6acf5a54eb..84ae9e7fc6 100644
--- a/Playbooks/Restrict-MDEIPAddress/alert-trigger/azuredeploy.json
+++ b/Playbooks/Restrict-MDEIPAddress/alert-trigger/azuredeploy.json
@@ -9,7 +9,7 @@
         "entities": [ "Ip" ],
         "tags": [ "Remediation" ],
         "support": {
-            "kind": "Community"
+            "tier": "Community"
         },
         "author": {
             "name": "Nicholas DiCola"
diff --git a/Playbooks/Restrict-MDEIPAddress/incident-trigger/azuredeploy.json b/Playbooks/Restrict-MDEIPAddress/incident-trigger/azuredeploy.json
index 6c167dbeed..f1a0142f90 100644
--- a/Playbooks/Restrict-MDEIPAddress/incident-trigger/azuredeploy.json
+++ b/Playbooks/Restrict-MDEIPAddress/incident-trigger/azuredeploy.json
@@ -9,7 +9,7 @@
         "entities": [ "Ip" ],
         "tags": [ "Remediation" ],
         "support": {
-            "kind": "Community"
+            "tier": "Community"
         },
         "author": {
             "name": "Nicholas DiCola"
diff --git a/Playbooks/Restrict-MDEUrl/alert-trigger/azuredeploy.json b/Playbooks/Restrict-MDEUrl/alert-trigger/azuredeploy.json
index 7fd481d582..a1f6208051 100644
--- a/Playbooks/Restrict-MDEUrl/alert-trigger/azuredeploy.json
+++ b/Playbooks/Restrict-MDEUrl/alert-trigger/azuredeploy.json
@@ -9,7 +9,7 @@
         "entities": [ "Url" ],
         "tags": [ "Remediation" ],
         "support": {
-            "kind": "Community"
+            "tier": "Community"
         },
         "author": {
             "name": "Nicholas DiCola"
diff --git a/Playbooks/Restrict-MDEUrl/incident-trigger/azuredeploy.json b/Playbooks/Restrict-MDEUrl/incident-trigger/azuredeploy.json
index d3a46c62fa..7b72e5f42d 100644
--- a/Playbooks/Restrict-MDEUrl/incident-trigger/azuredeploy.json
+++ b/Playbooks/Restrict-MDEUrl/incident-trigger/azuredeploy.json
@@ -9,7 +9,7 @@
         "entities": [ "Url" ],
         "tags": [ "Remediation" ],
         "support": {
-            "kind": "Community"
+            "tier": "Community"
         },
         "author": {
             "name": "Nicholas DiCola"
diff --git a/Playbooks/Run-MDEAntivirus/alert-trigger/azuredeploy.json b/Playbooks/Run-MDEAntivirus/alert-trigger/azuredeploy.json
index ef1e402f57..8fe9094617 100644
--- a/Playbooks/Run-MDEAntivirus/alert-trigger/azuredeploy.json
+++ b/Playbooks/Run-MDEAntivirus/alert-trigger/azuredeploy.json
@@ -9,7 +9,7 @@
         "entities": [ "Host" ],
         "tags": [ "Remediation" ],
         "support": {
-            "kind": "Community"
+            "tier": "Community"
         },
         "author": {
             "name": "Nicholas DiCola"
diff --git a/Playbooks/Run-MDEAntivirus/incident-trigger/azuredeploy.json b/Playbooks/Run-MDEAntivirus/incident-trigger/azuredeploy.json
index 2146ddfcda..c0600e1cba 100644
--- a/Playbooks/Run-MDEAntivirus/incident-trigger/azuredeploy.json
+++ b/Playbooks/Run-MDEAntivirus/incident-trigger/azuredeploy.json
@@ -9,7 +9,7 @@
         "entities": [ "Host" ],
         "tags": [ "Remediation" ],
         "support": {
-            "kind": "Community"
+            "tier": "Community"
         },
         "author": {
             "name": "Nicholas DiCola"
diff --git a/Playbooks/Unisolate-MDEMachine/alert-trigger/azuredeploy.json b/Playbooks/Unisolate-MDEMachine/alert-trigger/azuredeploy.json
index 34b5857a7e..b8f9ebddbf 100644
--- a/Playbooks/Unisolate-MDEMachine/alert-trigger/azuredeploy.json
+++ b/Playbooks/Unisolate-MDEMachine/alert-trigger/azuredeploy.json
@@ -9,7 +9,7 @@
         "entities": [ "Host" ],
         "tags": [ "Remediation" ],
         "support": {
-            "kind": "Community"
+            "tier": "Community"
         },
         "author": {
             "name": "Nicholas DiCola"
diff --git a/Playbooks/Unisolate-MDEMachine/incident-trigger/azuredeploy.json b/Playbooks/Unisolate-MDEMachine/incident-trigger/azuredeploy.json
index 6399a91998..6d04a25fd9 100644
--- a/Playbooks/Unisolate-MDEMachine/incident-trigger/azuredeploy.json
+++ b/Playbooks/Unisolate-MDEMachine/incident-trigger/azuredeploy.json
@@ -9,7 +9,7 @@
         "entities": [ "Host" ],
         "tags": [ "Remediation" ],
         "support": {
-            "kind": "Community"
+            "tier": "Community"
         },
         "author": {
             "name": "Nicholas DiCola"