diff --git a/baselines/cis_lvl2.yaml b/baselines/cis_lvl2.yaml
index 09f997d8..67dfe7d7 100644
--- a/baselines/cis_lvl2.yaml
+++ b/baselines/cis_lvl2.yaml
@@ -22,7 +22,13 @@ profile:
       - audit_files_group_configure
       - audit_files_mode_configure
       - audit_files_owner_configure
-      - audit_flags_configure
+      - audit_flags_aa_configure
+      - audit_flags_ad_configure
+      - audit_flags_ex_configure
+      - audit_flags_fm_failed_configure
+      - audit_flags_fr_configure
+      - audit_flags_fw_configure
+      - audit_flags_lo_configure
       - audit_folder_group_configure
       - audit_folder_owner_configure
       - audit_folders_mode_configure
diff --git a/baselines/cisv8.yaml b/baselines/cisv8.yaml
index e3c79fb0..66f66a04 100644
--- a/baselines/cisv8.yaml
+++ b/baselines/cisv8.yaml
@@ -23,7 +23,13 @@ profile:
       - audit_files_group_configure
       - audit_files_mode_configure
       - audit_files_owner_configure
-      - audit_flags_configure
+      - audit_flags_aa_configure
+      - audit_flags_ad_configure
+      - audit_flags_ex_configure
+      - audit_flags_fm_failed_configure
+      - audit_flags_fr_configure
+      - audit_flags_fw_configure
+      - audit_flags_lo_configure
       - audit_folder_group_configure
       - audit_folder_owner_configure
       - audit_folders_mode_configure
diff --git a/rules/audit/audit_flags_aa_configure.yaml b/rules/audit/audit_flags_aa_configure.yaml
index de1c2b49..c8d9c2de 100644
--- a/rules/audit/audit_flags_aa_configure.yaml
+++ b/rules/audit/audit_flags_aa_configure.yaml
@@ -40,6 +40,13 @@ references:
   800-171r2:
     - 3.3.1
     - 3.3.2
+  cis:
+    benchmark:
+      - 3.2 (level 2)
+    controls v8:
+      - 3.14
+      - 8.2
+      - 8.5    
 macOS:
   - "13.0"
 tags:
@@ -53,6 +60,8 @@ tags:
   - 800-171 
   - cnssi-1253
   - stig
+  - cis_lvl2
+  - cisv8
 severity: "medium"
 mobileconfig: false
 mobileconfig_info:
\ No newline at end of file
diff --git a/rules/audit/audit_flags_ad_configure.yaml b/rules/audit/audit_flags_ad_configure.yaml
index a7af89c0..78d563eb 100644
--- a/rules/audit/audit_flags_ad_configure.yaml
+++ b/rules/audit/audit_flags_ad_configure.yaml
@@ -61,6 +61,13 @@ references:
     - 3.1.7
     - 3.3.1
     - 3.3.2
+  cis:
+    benchmark:
+      - 3.2 (level 2)
+    controls v8:
+      - 3.14
+      - 8.2
+      - 8.5    
 macOS:
   - "13.0"
 tags:
@@ -74,6 +81,8 @@ tags:
   - 800-171 
   - cnssi-1253
   - stig
+  - cis_lvl2
+  - cisv8
 severity: "medium"
 mobileconfig: false
 mobileconfig_info:
\ No newline at end of file
diff --git a/rules/audit/audit_flags_ex_configure.yaml b/rules/audit/audit_flags_ex_configure.yaml
index eb7bf68c..0ddb6b9c 100644
--- a/rules/audit/audit_flags_ex_configure.yaml
+++ b/rules/audit/audit_flags_ex_configure.yaml
@@ -37,6 +37,13 @@ references:
   800-171r2:
     - 3.3.1
     - 3.3.2
+  cis:
+    benchmark:
+      - 3.2 (level 2)
+    controls v8:
+      - 3.14
+      - 8.2
+      - 8.5    
 macOS:
   - "13.0"
 tags:
@@ -49,5 +56,7 @@ tags:
   - 800-53r5_high
   - 800-171
   - cnssi-1253
+  - cis_lvl2
+  - cisv8
 mobileconfig: false
 mobileconfig_info:
\ No newline at end of file
diff --git a/rules/audit/audit_flags_fr_configure.yaml b/rules/audit/audit_flags_fr_configure.yaml
index 2cfb7c82..66f096fe 100644
--- a/rules/audit/audit_flags_fr_configure.yaml
+++ b/rules/audit/audit_flags_fr_configure.yaml
@@ -53,6 +53,13 @@ references:
     - 3.3.1
     - 3.3.2
     - 3.3.8
+  cis:
+    benchmark:
+      - 3.2 (level 2)
+    controls v8:
+      - 3.14
+      - 8.2
+      - 8.5    
 macOS:
   - "13.0"
 tags:
@@ -66,6 +73,8 @@ tags:
   - 800-171 
   - cnssi-1253
   - stig
+  - cis_lvl2
+  - cisv8
 severity: "medium"
 mobileconfig: false
 mobileconfig_info:
\ No newline at end of file
diff --git a/rules/audit/audit_flags_fw_configure.yaml b/rules/audit/audit_flags_fw_configure.yaml
index e9670dde..5e6a5cac 100644
--- a/rules/audit/audit_flags_fw_configure.yaml
+++ b/rules/audit/audit_flags_fw_configure.yaml
@@ -52,6 +52,13 @@ references:
     - 3.3.1
     - 3.3.2
     - 3.3.8
+  cis:
+    benchmark:
+      - 3.2 (level 2)
+    controls v8:
+      - 3.14
+      - 8.2
+      - 8.5    
 macOS:
   - "13.0"
 tags:
@@ -65,6 +72,8 @@ tags:
   - 800-171 
   - cnssi-1253
   - stig
+  - cis_lvl2
+  - cisv8
 severity: "medium"
 mobileconfig: false
 mobileconfig_info:
\ No newline at end of file
diff --git a/rules/audit/audit_flags_lo_configure.yaml b/rules/audit/audit_flags_lo_configure.yaml
index 5343aa74..726cb0dd 100644
--- a/rules/audit/audit_flags_lo_configure.yaml
+++ b/rules/audit/audit_flags_lo_configure.yaml
@@ -41,6 +41,13 @@ references:
     - 3.1.12
     - 3.3.1
     - 3.3.2
+  cis:
+    benchmark:
+      - 3.2 (level 2)
+    controls v8:
+      - 3.14
+      - 8.2
+      - 8.5    
 macOS:
   - "13.0"
 tags:
@@ -54,6 +61,8 @@ tags:
   - 800-171 
   - cnssi-1253
   - stig
+  - cis_lvl2
+  - cisv8
 severity: "medium"
 mobileconfig: false
 mobileconfig_info:
\ No newline at end of file