diff --git a/src/mscp/data/rules/supplemental/supplemental_cis_manual_15.yaml b/src/mscp/data/rules/supplemental/supplemental_cis_manual_15.yaml
index 5c56b7b2..0a6d1d74 100644
--- a/src/mscp/data/rules/supplemental/supplemental_cis_manual_15.yaml
+++ b/src/mscp/data/rules/supplemental/supplemental_cis_manual_15.yaml
@@ -10,14 +10,15 @@ discussion: |
   |System Settings
 
   |Recommendations
-  |2.1.1.1 Audit iCloud Keychain +
+  |2.1.1.1 Audit iCloud Passwords & Keychain +
   2.1.1.2 Audit iCloud Drive +
-  2.1.1.4 Audit Security Keys Used With AppleIDs +
+  2.1.1.4 Audit Security Keys Used With Apple Accounts +
   2.1.1.5 Audit Freeform Sync to iCloud +
   2.1.1.6 Audit Find My Mac +
   2.1.2 Audit App Store Password Settings +
   2.3.3.11 Ensure Computer Name Does Not Contain PII or Protected Organizational Information +
-  2.5.2.2 Ensure Listen for Siri is Disabled +
+  2.4.1 Audit Menu Bar and Control Center Icons +
+  2.5.2.2 Ensure Listen for (Siri) Is Disabled +
   2.6.1.3 Audit Location Services Access +
   2.6.2.1 Audit Full Disk Access for Applications +
   2.6.3.5 Ensure Share iCloud Analytics Is Disabled +
@@ -27,10 +28,9 @@ discussion: |
   2.10.1.1 Ensure the OS Is Not Active When Resuming from Standby (Intel) +
   2.12.2 Audit Touch ID +
   2.14.1 Audit Game Center Settings +
-  2.15.1 Audit Notification & Focus Settings +
+  2.15.1 Audit Notification Settings +
   2.16.1 Audit Wallet & Apple Pay Settings +
   2.17.1 Audit Internet Accounts for Authorized Use +
-  6.5.1 Audit Passwords System Preference Setting +
   |===
 
   [cols="15%h, 85%a"]
@@ -52,8 +52,7 @@ discussion: |
   5.2.4 Ensure Complex Password Must Contain Numeric Character Is Configured +
   5.2.5 Ensure Complex Password Must Contain Special Character Is Configured +
   5.2.6 Ensure Complex Password Must Contain Uppercase and Lowercase Characters Is Configured +
-  5.3.1 Ensure All User Storage APFS Volumes are Encrypted +
-  5.3.2 Ensure All User Storage CoreStorage Volumes are Encrypted +
+  5.3.3 Audit Connected FAT32 and ExFAT Drives +
   |===
 
   [cols="15%h, 85%a"]
@@ -68,6 +67,7 @@ discussion: |
   6.3.5 Audit Hide IP Address in Safari Setting +
   6.3.8 Audit Autofill +
   6.3.9 Audit Pop-up Windows +
+  6.5.1 Audit Passwords +
   |===
 references:
   nist: {}
diff --git a/src/mscp/data/rules/supplemental/supplemental_cis_manual_26.yaml b/src/mscp/data/rules/supplemental/supplemental_cis_manual_26.yaml
index d892f285..4813c7d6 100644
--- a/src/mscp/data/rules/supplemental/supplemental_cis_manual_26.yaml
+++ b/src/mscp/data/rules/supplemental/supplemental_cis_manual_26.yaml
@@ -10,16 +10,7 @@ discussion: |
   |System Settings
 
   |Recommendations
-  | 1.7 Ensure the System is Managed by a Mobile Device Management (MDM) Software
-  |===
-
-  [cols="15%h, 85%a"]
-  |===
-  |Section
-  |System Settings
-
-  |Recommendations
-  |2.1.1.1 Audit iCloud Keychain +
+  |2.1.1.1 Audit iCloud Passwords & Keychain +
   2.1.1.2 Audit iCloud Drive +
   2.1.1.4 Audit Security Keys Used With Apple Accounts +
   2.1.1.5 Audit Freeform Sync to iCloud +
@@ -27,7 +18,7 @@ discussion: |
   2.1.2 Audit App Store Password Settings +
   2.3.3.11 Ensure Computer Name Does Not Contain PII or Protected Organizational Information +
   2.4.1 Audit Menu Bar and Control Center Icons +
-  2.5.2.2 Ensure Listen for Siri is Disabled +
+  2.5.2.2 Ensure Listen for (Siri) Is Disabled +
   2.6.1.3 Audit Location Services Access +
   2.6.2.1 Audit Full Disk Access for Applications +
   2.6.3.5 Ensure Share iCloud Analytics Is Disabled +
@@ -37,7 +28,7 @@ discussion: |
   2.10.1.1 Ensure the OS Is Not Active When Resuming from Standby (Intel) +
   2.12.2 Audit Touch ID +
   2.14.1 Audit Game Center Settings +
-  2.15.1 Audit Notification & Focus Settings +
+  2.15.1 Audit Notification Settings +
   2.16.1 Audit Wallet & Apple Pay Settings +
   2.17.1 Audit Internet Accounts for Authorized Use +
   |===
@@ -61,8 +52,7 @@ discussion: |
   5.2.4 Ensure Complex Password Must Contain Numeric Character Is Configured +
   5.2.5 Ensure Complex Password Must Contain Special Character Is Configured +
   5.2.6 Ensure Complex Password Must Contain Uppercase and Lowercase Characters Is Configured +
-  5.3.1 Ensure All User Storage APFS Volumes are Encrypted +
-  5.3.2 Ensure All User Storage CoreStorage Volumes are Encrypted +
+  5.3.3 Audit Connected FAT32 and ExFAT Drives +
   |===
 
   [cols="15%h, 85%a"]