diff --git a/compliance/controls/aws/aws_cis_v300_1_20.yaml b/compliance/controls/aws/aws_cis_v300_1_20.yaml
index 179cebc60..ce37149d1 100644
--- a/compliance/controls/aws/aws_cis_v300_1_20.yaml
+++ b/compliance/controls/aws/aws_cis_v300_1_20.yaml
@@ -8,7 +8,7 @@ Query:
     - aws_region
     - aws_accessanalyzer_analyzer
   Parameters: []
-  PrimaryTable: aws_accessanalyzer_analyzer
+  PrimaryTable: aws_region
   QueryToExecute: |
     SELECT
       'arn:' || r.partition || '::' || r.region || ':' || r.account_id AS resource,
diff --git a/compliance/controls/azure/azure_cis_v200_2_1_14.yaml b/compliance/controls/azure/azure_cis_v200_2_1_14.yaml
index 5181d2e41..ef15a3c95 100644
--- a/compliance/controls/azure/azure_cis_v200_2_1_14.yaml
+++ b/compliance/controls/azure/azure_cis_v200_2_1_14.yaml
@@ -8,7 +8,7 @@ Query:
     - azure_policy_assignment
     - azure_subscription
   Parameters: []
-  PrimaryTable: azure_policy_assignment
+  PrimaryTable: azure_subscription
   QueryToExecute: |
     WITH policy_assignment_parameters AS (
       SELECT
diff --git a/compliance/controls/azure/azure_cis_v200_5_2_7.yaml b/compliance/controls/azure/azure_cis_v200_5_2_7.yaml
index 18292c3c8..677dae669 100644
--- a/compliance/controls/azure/azure_cis_v200_5_2_7.yaml
+++ b/compliance/controls/azure/azure_cis_v200_5_2_7.yaml
@@ -8,7 +8,7 @@ Query:
     - azure_log_alert
     - azure_subscription
   Parameters: []
-  PrimaryTable: azure_log_alert
+  PrimaryTable: azure_subscription
   QueryToExecute: |
     WITH alert_rule AS
     (
diff --git a/compliance/controls/azure/azure_cis_v200_5_2_8.yaml b/compliance/controls/azure/azure_cis_v200_5_2_8.yaml
index 9eca51cc3..0c7d1906e 100644
--- a/compliance/controls/azure/azure_cis_v200_5_2_8.yaml
+++ b/compliance/controls/azure/azure_cis_v200_5_2_8.yaml
@@ -8,7 +8,7 @@ Query:
     - azure_log_alert
     - azure_subscription
   Parameters: []
-  PrimaryTable: azure_log_alert
+  PrimaryTable: azure_subscription
   QueryToExecute: |
     WITH alert_rule AS (
       SELECT
diff --git a/compliance/controls/azure/azure_cis_v200_5_2_9.yaml b/compliance/controls/azure/azure_cis_v200_5_2_9.yaml
index b2663f32b..12fbd0176 100644
--- a/compliance/controls/azure/azure_cis_v200_5_2_9.yaml
+++ b/compliance/controls/azure/azure_cis_v200_5_2_9.yaml
@@ -8,7 +8,7 @@ Query:
     - azure_log_alert
     - azure_subscription
   Parameters: []
-  PrimaryTable: azure_log_alert
+  PrimaryTable: azure_subscription
   QueryToExecute: |
     WITH alert_rule AS (
       SELECT
diff --git a/compliance/controls/azure/azure_cis_v210_2_1_18.yaml b/compliance/controls/azure/azure_cis_v210_2_1_18.yaml
index f9c2bb6c1..77e159fb9 100644
--- a/compliance/controls/azure/azure_cis_v210_2_1_18.yaml
+++ b/compliance/controls/azure/azure_cis_v210_2_1_18.yaml
@@ -8,7 +8,7 @@ Query:
     - azure_security_center_contact
     - azure_subscription
   Parameters: []
-  PrimaryTable: azure_security_center_contact
+  PrimaryTable: azure_subscription
   QueryToExecute: |
     WITH contact_info AS (
       SELECT
diff --git a/compliance/controls/azure/azure_cis_v210_5_2_10.yaml b/compliance/controls/azure/azure_cis_v210_5_2_10.yaml
index a010bff77..e39918e04 100644
--- a/compliance/controls/azure/azure_cis_v210_5_2_10.yaml
+++ b/compliance/controls/azure/azure_cis_v210_5_2_10.yaml
@@ -8,7 +8,7 @@ Query:
     - azure_log_alert
     - azure_subscription
   Parameters: []
-  PrimaryTable: azure_log_alert
+  PrimaryTable: azure_subscription
   QueryToExecute: |
     WITH alert_rule AS (
       SELECT
diff --git a/compliance/controls/azure/azure_cis_v210_5_2_2.yaml b/compliance/controls/azure/azure_cis_v210_5_2_2.yaml
index 77f608897..5038395ea 100644
--- a/compliance/controls/azure/azure_cis_v210_5_2_2.yaml
+++ b/compliance/controls/azure/azure_cis_v210_5_2_2.yaml
@@ -8,7 +8,7 @@ Query:
     - azure_log_alert
     - azure_subscription
   Parameters: []
-  PrimaryTable: azure_log_alert
+  PrimaryTable: azure_subscription
   QueryToExecute: |
     WITH alert_rule AS (
       SELECT
diff --git a/compliance/controls/azure/azure_cis_v210_5_2_3.yaml b/compliance/controls/azure/azure_cis_v210_5_2_3.yaml
index 85d4b7847..53c2f2612 100644
--- a/compliance/controls/azure/azure_cis_v210_5_2_3.yaml
+++ b/compliance/controls/azure/azure_cis_v210_5_2_3.yaml
@@ -8,7 +8,7 @@ Query:
     - azure_log_alert
     - azure_subscription
   Parameters: []
-  PrimaryTable: azure_log_alert
+  PrimaryTable: azure_subscription
   QueryToExecute: |
     WITH alert_rule AS (
       SELECT
diff --git a/compliance/controls/azure/azure_cis_v210_5_2_4.yaml b/compliance/controls/azure/azure_cis_v210_5_2_4.yaml
index 64f4ec56d..343bc8c31 100644
--- a/compliance/controls/azure/azure_cis_v210_5_2_4.yaml
+++ b/compliance/controls/azure/azure_cis_v210_5_2_4.yaml
@@ -8,7 +8,7 @@ Query:
     - azure_log_alert
     - azure_subscription
   Parameters: []
-  PrimaryTable: azure_log_alert
+  PrimaryTable: azure_subscription
   QueryToExecute: |
     WITH alert_rule AS (
       SELECT
diff --git a/compliance/controls/azure/azure_cis_v210_5_2_5.yaml b/compliance/controls/azure/azure_cis_v210_5_2_5.yaml
index a68d8c628..8628100ee 100644
--- a/compliance/controls/azure/azure_cis_v210_5_2_5.yaml
+++ b/compliance/controls/azure/azure_cis_v210_5_2_5.yaml
@@ -8,7 +8,7 @@ Query:
     - azure_log_alert
     - azure_subscription
   Parameters: []
-  PrimaryTable: azure_log_alert
+  PrimaryTable: azure_subscription
   QueryToExecute: |
     WITH alert_rule AS (
       SELECT
diff --git a/compliance/controls/azure/azure_cis_v210_5_2_6.yaml b/compliance/controls/azure/azure_cis_v210_5_2_6.yaml
index 968f315ff..5a1294336 100644
--- a/compliance/controls/azure/azure_cis_v210_5_2_6.yaml
+++ b/compliance/controls/azure/azure_cis_v210_5_2_6.yaml
@@ -8,7 +8,7 @@ Query:
     - azure_log_alert
     - azure_subscription
   Parameters: []
-  PrimaryTable: azure_log_alert
+  PrimaryTable: azure_subscription
   QueryToExecute: |
     WITH alert_rule AS (
       SELECT
diff --git a/compliance/controls/azure/azure_cis_v210_5_2_7.yaml b/compliance/controls/azure/azure_cis_v210_5_2_7.yaml
index 3058dba91..0ac84b4c2 100644
--- a/compliance/controls/azure/azure_cis_v210_5_2_7.yaml
+++ b/compliance/controls/azure/azure_cis_v210_5_2_7.yaml
@@ -8,7 +8,7 @@ Query:
     - azure_log_alert
     - azure_subscription
   Parameters: []
-  PrimaryTable: azure_log_alert
+  PrimaryTable: azure_subscription
   QueryToExecute: |
     WITH alert_rule AS (
       SELECT
diff --git a/compliance/controls/azure/azure_cis_v210_5_2_8.yaml b/compliance/controls/azure/azure_cis_v210_5_2_8.yaml
index 7b5ec11f8..f96998b72 100644
--- a/compliance/controls/azure/azure_cis_v210_5_2_8.yaml
+++ b/compliance/controls/azure/azure_cis_v210_5_2_8.yaml
@@ -8,7 +8,7 @@ Query:
     - azure_log_alert
     - azure_subscription
   Parameters: []
-  PrimaryTable: azure_log_alert
+  PrimaryTable: azure_subscription
   QueryToExecute: |
     WITH alert_rule AS (
       SELECT
diff --git a/compliance/controls/azure/azure_cis_v210_5_3_1.yaml b/compliance/controls/azure/azure_cis_v210_5_3_1.yaml
index c0abeda13..550fe4780 100644
--- a/compliance/controls/azure/azure_cis_v210_5_3_1.yaml
+++ b/compliance/controls/azure/azure_cis_v210_5_3_1.yaml
@@ -8,7 +8,7 @@ Query:
     - azure_application_insight
     - azure_subscription
   Parameters: []
-  PrimaryTable: azure_application_insight
+  PrimaryTable: azure_subscription
   QueryToExecute: |
     WITH application_insights AS (
       SELECT
diff --git a/compliance/controls/azure/azure_cis_v210_7_1.yaml b/compliance/controls/azure/azure_cis_v210_7_1.yaml
index b27f7e457..8d167aed0 100644
--- a/compliance/controls/azure/azure_cis_v210_7_1.yaml
+++ b/compliance/controls/azure/azure_cis_v210_7_1.yaml
@@ -8,7 +8,7 @@ Query:
     - azure_bastion_host
     - azure_subscription
   Parameters: []
-  PrimaryTable: azure_bastion_host
+  PrimaryTable: azure_subscription
   QueryToExecute: |
     WITH bastion_hosts AS (
       SELECT