diff --git a/checklists/eh_checklist.en.json b/checklists/eh_checklist.en.json
index 320183740..7ea276085 100644
--- a/checklists/eh_checklist.en.json
+++ b/checklists/eh_checklist.en.json
@@ -10,6 +10,7 @@
             "guid": "7aaf12e7-b94e-4f6e-847d-2d92981b1cd6",
             "id": "A01.01",
             "severity": "Low",
+            "query": "resources | where type =~ 'Microsoft.EventHub/namespaces' | extend SkuName = tostring(sku.name) | extend EncryptionEnabled = iif(isnotempty(properties.encryption.keySource), 'Enabled', 'Disabled') | extend compliant = iif(EncryptionEnabled == 'Enabled', true, false) | project name, resourceGroup, location, SkuName, EncryptionEnabled, compliant | where SkuName == 'Premium'",
             "training": "https://learn.microsoft.com/learn/modules/plan-implement-administer-conditional-access/",
             "link": "https://learn.microsoft.com/azure/event-hubs/configure-customer-managed-key"
         },
@@ -23,6 +24,7 @@
             "guid": "d2f54b29-769e-43a6-a0e7-828ac936657e",
             "id": "A01.02",
             "severity": "Medium",
+            "query": "resources | where type =~ 'Microsoft.EventHub/namespaces' | extend MinimumTlsVersion = tostring(properties.minimumTlsVersion) | extend compliant = iif(MinimumTlsVersion == '1.2' or MinimumTlsVersion == '1.3', true, false) | project name, resourceGroup, location, MinimumTlsVersion, compliant",
             "training": "https://learn.microsoft.com/learn/modules/secure-aad-users-with-mfa/",
             "link": "https://learn.microsoft.com/azure/event-hubs/transport-layer-security-configure-minimum-version"
         },
@@ -125,6 +127,7 @@
             "guid": "f15bce21-9e4a-40eb-9787-9424d226786d",
             "id": "B01.2",
             "severity": "High",
+            "query": "resources | where type =~ 'Microsoft.EventHub/namespaces' | extend zoneRedundant = tobool(properties.zoneRedundant) | extend compliant = iff(zoneRedundant == true, true, false) | project name, resourceGroup, zoneRedundant, compliant",
             "link": "https://learn.microsoft.com/azure/event-hubs/event-hubs-premium-overview#high-availability-with-availability-zones"
         },
         {
@@ -136,6 +139,7 @@
             "guid": "20b56c56-ad58-4519-8f82-735c586bb281",
             "id": "B01.3",
             "severity": "Medium",
+            "query": "resources | where type =~ 'Microsoft.EventHub/namespaces' | extend sku = tostring(sku.name) | extend compliant = iff(sku == 'Premium', true, false) | project name, resourceGroup, location, sku, compliant",
             "link": "https://learn.microsoft.com/azure/event-hubs/compare-tiers"
         },
         {
@@ -264,4 +268,4 @@
         "waf": "all",
         "timestamp": "April 09, 2024"
     }
-}
\ No newline at end of file
+}