From d563de61429e0353bc5934d4dde4a8759ea8b99c Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <andrew.lukoshko@gmail.com>
Date: Fri, 7 Jun 2024 13:23:33 +0000
Subject: [PATCH] Update patch

---
 SOURCES/0001-Add-AlmaLinux-8-support.patch | 10814 ++++++++++---------
 1 file changed, 5458 insertions(+), 5356 deletions(-)

diff --git a/SOURCES/0001-Add-AlmaLinux-8-support.patch b/SOURCES/0001-Add-AlmaLinux-8-support.patch
index 952cd44..fbf3406 100644
--- a/SOURCES/0001-Add-AlmaLinux-8-support.patch
+++ b/SOURCES/0001-Add-AlmaLinux-8-support.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index aef21154f..a8d8360c6 100644
+index 5d4bc725f..3f4e91854 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -76,6 +76,7 @@ option(SSG_PRODUCT_DEFAULT "If enabled, all default release products will be bui
+@@ -80,6 +80,7 @@ option(SSG_PRODUCT_DEFAULT "If enabled, all default release products will be bui
  # unless explicitly asked for.
  option(SSG_PRODUCT_ALINUX2 "If enabled, the Alibaba Cloud Linux 2 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
  option(SSG_PRODUCT_ALINUX3 "If enabled, the Alibaba Cloud Linux 3 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
@@ -10,7 +10,7 @@ index aef21154f..a8d8360c6 100644
  option(SSG_PRODUCT_ANOLIS8 "If enabled, the Anolis OS 8 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
  option(SSG_PRODUCT_ANOLIS23 "If enabled, the Anolis OS 23 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
  option(SSG_PRODUCT_CHROMIUM "If enabled, the Chromium SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
-@@ -302,6 +303,7 @@ message(STATUS " ")
+@@ -310,6 +311,7 @@ message(STATUS " ")
  message(STATUS "Products:")
  message(STATUS "Alibaba Cloud Linux 2: ${SSG_PRODUCT_ALINUX2}")
  message(STATUS "Alibaba Cloud Linux 3: ${SSG_PRODUCT_ALINUX3}")
@@ -18,7 +18,7 @@ index aef21154f..a8d8360c6 100644
  message(STATUS "Anolis OS 8: ${SSG_PRODUCT_ANOLIS8}")
  message(STATUS "Anolis OS 23: ${SSG_PRODUCT_ANOLIS23}")
  message(STATUS "Chromium: ${SSG_PRODUCT_CHROMIUM}")
-@@ -371,6 +373,9 @@ endif()
+@@ -380,6 +382,9 @@ endif()
  if(SSG_PRODUCT_ALINUX3)
      add_subdirectory("products/alinux3" "alinux3")
  endif()
@@ -29,10 +29,10 @@ index aef21154f..a8d8360c6 100644
      add_subdirectory("products/anolis8" "anolis8")
  endif()
 diff --git a/build_product b/build_product
-index 34c74f12a..19f91ffff 100755
+index e6fb86991..ef28d8130 100755
 --- a/build_product
 +++ b/build_product
-@@ -321,6 +321,7 @@ set_explict_build_targets() {
+@@ -347,6 +347,7 @@ set_explict_build_targets() {
  all_cmake_products=(
  	ALINUX2
  	ALINUX3
@@ -41,10 +41,10 @@ index 34c74f12a..19f91ffff 100755
  	ANOLIS23
  	CHROMIUM
 diff --git a/cmake/SSGCommon.cmake b/cmake/SSGCommon.cmake
-index ea0f67644..d511ffe95 100644
+index 50f655c95..5936cdf12 100644
 --- a/cmake/SSGCommon.cmake
 +++ b/cmake/SSGCommon.cmake
-@@ -837,7 +837,7 @@ macro(ssg_build_product PRODUCT)
+@@ -822,7 +822,7 @@ macro(ssg_build_product PRODUCT)
      ssg_render_policies_for_product(${PRODUCT})
      add_dependencies(render-policies ${PRODUCT}-render-policies)
  
@@ -66,10 +66,10 @@ index 2b00bd908..4fc431b04 100644
  - ensure_gpgcheck_globally_activated
  - ensure_gpgcheck_local_packages
 diff --git a/controls/anssi.yml b/controls/anssi.yml
-index 665fd4073..884901fb0 100644
+index d02cd2523..b00619dfa 100644
 --- a/controls/anssi.yml
 +++ b/controls/anssi.yml
-@@ -1157,7 +1157,7 @@ controls:
+@@ -1238,7 +1238,7 @@ controls:
      - ensure_gpgcheck_never_disabled
      - ensure_gpgcheck_globally_activated
      - ensure_gpgcheck_local_packages
@@ -79,10 +79,10 @@ index 665fd4073..884901fb0 100644
  
    - id: R60
 diff --git a/controls/cis_rhel8.yml b/controls/cis_rhel8.yml
-index d81729d59..fd31d9a54 100644
+index 48406c172..28ae0c5c2 100644
 --- a/controls/cis_rhel8.yml
 +++ b/controls/cis_rhel8.yml
-@@ -351,7 +351,7 @@ controls:
+@@ -353,7 +353,7 @@ controls:
        - l1_workstation
      status: manual
      related_rules:
@@ -92,10 +92,10 @@ index d81729d59..fd31d9a54 100644
    - id: 1.2.2
      title: Ensure gpgcheck is globally activated (Automated)
 diff --git a/controls/cis_rhel9.yml b/controls/cis_rhel9.yml
-index d3d2fe87d..53fd01e15 100644
+index b6dfc5736..e7fc56cfe 100644
 --- a/controls/cis_rhel9.yml
 +++ b/controls/cis_rhel9.yml
-@@ -306,7 +306,7 @@ controls:
+@@ -308,7 +308,7 @@ controls:
        - l1_workstation
      status: manual
      related_rules:
@@ -105,10 +105,10 @@ index d3d2fe87d..53fd01e15 100644
    - id: 1.2.2
      title: Ensure gpgcheck is globally activated (Automated)
 diff --git a/controls/pcidss_4.yml b/controls/pcidss_4.yml
-index 0936fe934..0e557fdcd 100644
+index 1b2cd2e27..374f27ef7 100644
 --- a/controls/pcidss_4.yml
 +++ b/controls/pcidss_4.yml
-@@ -1547,7 +1547,7 @@ controls:
+@@ -1549,7 +1549,7 @@ controls:
          - base
        status: automated
        rules:
@@ -118,7 +118,7 @@ index 0936fe934..0e557fdcd 100644
          - ensure_gpgcheck_globally_activated
          - ensure_gpgcheck_never_disabled
 diff --git a/controls/srg_gpos/SRG-OS-000366-GPOS-00153.yml b/controls/srg_gpos/SRG-OS-000366-GPOS-00153.yml
-index 6d494547b..71d2df788 100644
+index 77571c24c..d4672d117 100644
 --- a/controls/srg_gpos/SRG-OS-000366-GPOS-00153.yml
 +++ b/controls/srg_gpos/SRG-OS-000366-GPOS-00153.yml
 @@ -12,9 +12,7 @@ controls:
@@ -129,14 +129,14 @@ index 6d494547b..71d2df788 100644
 -            - ensure_redhat_gpgkey_installed
 -            {{% endif %}}
 +            - ensure_almalinux_gpgkey_installed
+             {{% if 'ol' in product %}}
              - ensure_oracle_gpgkey_installed
- 
-         status: automated
+             {{% endif %}}
 diff --git a/controls/stig_rhel9.yml b/controls/stig_rhel9.yml
-index 5449c8296..0975a82e4 100644
+index 49e9d1e29..1de7ebe9b 100644
 --- a/controls/stig_rhel9.yml
 +++ b/controls/stig_rhel9.yml
-@@ -384,7 +384,7 @@ controls:
+@@ -386,7 +386,7 @@ controls:
              - medium
          title: RHEL 9 must ensure cryptographic verification of vendor software packages.
          rules:
@@ -145,6 +145,4046 @@ index 5449c8296..0975a82e4 100644
          status: automated
  
      -   id: RHEL-09-214015
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_chmod/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_chmod/rule.yml
+index db2e7a83e..ea52aa62f 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_chmod/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_chmod/rule.yml
+@@ -60,7 +60,7 @@ references:
+     stigid@ol7: OL07-00-030410
+     stigid@ol8: OL08-00-030490
+     stigid@rhel7: RHEL-07-030410
+-    stigid@rhel8: RHEL-08-030490
++    stigid@almalinux8: RHEL-08-030490
+     stigid@sle12: SLES-12-020460
+     stigid@sle15: SLES-15-030290
+     stigid@ubuntu2004: UBTU-20-010152
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_chown/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_chown/rule.yml
+index 6f99c1785..421be7930 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_chown/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_chown/rule.yml
+@@ -60,7 +60,7 @@ references:
+     stigid@ol7: OL07-00-030370
+     stigid@ol8: OL08-00-030480
+     stigid@rhel7: RHEL-07-030370
+-    stigid@rhel8: RHEL-08-030480
++    stigid@almalinux8: RHEL-08-030480
+     stigid@sle12: SLES-12-020420
+     stigid@sle15: SLES-15-030250
+     stigid@ubuntu2004: UBTU-20-010148
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmod/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmod/rule.yml
+index b680a1425..a7ad1979c 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmod/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmod/rule.yml
+@@ -57,7 +57,7 @@ references:
+     stigid@ol7: OL07-00-030410
+     stigid@ol8: OL08-00-030490
+     stigid@rhel7: RHEL-07-030410
+-    stigid@rhel8: RHEL-08-030490
++    stigid@almalinux8: RHEL-08-030490
+     stigid@sle12: SLES-12-020460
+     stigid@sle15: SLES-15-030290
+     stigid@ubuntu2004: UBTU-20-010153
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmodat/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmodat/rule.yml
+index a7e9e260f..174dfd179 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmodat/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmodat/rule.yml
+@@ -57,7 +57,7 @@ references:
+     stigid@ol7: OL07-00-030410
+     stigid@ol8: OL08-00-030490
+     stigid@rhel7: RHEL-07-030410
+-    stigid@rhel8: RHEL-08-030490
++    stigid@almalinux8: RHEL-08-030490
+     stigid@sle12: SLES-12-020460
+     stigid@sle15: SLES-15-030290
+     stigid@ubuntu2004: UBTU-20-010154
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchown/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchown/rule.yml
+index 9d0508751..d17326aca 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchown/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchown/rule.yml
+@@ -60,7 +60,7 @@ references:
+     stigid@ol7: OL07-00-030370
+     stigid@ol8: OL08-00-030480
+     stigid@rhel7: RHEL-07-030370
+-    stigid@rhel8: RHEL-08-030480
++    stigid@almalinux8: RHEL-08-030480
+     stigid@sle12: SLES-12-020420
+     stigid@sle15: SLES-15-030250
+     stigid@ubuntu2004: UBTU-20-010149
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchownat/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchownat/rule.yml
+index 53ff8f91b..7f27faa51 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchownat/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchownat/rule.yml
+@@ -57,7 +57,7 @@ references:
+     stigid@ol7: OL07-00-030370
+     stigid@ol8: OL08-00-030480
+     stigid@rhel7: RHEL-07-030370
+-    stigid@rhel8: RHEL-08-030480
++    stigid@almalinux8: RHEL-08-030480
+     stigid@sle12: SLES-12-020420
+     stigid@sle15: SLES-15-030250
+     stigid@ubuntu2004: UBTU-20-010150
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fremovexattr/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fremovexattr/rule.yml
+index 47d373ac3..d005b654f 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fremovexattr/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fremovexattr/rule.yml
+@@ -11,13 +11,13 @@ description: |-
+     startup (the default), add the following line to a file with suffix
+     <tt>.rules</tt> in the directory <tt>/etc/audit/rules.d</tt>:
+     <pre>-a always,exit -F arch=b32 -S fremovexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b32 -S fremovexattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+     <br /><br />
+     If the system is 64 bit then also add the following line:
+     <pre>-a always,exit -F arch=b64 -S fremovexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b64 -S fremovexattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+     <br /><br />
+@@ -25,13 +25,13 @@ description: |-
+     utility to read audit rules during daemon startup, add the following line to
+     <tt>/etc/audit/audit.rules</tt> file:
+     <pre>-a always,exit -F arch=b32 -S fremovexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b32 -S fremovexattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+     <br /><br />
+     If the system is 64 bit then also add the following line:
+     <pre>-a always,exit -F arch=b64 -S fremovexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b64 -S fremovexattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+ 
+@@ -74,7 +74,7 @@ references:
+     stigid@ol7: OL07-00-030440
+     stigid@ol8: OL08-00-030200
+     stigid@rhel7: RHEL-07-030440
+-    stigid@rhel8: RHEL-08-030200
++    stigid@almalinux8: RHEL-08-030200
+     stigid@sle12: SLES-12-020370
+     stigid@sle15: SLES-15-030190
+     stigid@ubuntu2004: UBTU-20-010147
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fsetxattr/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fsetxattr/rule.yml
+index 95271f7f7..aae72df56 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fsetxattr/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fsetxattr/rule.yml
+@@ -9,24 +9,24 @@ description: |-
+     startup (the default), add the following line to a file with suffix
+     <tt>.rules</tt> in the directory <tt>/etc/audit/rules.d</tt>:
+     <pre>-a always,exit -F arch=b32 -S fsetxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b32 -S fsetxattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+     If the system is 64 bit then also add the following line:
+     <pre>-a always,exit -F arch=b64 -S fsetxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b64 -S fsetxattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+     If the <tt>auditd</tt> daemon is configured to use the <tt>auditctl</tt>
+     utility to read audit rules during daemon startup, add the following line to
+     <tt>/etc/audit/audit.rules</tt> file:
+     <pre>-a always,exit -F arch=b32 -S fsetxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b32 -S fsetxattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+     If the system is 64 bit then also add the following line:
+     <pre>-a always,exit -F arch=b64 -S fsetxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b64 -S fsetxattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+ 
+@@ -69,7 +69,7 @@ references:
+     stigid@ol7: OL07-00-030440
+     stigid@ol8: OL08-00-030200
+     stigid@rhel7: RHEL-07-030440
+-    stigid@rhel8: RHEL-08-030200
++    stigid@almalinux8: RHEL-08-030200
+     stigid@sle12: SLES-12-020370
+     stigid@sle15: SLES-15-030190
+     stigid@ubuntu2004: UBTU-20-010144
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lchown/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lchown/rule.yml
+index 5a5d9ed69..c647bf0cc 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lchown/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lchown/rule.yml
+@@ -60,7 +60,7 @@ references:
+     stigid@ol7: OL07-00-030370
+     stigid@ol8: OL08-00-030480
+     stigid@rhel7: RHEL-07-030370
+-    stigid@rhel8: RHEL-08-030480
++    stigid@almalinux8: RHEL-08-030480
+     stigid@sle12: SLES-12-020420
+     stigid@sle15: SLES-15-030250
+     stigid@ubuntu2004: UBTU-20-010151
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lremovexattr/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lremovexattr/rule.yml
+index 3e671303b..f6689e63d 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lremovexattr/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lremovexattr/rule.yml
+@@ -11,13 +11,13 @@ description: |-
+     startup (the default), add the following line to a file with suffix
+     <tt>.rules</tt> in the directory <tt>/etc/audit/rules.d</tt>:
+     <pre>-a always,exit -F arch=b32 -S lremovexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b32 -S lremovexattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+     <br /><br />
+     If the system is 64 bit then also add the following line:
+     <pre>-a always,exit -F arch=b64 -S lremovexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b64 -S lremovexattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+     <br /><br />
+@@ -25,13 +25,13 @@ description: |-
+     utility to read audit rules during daemon startup, add the following line to
+     <tt>/etc/audit/audit.rules</tt> file:
+     <pre>-a always,exit -F arch=b32 -S lremovexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b32 -S lremovexattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+     <br /><br />
+     If the system is 64 bit then also add the following line:
+     <pre>-a always,exit -F arch=b64 -S lremovexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b64 -S lremovexattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+ 
+@@ -74,7 +74,7 @@ references:
+     stigid@ol7: OL07-00-030440
+     stigid@ol8: OL08-00-030200
+     stigid@rhel7: RHEL-07-030440
+-    stigid@rhel8: RHEL-08-030200
++    stigid@almalinux8: RHEL-08-030200
+     stigid@sle12: SLES-12-020370
+     stigid@sle15: SLES-15-030190
+     stigid@ubuntu2004: UBTU-20-010146
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lsetxattr/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lsetxattr/rule.yml
+index 446d7bd3c..f63595099 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lsetxattr/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lsetxattr/rule.yml
+@@ -9,24 +9,24 @@ description: |-
+     startup (the default), add the following line to a file with suffix
+     <tt>.rules</tt> in the directory <tt>/etc/audit/rules.d</tt>:
+     <pre>-a always,exit -F arch=b32 -S lsetxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b32 -S lsetxattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+     If the system is 64 bit then also add the following line:
+     <pre>-a always,exit -F arch=b64 -S lsetxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b64 -S lsetxattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+     If the <tt>auditd</tt> daemon is configured to use the <tt>auditctl</tt>
+     utility to read audit rules during daemon startup, add the following line to
+     <tt>/etc/audit/audit.rules</tt> file:
+     <pre>-a always,exit -F arch=b32 -S lsetxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b32 -S lsetxattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+     If the system is 64 bit then also add the following line:
+     <pre>-a always,exit -F arch=b64 -S lsetxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b64 -S lsetxattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+ 
+@@ -69,7 +69,7 @@ references:
+     stigid@ol7: OL07-00-030440
+     stigid@ol8: OL08-00-030200
+     stigid@rhel7: RHEL-07-030440
+-    stigid@rhel8: RHEL-08-030200
++    stigid@almalinux8: RHEL-08-030200
+     stigid@sle12: SLES-12-020370
+     stigid@sle15: SLES-15-030190
+     stigid@ubuntu2004: UBTU-20-010143
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_removexattr/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_removexattr/rule.yml
+index a83fb513f..1f2307e0f 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_removexattr/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_removexattr/rule.yml
+@@ -10,13 +10,13 @@ description: |-
+     program to read audit rules during daemon startup (the default), add the
+     following line to a file with suffix <tt>.rules</tt> in the directory <tt>/etc/audit/rules.d</tt>:
+     <pre>-a always,exit -F arch=b32 -S removexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b32 -S removexattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+     <br /><br />
+     If the system is 64 bit then also add the following line:
+     <pre>-a always,exit -F arch=b64 -S removexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b64 -S removexattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+     <br /><br />
+@@ -24,13 +24,13 @@ description: |-
+     utility to read audit rules during daemon startup, add the following line to
+     <tt>/etc/audit/audit.rules</tt> file:
+     <pre>-a always,exit -F arch=b32 -S removexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b32 -S removexattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+     <br /><br />
+     If the system is 64 bit then also add the following line:
+     <pre>-a always,exit -F arch=b64 -S removexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b64 -S removexattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+ 
+@@ -73,7 +73,7 @@ references:
+     stigid@ol7: OL07-00-030440
+     stigid@ol8: OL08-00-030200
+     stigid@rhel7: RHEL-07-030440
+-    stigid@rhel8: RHEL-08-030200
++    stigid@almalinux8: RHEL-08-030200
+     stigid@sle12: SLES-12-020370
+     stigid@sle15: SLES-15-030190
+     stigid@ubuntu2004: UBTU-20-010145
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_setxattr/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_setxattr/rule.yml
+index c46dc6dd0..d99dff24c 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_setxattr/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_setxattr/rule.yml
+@@ -9,24 +9,24 @@ description: |-
+     startup (the default), add the following line to a file with suffix
+     <tt>.rules</tt> in the directory <tt>/etc/audit/rules.d</tt>:
+     <pre>-a always,exit -F arch=b32 -S setxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b32 -S setxattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+     If the system is 64 bit then also add the following line:
+     <pre>-a always,exit -F arch=b64 -S setxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b64 -S setxattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+     If the <tt>auditd</tt> daemon is configured to use the <tt>auditctl</tt>
+     utility to read audit rules during daemon startup, add the following line to
+     <tt>/etc/audit/audit.rules</tt> file:
+     <pre>-a always,exit -F arch=b32 -S setxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b32 -S setxattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+     If the system is 64 bit then also add the following line:
+     <pre>-a always,exit -F arch=b64 -S setxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
+-{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
+     <pre>-a always,exit -F arch=b64 -S setxattr -F auid=0 -F key=perm_mod</pre>
+ {{%- endif %}}
+ 
+@@ -69,7 +69,7 @@ references:
+     stigid@ol7: OL07-00-030440
+     stigid@ol8: OL08-00-030200
+     stigid@rhel7: RHEL-07-030440
+-    stigid@rhel8: RHEL-08-030200
++    stigid@almalinux8: RHEL-08-030200
+     stigid@sle12: SLES-12-020370
+     stigid@sle15: SLES-15-030190
+     stigid@ubuntu2004: UBTU-20-010142
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_execution_acl_commands/audit_rules_execution_chacl/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_execution_acl_commands/audit_rules_execution_chacl/rule.yml
+index d303fe347..d4b740bbc 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_execution_acl_commands/audit_rules_execution_chacl/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_execution_acl_commands/audit_rules_execution_chacl/rule.yml
+@@ -38,7 +38,7 @@ references:
+     nist@sle12: AU-3,AU-3.1,AU-12.1(ii),AU-12(a),AU-12.1(iv),AU-12(c),MA-4(1)(a)
+     srg: SRG-OS-000037-GPOS-00015,SRG-OS-000042-GPOS-00020,SRG-OS-000062-GPOS-00031,SRG-OS-000392-GPOS-00172,SRG-OS-000462-GPOS-00206,SRG-OS-000471-GPOS-00215,SRG-OS-000466-GPOS-00210,SRG-APP-000495-CTR-001235,SRG-APP-000499-CTR-001255
+     stigid@ol8: OL08-00-030570
+-    stigid@rhel8: RHEL-08-030570
++    stigid@almalinux8: RHEL-08-030570
+     stigid@sle12: SLES-12-020620
+     stigid@sle15: SLES-15-030440
+     stigid@ubuntu2004: UBTU-20-010168
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_execution_acl_commands/audit_rules_execution_setfacl/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_execution_acl_commands/audit_rules_execution_setfacl/rule.yml
+index aa8c37418..d09ac6a21 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_execution_acl_commands/audit_rules_execution_setfacl/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_execution_acl_commands/audit_rules_execution_setfacl/rule.yml
+@@ -37,7 +37,7 @@ references:
+     nist@sle12: AU-3,AU-3.1,AU-12.1(ii),AU-12(a),AU-12.1(iv),AU-12(c),MA-4(1)(a)
+     srg: SRG-OS-000037-GPOS-00015,SRG-OS-000042-GPOS-00020,SRG-OS-000062-GPOS-00031,SRG-OS-000392-GPOS-00172,SRG-OS-000462-GPOS-00206,SRG-OS-000471-GPOS-00215,SRG-APP-000495-CTR-001235
+     stigid@ol8: OL08-00-030330
+-    stigid@rhel8: RHEL-08-030330
++    stigid@almalinux8: RHEL-08-030330
+     stigid@sle12: SLES-12-020610
+     stigid@sle15: SLES-15-030430
+     stigid@ubuntu2004: UBTU-20-010167
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_chcon/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_chcon/rule.yml
+index b88b106a4..72eccf079 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_chcon/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_chcon/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+@@ -60,7 +60,7 @@ references:
+     stigid@ol7: OL07-00-030580
+     stigid@ol8: OL08-00-030260
+     stigid@rhel7: RHEL-07-030580
+-    stigid@rhel8: RHEL-08-030260
++    stigid@almalinux8: RHEL-08-030260
+     stigid@sle12: SLES-12-020630
+     stigid@sle15: SLES-15-030450
+     stigid@ubuntu2004: UBTU-20-010165
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_restorecon/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_restorecon/rule.yml
+index 4431537de..c27a75e11 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_restorecon/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_restorecon/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_semanage/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_semanage/rule.yml
+index 5f9cad679..ed0d60c64 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_semanage/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_semanage/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+@@ -57,7 +57,7 @@ references:
+     stigid@ol7: OL07-00-030560
+     stigid@ol8: OL08-00-030313
+     stigid@rhel7: RHEL-07-030560
+-    stigid@rhel8: RHEL-08-030313
++    stigid@almalinux8: RHEL-08-030313
+ 
+ {{{ ocil_fix_srg_privileged_command("semanage", "/usr/sbin/", "privileged-unix-update") }}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_setfiles/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_setfiles/rule.yml
+index 24b333352..86f66ab9f 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_setfiles/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_setfiles/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+@@ -46,7 +46,7 @@ references:
+     stigid@ol7: OL07-00-030590
+     stigid@ol8: OL08-00-030314
+     stigid@rhel7: RHEL-07-030590
+-    stigid@rhel8: RHEL-08-030314
++    stigid@almalinux8: RHEL-08-030314
+ 
+ {{{ ocil_fix_srg_privileged_command("setfiles", "/usr/sbin/", "privileged-unix-update") }}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_setsebool/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_setsebool/rule.yml
+index 3ecdebdb5..4038b4f6b 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_setsebool/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_setsebool/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+@@ -56,7 +56,7 @@ references:
+     stigid@ol7: OL07-00-030570
+     stigid@ol8: OL08-00-030316
+     stigid@rhel7: RHEL-07-030570
+-    stigid@rhel8: RHEL-08-030316
++    stigid@almalinux8: RHEL-08-030316
+ 
+ {{{ ocil_fix_srg_privileged_command("setsebool", "/usr/sbin/", "privileged") }}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_seunshare/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_seunshare/rule.yml
+index 1214ad408..8f2bd4496 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_seunshare/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_seunshare/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events/bash/shared.sh
+index 53e61fb25..e9a0edcde 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_sle
++# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
+ 
+ # Perform the remediation for the syscall rule
+ # Retrieve hardware architecture of the underlying system
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_rename/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_rename/rule.yml
+index 2a241af6d..e7705899b 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_rename/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_rename/rule.yml
+@@ -55,7 +55,7 @@ references:
+     stigid@ol7: OL07-00-030910
+     stigid@ol8: OL08-00-030361
+     stigid@rhel7: RHEL-07-030910
+-    stigid@rhel8: RHEL-08-030361
++    stigid@almalinux8: RHEL-08-030361
+     stigid@ubuntu2004: UBTU-20-010267
+     stigid@ubuntu2204: UBTU-22-654185
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_renameat/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_renameat/rule.yml
+index ff84c8242..9e108b442 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_renameat/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_renameat/rule.yml
+@@ -52,7 +52,7 @@ references:
+     stigid@ol7: OL07-00-030910
+     stigid@ol8: OL08-00-030361
+     stigid@rhel7: RHEL-07-030910
+-    stigid@rhel8: RHEL-08-030361
++    stigid@almalinux8: RHEL-08-030361
+     stigid@ubuntu2004: UBTU-20-010267
+     stigid@ubuntu2204: UBTU-22-654185
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_rmdir/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_rmdir/rule.yml
+index 3842c23b7..13614daf5 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_rmdir/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_rmdir/rule.yml
+@@ -51,7 +51,7 @@ references:
+     stigid@ol7: OL07-00-030910
+     stigid@ol8: OL08-00-030361
+     stigid@rhel7: RHEL-07-030910
+-    stigid@rhel8: RHEL-08-030361
++    stigid@almalinux8: RHEL-08-030361
+     stigid@ubuntu2004: UBTU-20-010267
+     stigid@ubuntu2204: UBTU-22-654185
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlink/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlink/rule.yml
+index c94560c08..12f4d221f 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlink/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlink/rule.yml
+@@ -55,7 +55,7 @@ references:
+     stigid@ol7: OL07-00-030910
+     stigid@ol8: OL08-00-030361
+     stigid@rhel7: RHEL-07-030910
+-    stigid@rhel8: RHEL-08-030361
++    stigid@almalinux8: RHEL-08-030361
+     stigid@ubuntu2004: UBTU-20-010267
+     stigid@ubuntu2204: UBTU-22-654185
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlinkat/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlinkat/rule.yml
+index 99ff347be..f9f5e9bdf 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlinkat/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlinkat/rule.yml
+@@ -52,7 +52,7 @@ references:
+     stigid@ol7: OL07-00-030910
+     stigid@ol8: OL08-00-030361
+     stigid@rhel7: RHEL-07-030910
+-    stigid@rhel8: RHEL-08-030361
++    stigid@almalinux8: RHEL-08-030361
+     stigid@ubuntu2004: UBTU-20-010267
+     stigid@ubuntu2204: UBTU-22-654185
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification/bash/shared.sh
+index 8a48783f6..b846f8113 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_sle
++# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
+ 
+ # Perform the remediation of the syscall rule
+ # Retrieve hardware architecture of the underlying system
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_creat/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_creat/rule.yml
+index b97dc5e35..c89d3f8f3 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_creat/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_creat/rule.yml
+@@ -64,7 +64,7 @@ references:
+     stigid@ol7: OL07-00-030510
+     stigid@ol8: OL08-00-030420
+     stigid@rhel7: RHEL-07-030510
+-    stigid@rhel8: RHEL-08-030420
++    stigid@almalinux8: RHEL-08-030420
+     stigid@sle12: SLES-12-020490
+     stigid@sle15: SLES-15-030150
+     stigid@ubuntu2004: UBTU-20-010158
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_ftruncate/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_ftruncate/rule.yml
+index b39aca913..382cf9c06 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_ftruncate/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_ftruncate/rule.yml
+@@ -64,7 +64,7 @@ references:
+     stigid@ol7: OL07-00-030510
+     stigid@ol8: OL08-00-030420
+     stigid@rhel7: RHEL-07-030510
+-    stigid@rhel8: RHEL-08-030420
++    stigid@almalinux8: RHEL-08-030420
+     stigid@sle12: SLES-12-020490
+     stigid@sle15: SLES-15-030150
+     stigid@ubuntu2004: UBTU-20-010157
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open/rule.yml
+index 276fb267d..005c88bcc 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open/rule.yml
+@@ -67,7 +67,7 @@ references:
+     stigid@ol7: OL07-00-030510
+     stigid@ol8: OL08-00-030420
+     stigid@rhel7: RHEL-07-030510
+-    stigid@rhel8: RHEL-08-030420
++    stigid@almalinux8: RHEL-08-030420
+     stigid@sle12: SLES-12-020490
+     stigid@sle15: SLES-15-030150
+     stigid@ubuntu2004: UBTU-20-010155
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at/rule.yml
+index c15f79f54..0c3795426 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at/rule.yml
+@@ -57,7 +57,7 @@ references:
+     stigid@ol7: OL07-00-030510
+     stigid@ol8: OL08-00-030420
+     stigid@rhel7: RHEL-07-030510
+-    stigid@rhel8: RHEL-08-030420
++    stigid@almalinux8: RHEL-08-030420
+     stigid@sle12: SLES-12-020490
+     stigid@sle15: SLES-15-030150
+     stigid@ubuntu2004: UBTU-20-010160
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_o_creat/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_o_creat/bash/shared.sh
+index c1352ae38..31de43746 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_o_creat/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_o_creat/bash/shared.sh
+@@ -1,3 +1,3 @@
+-# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel
++# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ 
+ {{{ bash_create_audit_remediation_unsuccessful_file_modification_detailed("/etc/audit/rules.d/30-ospp-v42-remediation.rules") }}}
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_o_trunc_write/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_o_trunc_write/bash/shared.sh
+index c1352ae38..31de43746 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_o_trunc_write/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_o_trunc_write/bash/shared.sh
+@@ -1,3 +1,3 @@
+-# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel
++# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ 
+ {{{ bash_create_audit_remediation_unsuccessful_file_modification_detailed("/etc/audit/rules.d/30-ospp-v42-remediation.rules") }}}
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_rule_order/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_rule_order/bash/shared.sh
+index c944fb9e6..b506644af 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_rule_order/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_rule_order/bash/shared.sh
+@@ -1,3 +1,3 @@
+-# platform = multi_platform_rhel,multi_platform_ol
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_ol
+ 
+ {{{ bash_create_audit_remediation_unsuccessful_file_modification_detailed("/etc/audit/rules.d/30-ospp-v42-remediation.rules") }}}
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_o_creat/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_o_creat/bash/shared.sh
+index c1352ae38..31de43746 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_o_creat/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_o_creat/bash/shared.sh
+@@ -1,3 +1,3 @@
+-# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel
++# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ 
+ {{{ bash_create_audit_remediation_unsuccessful_file_modification_detailed("/etc/audit/rules.d/30-ospp-v42-remediation.rules") }}}
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_o_trunc_write/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_o_trunc_write/bash/shared.sh
+index c1352ae38..31de43746 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_o_trunc_write/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_o_trunc_write/bash/shared.sh
+@@ -1,3 +1,3 @@
+-# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel
++# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ 
+ {{{ bash_create_audit_remediation_unsuccessful_file_modification_detailed("/etc/audit/rules.d/30-ospp-v42-remediation.rules") }}}
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_rule_order/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_rule_order/bash/shared.sh
+index c944fb9e6..b506644af 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_rule_order/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_rule_order/bash/shared.sh
+@@ -1,3 +1,3 @@
+-# platform = multi_platform_rhel,multi_platform_ol
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_ol
+ 
+ {{{ bash_create_audit_remediation_unsuccessful_file_modification_detailed("/etc/audit/rules.d/30-ospp-v42-remediation.rules") }}}
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat/rule.yml
+index 782f603ae..1a7ebdbfa 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat/rule.yml
+@@ -64,7 +64,7 @@ references:
+     stigid@ol7: OL07-00-030510
+     stigid@ol8: OL08-00-030420
+     stigid@rhel7: RHEL-07-030510
+-    stigid@rhel8: RHEL-08-030420
++    stigid@almalinux8: RHEL-08-030420
+     stigid@sle12: SLES-12-020490
+     stigid@sle15: SLES-15-030150
+     stigid@ubuntu2004: UBTU-20-010159
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_o_creat/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_o_creat/bash/shared.sh
+index c1352ae38..31de43746 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_o_creat/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_o_creat/bash/shared.sh
+@@ -1,3 +1,3 @@
+-# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel
++# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ 
+ {{{ bash_create_audit_remediation_unsuccessful_file_modification_detailed("/etc/audit/rules.d/30-ospp-v42-remediation.rules") }}}
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_o_trunc_write/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_o_trunc_write/bash/shared.sh
+index c1352ae38..31de43746 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_o_trunc_write/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_o_trunc_write/bash/shared.sh
+@@ -1,3 +1,3 @@
+-# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel
++# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ 
+ {{{ bash_create_audit_remediation_unsuccessful_file_modification_detailed("/etc/audit/rules.d/30-ospp-v42-remediation.rules") }}}
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_rule_order/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_rule_order/bash/shared.sh
+index c944fb9e6..b506644af 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_rule_order/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_rule_order/bash/shared.sh
+@@ -1,3 +1,3 @@
+-# platform = multi_platform_rhel,multi_platform_ol
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_ol
+ 
+ {{{ bash_create_audit_remediation_unsuccessful_file_modification_detailed("/etc/audit/rules.d/30-ospp-v42-remediation.rules") }}}
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_truncate/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_truncate/rule.yml
+index e2889ab47..09913e29c 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_truncate/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_truncate/rule.yml
+@@ -63,7 +63,7 @@ references:
+     stigid@ol7: OL07-00-030510
+     stigid@ol8: OL08-00-030420
+     stigid@rhel7: RHEL-07-030510
+-    stigid@rhel8: RHEL-08-030420
++    stigid@almalinux8: RHEL-08-030420
+     stigid@sle12: SLES-12-020490
+     stigid@sle15: SLES-15-030150
+     stigid@ubuntu2004: UBTU-20-010156
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading/ansible/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading/ansible/shared.yml
+index 590a5ff6b..5ceb15d9b 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading/ansible/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_create/kubernetes/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_create/kubernetes/shared.yml
+index bdf3015c4..658327033 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_create/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_create/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/ansible/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/ansible/shared.yml
+index 2e008b37e..7e74c94e7 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/ansible/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_rhel,multi_platform_rhv,multi_platform_sle,multi_platform_ol,multi_platform_ubuntu,multi_platform_debian
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_rhv,multi_platform_sle,multi_platform_ol,multi_platform_ubuntu,multi_platform_debian
+ # reboot = false
+ # complexity = low
+ # disruption = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/kubernetes/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/kubernetes/shared.yml
+index 7c8e520c1..e5c1d9d93 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/rule.yml
+index b0455540c..a11e5a1f4 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/rule.yml
+@@ -56,7 +56,7 @@ references:
+     stigid@ol7: OL07-00-030830
+     stigid@ol8: OL08-00-030390
+     stigid@rhel7: RHEL-07-030830
+-    stigid@rhel8: RHEL-08-030390
++    stigid@almalinux8: RHEL-08-030390
+     stigid@sle12: SLES-12-020730
+     stigid@sle15: SLES-15-030520
+     stigid@ubuntu2004: UBTU-20-010181
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/tests/missing_auid_filter.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/tests/missing_auid_filter.fail.sh
+index 1bf2449b4..ddf95ef93 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/tests/missing_auid_filter.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/tests/missing_auid_filter.fail.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+-# platform = Oracle Linux 7,Oracle Linux 8,Red Hat Enterprise Linux 8,multi_platform_ubuntu
++# platform = Oracle Linux 7,Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_ubuntu
+ # packages = audit
+ 
+ rm -f /etc/audit/rules.d/*
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/ansible/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/ansible/shared.yml
+index 9349085f7..b20604aa7 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/ansible/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_rhel,multi_platform_ol,multi_platform_rhv,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_ol,multi_platform_rhv,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
+ # reboot = false
+ # complexity = low
+ # disruption = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/kubernetes/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/kubernetes/shared.yml
+index 639d76a21..7f4d463d6 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/rule.yml
+index f157e6a87..c60e0a248 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/rule.yml
+@@ -55,7 +55,7 @@ references:
+     stigid@ol7: OL07-00-030820
+     stigid@ol8: OL08-00-030360
+     stigid@rhel7: RHEL-07-030820
+-    stigid@rhel8: RHEL-08-030360
++    stigid@almalinux8: RHEL-08-030360
+     stigid@sle12: SLES-12-020740
+     stigid@sle15: SLES-15-030530
+     stigid@ubuntu2004: UBTU-20-010179
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/tests/missing_auid_filter.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/tests/missing_auid_filter.fail.sh
+index 548015d2a..f785aab0c 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/tests/missing_auid_filter.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/tests/missing_auid_filter.fail.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+-# platform = Oracle Linux 7,Oracle Linux 8,Red Hat Enterprise Linux 8,multi_platform_ubuntu
++# platform = Oracle Linux 7,Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_ubuntu
+ # packages = audit
+ 
+ rm -f /etc/audit/rules.d/*
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/ansible/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/ansible/shared.yml
+index 73a9f1dff..6daf2c30b 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/ansible/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_rhel,multi_platform_rhv,multi_platform_sle,multi_platform_ol,multi_platform_ubuntu,multi_platform_debian
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_rhv,multi_platform_sle,multi_platform_ol,multi_platform_ubuntu,multi_platform_debian
+ # reboot = false
+ # complexity = low
+ # disruption = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/kubernetes/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/kubernetes/shared.yml
+index 083a612a0..3228b89b7 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/rule.yml
+index bfa622179..2c5bff77b 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/rule.yml
+@@ -56,7 +56,7 @@ references:
+     stigid@ol7: OL07-00-030820
+     stigid@ol8: OL08-00-030360
+     stigid@rhel7: RHEL-07-030820
+-    stigid@rhel8: RHEL-08-030360
++    stigid@almalinux8: RHEL-08-030360
+     stigid@sle12: SLES-12-020740
+     stigid@sle15: SLES-15-030530
+     stigid@ubuntu2004: UBTU-20-010179
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/tests/missing_auid_filter.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/tests/missing_auid_filter.fail.sh
+index 8e282ee3e..d344773fa 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/tests/missing_auid_filter.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/tests/missing_auid_filter.fail.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+-# platform = Oracle Linux 7,Oracle Linux 8,Red Hat Enterprise Linux 8,multi_platform_ubuntu
++# platform = Oracle Linux 7,Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_ubuntu
+ # packages = audit
+ 
+ rm -f /etc/audit/rules.d/*
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_query/tests/missing_auid_filter.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_query/tests/missing_auid_filter.fail.sh
+index 009564309..0f9a7f6e6 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_query/tests/missing_auid_filter.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_query/tests/missing_auid_filter.fail.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+-# platform = Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
++# platform = Red Hat Enterprise Linux 8,AlmaLinux 8,Red Hat Enterprise Linux 9
+ # packages = audit
+ 
+ rm -f /etc/audit/rules.d/*
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events/bash/shared.sh
+index 1ea2bcfa9..06d0f131a 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ 
+ # Perform the remediation for both possible tools: 'auditctl' and 'augenrules'
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/rule.yml
+index c59e43c1e..687054cef 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/rule.yml
+@@ -51,7 +51,7 @@ references:
+     stigid@ol7: OL07-00-030610
+     stigid@ol8: OL08-00-030590
+     stigid@rhel7: RHEL-07-030610
+-    stigid@rhel8: RHEL-08-030590
++    stigid@almalinux8: RHEL-08-030590
+ 
+ ocil_clause: 'the command does not return a line, or the line is commented out'
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_cis.pass.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_cis.pass.sh
+index 123bfa32f..202a1488f 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_cis.pass.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_cis.pass.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
++# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
+ # profiles = xccdf_org.ssgproject.content_profile_cis
+ 
+ path="/var/run/faillock"
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_extra_permission_cis.pass.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_extra_permission_cis.pass.sh
+index 2c17afeaa..0ddf37750 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_extra_permission_cis.pass.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_extra_permission_cis.pass.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
++# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
+ # profiles = xccdf_org.ssgproject.content_profile_cis
+ 
+ path="/var/run/faillock"
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_without_key_cis.pass.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_without_key_cis.pass.sh
+index ea2066f6f..3765d856b 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_without_key_cis.pass.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_without_key_cis.pass.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
++# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
+ # profiles = xccdf_org.ssgproject.content_profile_cis
+ 
+ path="/var/run/faillock"
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_remove_all_rules_cis.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_remove_all_rules_cis.fail.sh
+index 609e9755d..bca002bc9 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_remove_all_rules_cis.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_remove_all_rules_cis.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
++# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
+ # profiles = xccdf_org.ssgproject.content_profile_cis
+ 
+ path="/var/run/faillock"
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_wrong_rule_cis.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_wrong_rule_cis.fail.sh
+index caf40c54b..9bb1ab7de 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_wrong_rule_cis.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_wrong_rule_cis.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
++# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
+ # profiles = xccdf_org.ssgproject.content_profile_cis
+ 
+ path="/var/run/faillock"
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_wrong_rule_without_key_cis.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_wrong_rule_without_key_cis.fail.sh
+index ee1fdc951..08606fcac 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_wrong_rule_without_key_cis.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_wrong_rule_without_key_cis.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
++# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
+ # profiles = xccdf_org.ssgproject.content_profile_cis
+ 
+ path="/var/run/faillock"
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_cis.pass.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_cis.pass.sh
+index e2750dbee..6a2992c9d 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_cis.pass.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_cis.pass.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
++# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
+ # profiles = xccdf_org.ssgproject.content_profile_cis
+ 
+ path="/var/run/faillock"
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_extra_permission_cis.pass.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_extra_permission_cis.pass.sh
+index d8379bfe5..3c16dd148 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_extra_permission_cis.pass.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_extra_permission_cis.pass.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
++# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
+ # profiles = xccdf_org.ssgproject.content_profile_cis
+ 
+ path="/var/run/faillock"
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_without_key_cis.pass.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_without_key_cis.pass.sh
+index cbbcb5f67..76ebb0844 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_without_key_cis.pass.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_without_key_cis.pass.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
++# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
+ # profiles = xccdf_org.ssgproject.content_profile_cis
+ 
+ path="/var/run/faillock"
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_remove_all_rules_cis.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_remove_all_rules_cis.fail.sh
+index 22b979187..e90519a30 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_remove_all_rules_cis.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_remove_all_rules_cis.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
++# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
+ # profiles = xccdf_org.ssgproject.content_profile_cis
+ 
+ path="/var/run/faillock"
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_wrong_rule_cis.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_wrong_rule_cis.fail.sh
+index afdeb73d1..95b55eef4 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_wrong_rule_cis.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_wrong_rule_cis.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
++# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
+ # profiles = xccdf_org.ssgproject.content_profile_cis
+ 
+ path="/var/run/faillock"
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_wrong_rule_without_key_cis.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_wrong_rule_without_key_cis.fail.sh
+index b14bc1951..81934f021 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_wrong_rule_without_key_cis.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_wrong_rule_without_key_cis.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
++# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
+ # profiles = xccdf_org.ssgproject.content_profile_cis
+ 
+ path="/var/run/faillock"
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_lastlog/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_lastlog/rule.yml
+index dcf4b5624..5abe2c79c 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_lastlog/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_lastlog/rule.yml
+@@ -52,7 +52,7 @@ references:
+     stigid@ol7: OL07-00-030620
+     stigid@ol8: OL08-00-030600
+     stigid@rhel7: RHEL-07-030620
+-    stigid@rhel8: RHEL-08-030600
++    stigid@almalinux8: RHEL-08-030600
+     stigid@sle12: SLES-12-020660
+     stigid@sle15: SLES-15-030480
+     stigid@ubuntu2004: UBTU-20-010171
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/ansible/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/ansible/shared.yml
+index b3f4eb102..e6bb717eb 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/ansible/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle,multi_platform_debian
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle,multi_platform_debian
+ # reboot = false
+ # strategy = configure
+ # complexity = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_default.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_default.fail.sh
+index 8615165ec..002902145 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_default.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_default.fail.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
+ 
+ sed -i "s%^ExecStartPost=.*%ExecStartPost=-/sbin/auditctl%" /usr/lib/systemd/system/auditd.service
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_missing_rule.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_missing_rule.fail.sh
+index bc3f67c9c..a37ccd0bf 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_missing_rule.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_missing_rule.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
+ 
+ ./generate_privileged_commands_rule.sh {{{ uid_min }}} privileged /etc/audit/audit.rules
+ sed -i '/newgrp/d' /etc/audit/audit.rules
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_one_rule.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_one_rule.fail.sh
+index ed2cc6c29..13cbaac12 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_one_rule.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_one_rule.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
+ 
+ echo "-a always,exit -F path=/usr/bin/sudo -F perm=x -F auid>={{{ uid_min }}} -F auid!=unset -k privileged" >> /etc/audit/audit.rules
+ sed -i "s%^ExecStartPost=.*%ExecStartPost=-/sbin/auditctl%" /usr/lib/systemd/system/auditd.service
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_rules_configured.pass.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_rules_configured.pass.sh
+index e1d5d05df..6a758969a 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_rules_configured.pass.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_rules_configured.pass.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
+ 
+ ./generate_privileged_commands_rule.sh {{{ uid_min }}} privileged /etc/audit/audit.rules
+ sed -i "s%^ExecStartPost=.*%ExecStartPost=-/sbin/auditctl%" /usr/lib/systemd/system/auditd.service
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_rules_without_perm_x.pass.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_rules_without_perm_x.pass.sh
+index ec89d9ce8..81e0062b1 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_rules_without_perm_x.pass.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_rules_without_perm_x.pass.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
+ 
+ ./generate_privileged_commands_rule.sh {{{ uid_min }}} privileged /etc/audit/audit.rules
+ sed -i -E 's/^(.*path=[[:graph:]]+) -F perm=x(.*$)/\1\2/' /etc/audit/audit.rules
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_default.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_default.fail.sh
+index ee36da807..bd848737d 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_default.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_default.fail.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
+ 
+ # augenrules is default for rhel7
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_duplicated.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_duplicated.fail.sh
+index b6aabf247..8405f0ba1 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_duplicated.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_duplicated.fail.sh
+@@ -1,7 +1,7 @@
+ #!/bin/bash
+ # packages = audit
+ # remediation = none
+-# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
+ 
+ ./generate_privileged_commands_rule.sh {{{ uid_min }}} privileged /tmp/privileged.rules
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_extra_rules_configured.pass.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_extra_rules_configured.pass.sh
+index 12f1b429a..8dea24479 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_extra_rules_configured.pass.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_extra_rules_configured.pass.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
+ 
+ ./generate_privileged_commands_rule.sh {{{ uid_min }}} privileged /etc/audit/rules.d/privileged.rules
+ echo "-a always,exit -F path=/usr/bin/notrelevant -F perm=x -F auid>={{{ uid_min }}} -F auid!=unset -F key=privileged" >> /etc/audit/rules.d/privileged.rules
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_missing_rule.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_missing_rule.fail.sh
+index 711bae803..617ff1b33 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_missing_rule.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_missing_rule.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
+ 
+ ./generate_privileged_commands_rule.sh {{{ uid_min }}} privileged /etc/audit/rules.d/privileged.rules
+  sed -i '/newgrp/d' /etc/audit/rules.d/privileged.rules
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_one_rule.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_one_rule.fail.sh
+index d272fd1d5..f7c0fec7d 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_one_rule.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_one_rule.fail.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
+ 
+ echo "-a always,exit -F path=/usr/bin/sudo -F perm=x -F auid>={{{ uid_min }}} -F auid!=unset -F key=privileged" >> /etc/audit/rules.d/privileged.rules
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_configured.pass.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_configured.pass.sh
+index ecda20ef9..115487067 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_configured.pass.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_configured.pass.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
+ 
+ ./generate_privileged_commands_rule.sh {{{ uid_min }}} privileged /etc/audit/rules.d/privileged.rules
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_configured_mixed_keys.pass.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_configured_mixed_keys.pass.sh
+index 51482922f..4ac366ec9 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_configured_mixed_keys.pass.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_configured_mixed_keys.pass.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
+ 
+ ./generate_privileged_commands_rule.sh {{{ uid_min }}} privileged /etc/audit/rules.d/privileged.rules
+ # change key of rules for binaries in /usr/sbin
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_ignore_dracut_tmp.pass.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_ignore_dracut_tmp.pass.sh
+index 6ef31d987..2da0682e0 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_ignore_dracut_tmp.pass.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_ignore_dracut_tmp.pass.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
+ 
+ ./generate_privileged_commands_rule.sh {{{ uid_min }}} privileged /etc/audit/rules.d/privileged.rules
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_without_perm_x.pass.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_without_perm_x.pass.sh
+index 79c0bb972..2968492ac 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_without_perm_x.pass.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_without_perm_x.pass.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
+ 
+ ./generate_privileged_commands_rule.sh {{{ uid_min }}} privileged /etc/audit/rules.d/privileged.rules
+ sed -i -E 's/^(.*path=[[:graph:]]+) -F perm=x(.*$)/\1\2/' /etc/audit/rules.d/privileged.rules
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_two_rules_mixed_keys.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_two_rules_mixed_keys.fail.sh
+index a8667bbfb..471d2aff2 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_two_rules_mixed_keys.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_two_rules_mixed_keys.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
+ 
+ echo "-a always,exit -F path=/usr/bin/newgrp -F perm=x -F auid>={{{ uid_min }}} -F auid!=unset -k privileged" >> /etc/audit/rules.d/privileged.rules
+ echo "-a always,exit -F path=/usr/bin/passwd -F perm=x -F auid>={{{ uid_min }}} -F auid!=unset -F key=privileged" >> /etc/audit/rules.d/privileged.rules
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_two_rules_sep_files.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_two_rules_sep_files.fail.sh
+index b2e18d1cd..5c56cdb6d 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_two_rules_sep_files.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_two_rules_sep_files.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
+ 
+ echo "-a always,exit -F path=/usr/bin/newgrp -F perm=x -F auid>={{{ uid_min }}} -F auid!=unset -F key=privileged" >> /etc/audit/rules.d/priv.rules
+ echo "-a always,exit -F path=/usr/bin/notrelevant -F perm=x -F auid>={{{ uid_min }}} -F auid!=unset -F key=privileged" >> /etc/audit/rules.d/priv.rules
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/rules_with_own_key.pass.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/rules_with_own_key.pass.sh
+index 81fc6dd16..9c3f84ef8 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/rules_with_own_key.pass.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/rules_with_own_key.pass.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
+ 
+ ./generate_privileged_commands_rule.sh {{{ uid_min }}} own_key /etc/audit/rules.d/privileged.rules
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_at/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_at/rule.yml
+index d5ec19271..456ebfd72 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_at/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_at/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_chage/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_chage/rule.yml
+index d891fc1fc..2e191988d 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_chage/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_chage/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+@@ -59,7 +59,7 @@ references:
+     stigid@ol7: OL07-00-030660
+     stigid@ol8: OL08-00-030250
+     stigid@rhel7: RHEL-07-030660
+-    stigid@rhel8: RHEL-08-030250
++    stigid@almalinux8: RHEL-08-030250
+     stigid@sle12: SLES-12-020690
+     stigid@sle15: SLES-15-030120
+     stigid@ubuntu2004: UBTU-20-010175
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_chsh/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_chsh/rule.yml
+index ea03eab50..354481f08 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_chsh/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_chsh/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+@@ -59,7 +59,7 @@ references:
+     stigid@ol7: OL07-00-030720
+     stigid@ol8: OL08-00-030410
+     stigid@rhel7: RHEL-07-030720
+-    stigid@rhel8: RHEL-08-030410
++    stigid@almalinux8: RHEL-08-030410
+     stigid@sle12: SLES-12-020580
+     stigid@sle15: SLES-15-030100
+     stigid@ubuntu2004: UBTU-20-010163
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_crontab/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_crontab/rule.yml
+index bb54d9f50..83b525c5d 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_crontab/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_crontab/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+@@ -58,7 +58,7 @@ references:
+     stigid@ol7: OL07-00-030800
+     stigid@ol8: OL08-00-030400
+     stigid@rhel7: RHEL-07-030800
+-    stigid@rhel8: RHEL-08-030400
++    stigid@almalinux8: RHEL-08-030400
+     stigid@sle12: SLES-12-020710
+     stigid@sle15: SLES-15-030130
+     stigid@ubuntu2004: UBTU-20-010177
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_dbus_daemon_launch_helper/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_dbus_daemon_launch_helper/rule.yml
+index b54fefd34..623ee707e 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_dbus_daemon_launch_helper/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_dbus_daemon_launch_helper/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_fusermount/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_fusermount/rule.yml
+index de8adac1e..201b6145f 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_fusermount/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_fusermount/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_fusermount3/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_fusermount3/rule.yml
+index 3b94d7faa..238431055 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_fusermount3/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_fusermount3/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_gpasswd/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_gpasswd/rule.yml
+index 8180bd48a..26831899d 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_gpasswd/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_gpasswd/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+@@ -60,7 +60,7 @@ references:
+     stigid@ol7: OL07-00-030650
+     stigid@ol8: OL08-00-030370
+     stigid@rhel7: RHEL-07-030650
+-    stigid@rhel8: RHEL-08-030370
++    stigid@almalinux8: RHEL-08-030370
+     stigid@sle12: SLES-12-020560
+     stigid@sle15: SLES-15-030080
+     stigid@ubuntu2004: UBTU-20-010174
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_grub2_set_bootflag/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_grub2_set_bootflag/rule.yml
+index cf58bda23..2be03b588 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_grub2_set_bootflag/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_grub2_set_bootflag/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_insmod/ansible/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_insmod/ansible/shared.yml
+index 5baa999e7..cb49a4d71 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_insmod/ansible/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_insmod/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_sle,multi_platform_rhel
++# platform = multi_platform_sle,multi_platform_rhel,multi_platform_almalinux
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_insmod/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_insmod/bash/shared.sh
+index 29bfc7be7..d0910b1c6 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_insmod/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_insmod/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
+ 
+ # Perform the remediation for both possible tools: 'auditctl' and 'augenrules'
+ {{{ bash_fix_audit_watch_rule("auditctl", "/sbin/insmod", "x", "modules") }}}
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_kmod/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_kmod/rule.yml
+index 0d5422c37..8402ed2a5 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_kmod/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_kmod/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["ol7", "rhel7", "rhel8", "rhel9"] %}}
++{{%- if product in ["ol7", "rhel7", "rhel8", "almalinux8", "rhel9"] %}}
+     {{%- set kmod_audit="-a always,exit -F path=/usr/bin/kmod -F perm=x -F auid>=" ~ uid_min ~ " -F auid!=unset -F key=privileged" %}}
+ {{%- else %}}
+     {{%- set kmod_audit="-w /usr/bin/kmod -p x -k modules" %}}
+@@ -46,7 +46,7 @@ references:
+     stigid@ol7: OL07-00-030840
+     stigid@ol8: OL08-00-030580
+     stigid@rhel7: RHEL-07-030840
+-    stigid@rhel8: RHEL-08-030580
++    stigid@almalinux8: RHEL-08-030580
+     stigid@sle12: SLES-12-020360
+     stigid@sle15: SLES-15-030410
+     stigid@ubuntu2004: UBTU-20-010297
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/ansible/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/ansible/shared.yml
+index 8f61ee32a..07ddf4291 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/ansible/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_sle,multi_platform_rhel
++# platform = multi_platform_sle,multi_platform_rhel,multi_platform_almalinux
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/bash/shared.sh
+index ed9771d0d..665d2cc0f 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_sle,multi_platform_rhel,multi_platform_ubuntu
++# platform = multi_platform_sle,multi_platform_rhel,multi_platform_almalinux,multi_platform_ubuntu
+ 
+ # Perform the remediation for both possible tools: 'auditctl' and 'augenrules'
+ {{{ bash_fix_audit_watch_rule("auditctl", "/sbin/modprobe", "x", "modules") }}}
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_mount/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_mount/rule.yml
+index e773b8a2e..ecbfa730e 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_mount/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_mount/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+@@ -50,7 +50,7 @@ references:
+     stigid@ol7: OL07-00-030740
+     stigid@ol8: OL08-00-030300
+     stigid@rhel7: RHEL-07-030740
+-    stigid@rhel8: RHEL-08-030300
++    stigid@almalinux8: RHEL-08-030300
+     stigid@sle12: SLES-12-020290
+     stigid@ubuntu2004: UBTU-20-010138
+     stigid@ubuntu2204: UBTU-22-654065
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_mount_nfs/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_mount_nfs/rule.yml
+index 54e0d6227..e4bb98755 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_mount_nfs/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_mount_nfs/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newgidmap/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newgidmap/rule.yml
+index a2014eb70..fb66f51e8 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newgidmap/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newgidmap/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newgrp/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newgrp/rule.yml
+index 7da59f723..00243b513 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newgrp/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newgrp/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+@@ -60,7 +60,7 @@ references:
+     stigid@ol7: OL07-00-030710
+     stigid@ol8: OL08-00-030350
+     stigid@rhel7: RHEL-07-030710
+-    stigid@rhel8: RHEL-08-030350
++    stigid@almalinux8: RHEL-08-030350
+     stigid@sle12: SLES-12-020570
+     stigid@sle15: SLES-15-030090
+     stigid@ubuntu2004: UBTU-20-010164
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newuidmap/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newuidmap/rule.yml
+index 32f9f451e..7f92479da 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newuidmap/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newuidmap/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pam_timestamp_check/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pam_timestamp_check/rule.yml
+index b7e787772..dab31ecfb 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pam_timestamp_check/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pam_timestamp_check/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+@@ -64,7 +64,7 @@ references:
+     stigid@ol7: OL07-00-030810
+     stigid@ol8: OL08-00-030340
+     stigid@rhel7: RHEL-07-030810
+-    stigid@rhel8: RHEL-08-030340
++    stigid@almalinux8: RHEL-08-030340
+     stigid@sle12: SLES-12-020720
+     stigid@sle15: SLES-15-030510
+     stigid@ubuntu2004: UBTU-20-010178
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_passwd/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_passwd/rule.yml
+index 1bbfd35d8..55a7c2328 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_passwd/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_passwd/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+@@ -58,7 +58,7 @@ references:
+     stigid@ol7: OL07-00-030630
+     stigid@ol8: OL08-00-030290
+     stigid@rhel7: RHEL-07-030630
+-    stigid@rhel8: RHEL-08-030290
++    stigid@almalinux8: RHEL-08-030290
+     stigid@sle12: SLES-12-020550
+     stigid@sle15: SLES-15-030070
+     stigid@ubuntu2004: UBTU-20-010172
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pkexec/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pkexec/rule.yml
+index 53dc91957..e723f2f3d 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pkexec/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pkexec/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_polkit_helper/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_polkit_helper/rule.yml
+index bc443d98c..1be0a3f02 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_polkit_helper/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_polkit_helper/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_postdrop/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_postdrop/rule.yml
+index c3cfc617b..a833227d6 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_postdrop/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_postdrop/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+@@ -57,7 +57,7 @@ references:
+     stigid@ol7: OL07-00-030760
+     stigid@ol8: OL08-00-030311
+     stigid@rhel7: RHEL-07-030760
+-    stigid@rhel8: RHEL-08-030311
++    stigid@almalinux8: RHEL-08-030311
+ 
+ {{{ ocil_fix_srg_privileged_command("postdrop") }}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_postqueue/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_postqueue/rule.yml
+index 33490fcf5..1adeb569b 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_postqueue/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_postqueue/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+@@ -57,7 +57,7 @@ references:
+     stigid@ol7: OL07-00-030770
+     stigid@ol8: OL08-00-030312
+     stigid@rhel7: RHEL-07-030770
+-    stigid@rhel8: RHEL-08-030312
++    stigid@almalinux8: RHEL-08-030312
+ 
+ {{{ ocil_fix_srg_privileged_command("postqueue") }}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pt_chown/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pt_chown/rule.yml
+index a33830c58..af75c5074 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pt_chown/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pt_chown/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_rmmod/ansible/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_rmmod/ansible/shared.yml
+index f3c3324e2..d5545d32c 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_rmmod/ansible/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_rmmod/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_sle,multi_platform_rhel
++# platform = multi_platform_sle,multi_platform_rhel,multi_platform_almalinux
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_rmmod/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_rmmod/bash/shared.sh
+index bf0a58b43..0b13f7c0d 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_rmmod/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_rmmod/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
+ 
+ # Perform the remediation for both possible tools: 'auditctl' and 'augenrules'
+ {{{ bash_fix_audit_watch_rule("auditctl", "/sbin/rmmod", "x", "modules") }}}
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_ssh_agent/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_ssh_agent/rule.yml
+index c2923f16d..d358b9ea1 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_ssh_agent/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_ssh_agent/rule.yml
+@@ -39,7 +39,7 @@ references:
+     nist@sle12: AU-3,AU-3.1,AU-12(a),AU-12(c),AU-12.1(a),AU-12.1(ii),AU-12.1(iv),MA-4(1)(a)
+     srg: SRG-OS-000037-GPOS-00015,SRG-OS-000042-GPOS-00020,SRG-OS-000062-GPOS-00031,SRG-OS-000392-GPOS-00172,SRG-OS-000462-GPOS-00206,SRG-OS-000471-GPOS-00215,SRG-APP-000495-CTR-001235
+     stigid@ol8: OL08-00-030280
+-    stigid@rhel8: RHEL-08-030280
++    stigid@almalinux8: RHEL-08-030280
+     stigid@sle12: SLES-12-020310
+     stigid@sle15: SLES-15-030370
+     stigid@ubuntu2004: UBTU-20-010140
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_ssh_keysign/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_ssh_keysign/rule.yml
+index 9352b1582..127d81a21 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_ssh_keysign/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_ssh_keysign/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+@@ -67,7 +67,7 @@ references:
+     stigid@ol7: OL07-00-030780
+     stigid@ol8: OL08-00-030320
+     stigid@rhel7: RHEL-07-030780
+-    stigid@rhel8: RHEL-08-030320
++    stigid@almalinux8: RHEL-08-030320
+     stigid@sle12: SLES-12-020320
+     stigid@sle15: SLES-15-030060
+     stigid@ubuntu2004: UBTU-20-010141
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_krb5_child/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_krb5_child/rule.yml
+index 83273d633..6aec3a8fd 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_krb5_child/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_krb5_child/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_ldap_child/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_ldap_child/rule.yml
+index 0e7b0caf1..ce741d01d 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_ldap_child/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_ldap_child/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_proxy_child/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_proxy_child/rule.yml
+index 88d9a1d49..95492b5fa 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_proxy_child/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_proxy_child/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_selinux_child/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_selinux_child/rule.yml
+index 880059066..eb9f79a41 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_selinux_child/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_selinux_child/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_su/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_su/rule.yml
+index de9472122..06420d2c4 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_su/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_su/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+@@ -59,7 +59,7 @@ references:
+     stigid@ol7: OL07-00-030680
+     stigid@ol8: OL08-00-030190
+     stigid@rhel7: RHEL-07-030680
+-    stigid@rhel8: RHEL-08-030190
++    stigid@almalinux8: RHEL-08-030190
+     stigid@sle12: SLES-12-020250
+     stigid@sle15: SLES-15-030550
+     stigid@ubuntu2004: UBTU-20-010136
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sudo/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sudo/rule.yml
+index 035ad30ce..a6e33b690 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sudo/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sudo/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+@@ -59,7 +59,7 @@ references:
+     stigid@ol7: OL07-00-030690
+     stigid@ol8: OL08-00-030550
+     stigid@rhel7: RHEL-07-030690
+-    stigid@rhel8: RHEL-08-030550
++    stigid@almalinux8: RHEL-08-030550
+     stigid@sle12: SLES-12-020260
+     stigid@sle15: SLES-15-030560
+     stigid@ubuntu2004: UBTU-20-010161
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sudoedit/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sudoedit/rule.yml
+index 2887b4eb6..21e8f6172 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sudoedit/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sudoedit/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_umount/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_umount/rule.yml
+index 9ff295587..01bb3d9b8 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_umount/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_umount/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+@@ -58,7 +58,7 @@ references:
+     stigid@ol7: OL07-00-030750
+     stigid@ol8: OL08-00-030301
+     stigid@rhel7: RHEL-07-030750
+-    stigid@rhel8: RHEL-08-030301
++    stigid@almalinux8: RHEL-08-030301
+     stigid@sle12: SLES-12-020300
+     stigid@ubuntu2004: UBTU-20-010139
+     stigid@ubuntu2204: UBTU-22-654115
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_unix_chkpwd/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_unix_chkpwd/rule.yml
+index 7a160905b..3eb973886 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_unix_chkpwd/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_unix_chkpwd/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+@@ -60,7 +60,7 @@ references:
+     stigid@ol7: OL07-00-030640
+     stigid@ol8: OL08-00-030317
+     stigid@rhel7: RHEL-07-030640
+-    stigid@rhel8: RHEL-08-030317
++    stigid@almalinux8: RHEL-08-030317
+     stigid@sle12: SLES-12-020680
+     stigid@sle15: SLES-15-030110
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_unix_update/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_unix_update/rule.yml
+index e71fef3c5..46d28c5b0 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_unix_update/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_unix_update/rule.yml
+@@ -37,7 +37,7 @@ references:
+     disa: CCI-000130,CCI-000135,CCI-000169,CCI-000172,CCI-002884
+     srg: SRG-OS-000037-GPOS-00015,SRG-OS-000042-GPOS-00020,SRG-OS-000062-GPOS-00031,SRG-OS-000064-GPOS-00033,SRG-OS-000392-GPOS-00172,SRG-OS-000462-GPOS-00206,SRG-OS-000471-GPOS-00215,SRG-APP-000495-CTR-001235
+     stigid@ol8: OL08-00-030310
+-    stigid@rhel8: RHEL-08-030310
++    stigid@almalinux8: RHEL-08-030310
+     stigid@ubuntu2004: UBTU-20-010173
+     stigid@ubuntu2204: UBTU-22-654120
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_userhelper/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_userhelper/rule.yml
+index bda6d3239..ae164ee16 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_userhelper/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_userhelper/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+@@ -56,7 +56,7 @@ references:
+     stigid@ol7: OL07-00-030670
+     stigid@ol8: OL08-00-030315
+     stigid@rhel7: RHEL-07-030670
+-    stigid@rhel8: RHEL-08-030315
++    stigid@almalinux8: RHEL-08-030315
+ 
+ {{{ ocil_fix_srg_privileged_command("userhelper") }}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_usermod/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_usermod/rule.yml
+index 03b7b1573..b5e38e762 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_usermod/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_usermod/rule.yml
+@@ -42,7 +42,7 @@ references:
+     nist@sle12: AU-3,AU-12(a),AU-12(c),MA-4(1)(a)
+     srg: SRG-OS-000037-GPOS-00015,SRG-OS-000042-GPOS-00020,SRG-OS-000062-GPOS-00031,SRG-OS-000392-GPOS-00172,SRG-OS-000462-GPOS-00206,SRG-OS-000471-GPOS-00215,SRG-OS-000466-GPOS-00210,SRG-APP-000495-CTR-001235,SRG-APP-000499-CTR-001255
+     stigid@ol8: OL08-00-030560
+-    stigid@rhel8: RHEL-08-030560
++    stigid@almalinux8: RHEL-08-030560
+     stigid@sle12: SLES-12-020700
+     stigid@sle15: SLES-15-030500
+     stigid@ubuntu2004: UBTU-20-010176
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_usernetctl/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_usernetctl/rule.yml
+index fe6140d32..f1602a878 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_usernetctl/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_usernetctl/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_utempter/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_utempter/rule.yml
+index c14eefeee..0a87e80ec 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_utempter/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_utempter/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_write/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_write/rule.yml
+index c8c5434f0..385ffcd14 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_write/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_write/rule.yml
+@@ -1,4 +1,4 @@
+-{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
++{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
+   {{%- set perm_x="-F perm=x " %}}
+ {{%- endif %}}
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_immutable/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_immutable/bash/shared.sh
+index b57078075..5d03b92a6 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_immutable/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_immutable/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
+ 
+ # Traverse all of:
+ #
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_immutable/kubernetes/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_immutable/kubernetes/shared.yml
+index 26d02c24e..28daa9106 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_immutable/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_immutable/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_immutable/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_immutable/rule.yml
+index 242a3f69e..062d7d149 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_immutable/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_immutable/rule.yml
+@@ -51,7 +51,7 @@ references:
+     pcidss: Req-10.5.2
+     srg: SRG-OS-000057-GPOS-00027,SRG-OS-000058-GPOS-00028,SRG-OS-000059-GPOS-00029,SRG-APP-000119-CTR-000245,SRG-APP-000120-CTR-000250
+     stigid@ol8: OL08-00-030121
+-    stigid@rhel8: RHEL-08-030121
++    stigid@almalinux8: RHEL-08-030121
+ 
+ ocil_clause: 'the audit system is not set to be immutable by adding the "-e 2" option to the end of "/etc/audit/audit.rules"'
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_immutable_login_uids/ansible/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_immutable_login_uids/ansible/shared.yml
+index 94768073f..6fd009b50 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_immutable_login_uids/ansible/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_immutable_login_uids/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_immutable_login_uids/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_immutable_login_uids/rule.yml
+index a5ad9177e..a3ffd49b9 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_immutable_login_uids/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_immutable_login_uids/rule.yml
+@@ -32,7 +32,7 @@ references:
+     disa: CCI-000162,CCI-000163,CCI-000164
+     srg: SRG-OS-000462-GPOS-00206,SRG-OS-000475-GPOS-00220,SRG-OS-000057-GPOS-00027,SRG-OS-000058-GPOS-00028,SRG-OS-000059-GPOS-00029
+     stigid@ol8: OL08-00-030122
+-    stigid@rhel8: RHEL-08-030122
++    stigid@almalinux8: RHEL-08-030122
+ 
+ ocil_clause: 'the system is not configured to make login UIDs immutable'
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_mac_modification/ansible/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_mac_modification/ansible/shared.yml
+index e55119fd1..2e7514b51 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_mac_modification/ansible/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_mac_modification/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_mac_modification/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_mac_modification/bash/shared.sh
+index 79440e79b..614a4e09c 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_mac_modification/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_mac_modification/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
+ 
+ # Perform the remediation for both possible tools: 'auditctl' and 'augenrules'
+ {{{ bash_fix_audit_watch_rule("auditctl", "/etc/selinux/", "wa", "MAC-policy") }}}
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_mac_modification/kubernetes/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_mac_modification/kubernetes/shared.yml
+index 889f83178..7896d4cb1 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_mac_modification/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_mac_modification/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_mac_modification_usr_share/ansible/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_mac_modification_usr_share/ansible/shared.yml
+index 496670fad..a9cce0a56 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_mac_modification_usr_share/ansible/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_mac_modification_usr_share/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_rhv,multi_platform_sle
++# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhv,multi_platform_sle
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_mac_modification_usr_share/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_mac_modification_usr_share/bash/shared.sh
+index b61368c0c..eb3bf47f9 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_mac_modification_usr_share/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_mac_modification_usr_share/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_rhv,multi_platform_sle,multi_platform_ubuntu
++# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhv,multi_platform_sle,multi_platform_ubuntu
+ 
+ # Perform the remediation for both possible tools: 'auditctl' and 'augenrules'
+ {{{ bash_fix_audit_watch_rule("auditctl", "/usr/share/selinux/", "wa", "MAC-policy") }}}
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_media_export/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_media_export/rule.yml
+index 765a8d29e..b4946ce99 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_media_export/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_media_export/rule.yml
+@@ -52,7 +52,7 @@ references:
+     stigid@ol7: OL07-00-030740
+     stigid@ol8: OL08-00-030302
+     stigid@rhel7: RHEL-07-030740
+-    stigid@rhel8: RHEL-08-030302
++    stigid@almalinux8: RHEL-08-030302
+     stigid@sle12: SLES-12-020290
+     stigid@sle15: SLES-15-030350
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_networkconfig_modification/ansible/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_networkconfig_modification/ansible/shared.yml
+index fb56e5550..ea6929b63 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_networkconfig_modification/ansible/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_networkconfig_modification/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle,multi_platform_debian
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle,multi_platform_debian
+ # reboot =false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_networkconfig_modification/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_networkconfig_modification/bash/shared.sh
+index 1e040de05..65a6c1127 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_networkconfig_modification/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_networkconfig_modification/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
+ 
+ # First perform the remediation of the syscall rule
+ # Retrieve hardware architecture of the underlying system
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_session_events/ansible/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_session_events/ansible/shared.yml
+index 58be87f4b..3adce26dc 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_session_events/ansible/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_session_events/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle,multi_platform_debian
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle,multi_platform_debian
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_session_events/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_session_events/bash/shared.sh
+index bd42cc0f1..366b790a4 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_session_events/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_session_events/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
+ 
+ # Perform the remediation for both possible tools: 'auditctl' and 'augenrules'
+ {{{ bash_fix_audit_watch_rule("auditctl", "/var/run/utmp", "wa", "session") }}}
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_session_events/kubernetes/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_session_events/kubernetes/shared.yml
+index 8b2377d44..39c2bba69 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_session_events/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_session_events/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_sudoers/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_sudoers/rule.yml
+index 582738aa7..e387e4a52 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_sudoers/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_sudoers/rule.yml
+@@ -32,7 +32,7 @@ references:
+     disa: CCI-000018,CCI-000130,CCI-000135,CCI-000169,CCI-000172,CCI-001403,CCI-001404,CCI-002130,CCI-002132,CCI-002884
+     srg: SRG-OS-000004-GPOS-00004,SRG-OS-000037-GPOS-00015,SRG-OS-000042-GPOS-00020,SRG-OS-000062-GPOS-00031,SRG-OS-000304-GPOS-00121,SRG-OS-000392-GPOS-00172,SRG-OS-000462-GPOS-00206,SRG-OS-000470-GPOS-00214,SRG-OS-000471-GPOS-00215,SRG-OS-000239-GPOS-00089,SRG-OS-000240-GPOS-00090,SRG-OS-000241-GPOS-00091,SRG-OS-000303-GPOS-00120,SRG-OS-000466-GPOS-00210,SRG-OS-000476-GPOS-00221,SRG-APP-000495-CTR-001235,SRG-APP-000499-CTR-001255,SRG-APP-000503-CTR-001275
+     stigid@ol8: OL08-00-030171
+-    stigid@rhel8: RHEL-08-030171
++    stigid@almalinux8: RHEL-08-030171
+     stigid@ubuntu2204: UBTU-22-654220
+ 
+ ocil_clause: 'the command does not return a line, or the line is commented out'
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_sudoers_d/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_sudoers_d/rule.yml
+index b6321618b..b724f31ab 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_sudoers_d/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_sudoers_d/rule.yml
+@@ -32,7 +32,7 @@ references:
+     disa: CCI-000018,CCI-000130,CCI-000135,CCI-000169,CCI-000172,CCI-001403,CCI-001404,CCI-002130,CCI-002132,CCI-002884
+     srg: SRG-OS-000004-GPOS-00004,SRG-OS-000037-GPOS-00015,SRG-OS-000042-GPOS-00020,SRG-OS-000062-GPOS-00031,SRG-OS-000304-GPOS-00121,SRG-OS-000392-GPOS-00172,SRG-OS-000462-GPOS-00206,SRG-OS-000470-GPOS-00214,SRG-OS-000471-GPOS-00215,SRG-OS-000239-GPOS-00089,SRG-OS-000240-GPOS-00090,SRG-OS-000241-GPOS-00091,SRG-OS-000303-GPOS-00120,SRG-OS-000466-GPOS-00210,SRG-OS-000476-GPOS-00221,SRG-APP-000495-CTR-001235,SRG-APP-000499-CTR-001255,SRG-APP-000503-CTR-001275
+     stigid@ol8: OL08-00-030172
+-    stigid@rhel8: RHEL-08-030172
++    stigid@almalinux8: RHEL-08-030172
+     stigid@ubuntu2204: UBTU-22-654225
+ 
+ ocil_clause: 'the command does not return a line, or the line is commented out'
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_auid_privilege_function/ansible/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_auid_privilege_function/ansible/shared.yml
+index 64e8dde85..3d4f65278 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_auid_privilege_function/ansible/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_auid_privilege_function/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_rhel
++# platform = multi_platform_rhel,multi_platform_almalinux
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_auid_privilege_function/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_auid_privilege_function/bash/shared.sh
+index 15d6fa4e2..7f98c9915 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_auid_privilege_function/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_auid_privilege_function/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_rhel
++# platform = multi_platform_rhel,multi_platform_almalinux
+ 
+ # First perform the remediation of the syscall rule
+ # Retrieve hardware architecture of the underlying system
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/ansible/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/ansible/shared.yml
+index 4b841e808..80473d8ce 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/ansible/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
++# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/bash/shared.sh
+index 8fdd7e75a..9c16b41cc 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
++# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
+ 
+ # First perform the remediation of the syscall rule
+ # Retrieve hardware architecture of the underlying system
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/kubernetes/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/kubernetes/shared.yml
+index 323a798b1..46fad7416 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/rule.yml
+index bd8020eb4..2017f44d4 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/rule.yml
+@@ -56,7 +56,7 @@ references:
+     stigid@ol7: OL07-00-030360
+     stigid@ol8: OL08-00-030000
+     stigid@rhel7: RHEL-07-030360
+-    stigid@rhel8: RHEL-08-030000
++    stigid@almalinux8: RHEL-08-030000
+     stigid@sle12: SLES-12-020240
+     stigid@sle15: SLES-15-030640
+     stigid@ubuntu2004: UBTU-20-010211
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_sysadmin_actions/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_sysadmin_actions/bash/shared.sh
+index 027623091..c1c2c1952 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_sysadmin_actions/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_sysadmin_actions/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_rhv,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
++# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhv,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
+ 
+ # Perform the remediation for both possible tools: 'auditctl' and 'augenrules'
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_sysadmin_actions/kubernetes/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_sysadmin_actions/kubernetes/shared.yml
+index 336beb2b7..26c47e462 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_sysadmin_actions/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_sysadmin_actions/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification/bash/shared.sh
+index 07965e2c7..908fa6e54 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_sle
++# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
+ 
+ # Perform the remediation for both possible tools: 'auditctl' and 'augenrules'
+ {{{ bash_fix_audit_watch_rule("auditctl", "/etc/group", "wa", "audit_rules_usergroup_modification") }}}
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification_group/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification_group/rule.yml
+index ad7f8a70b..1884f6fed 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification_group/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification_group/rule.yml
+@@ -57,7 +57,7 @@ references:
+     stigid@ol7: OL07-00-030871
+     stigid@ol8: OL08-00-030170
+     stigid@rhel7: RHEL-07-030871
+-    stigid@rhel8: RHEL-08-030170
++    stigid@almalinux8: RHEL-08-030170
+     stigid@sle12: SLES-12-020210
+     stigid@sle15: SLES-15-030010
+     stigid@ubuntu2004: UBTU-20-010101
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification_gshadow/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification_gshadow/rule.yml
+index 57888e9c2..50ccb3641 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification_gshadow/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification_gshadow/rule.yml
+@@ -57,7 +57,7 @@ references:
+     stigid@ol7: OL07-00-030872
+     stigid@ol8: OL08-00-030160
+     stigid@rhel7: RHEL-07-030872
+-    stigid@rhel8: RHEL-08-030160
++    stigid@almalinux8: RHEL-08-030160
+     stigid@sle12: SLES-12-020590
+     stigid@sle15: SLES-15-030040
+     stigid@ubuntu2004: UBTU-20-010103
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification_opasswd/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification_opasswd/rule.yml
+index e0fab79c5..4d510e9cf 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification_opasswd/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification_opasswd/rule.yml
+@@ -58,7 +58,7 @@ references:
+     stigid@ol7: OL07-00-030874
+     stigid@ol8: OL08-00-030140
+     stigid@rhel7: RHEL-07-030874
+-    stigid@rhel8: RHEL-08-030140
++    stigid@almalinux8: RHEL-08-030140
+     stigid@sle12: SLES-12-020230
+     stigid@sle15: SLES-15-030030
+     stigid@ubuntu2004: UBTU-20-010104
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification_passwd/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification_passwd/rule.yml
+index 6d718064c..130ba3644 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification_passwd/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification_passwd/rule.yml
+@@ -57,7 +57,7 @@ references:
+     stigid@ol7: OL07-00-030870
+     stigid@ol8: OL08-00-030150
+     stigid@rhel7: RHEL-07-030870
+-    stigid@rhel8: RHEL-08-030150
++    stigid@almalinux8: RHEL-08-030150
+     stigid@sle12: SLES-12-020200
+     stigid@sle15: SLES-15-030000
+     stigid@ubuntu2004: UBTU-20-010100
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification_shadow/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification_shadow/rule.yml
+index ac4521ab6..95c36a344 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification_shadow/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_usergroup_modification_shadow/rule.yml
+@@ -57,7 +57,7 @@ references:
+     stigid@ol7: OL07-00-030873
+     stigid@ol8: OL08-00-030130
+     stigid@rhel7: RHEL-07-030873
+-    stigid@rhel8: RHEL-08-030130
++    stigid@almalinux8: RHEL-08-030130
+     stigid@sle12: SLES-12-020220
+     stigid@sle15: SLES-15-030020
+     stigid@ubuntu2004: UBTU-20-010102
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_adjtimex/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_adjtimex/bash/shared.sh
+index 24b4da6b6..1b2b4dd27 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_adjtimex/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_adjtimex/bash/shared.sh
+@@ -1,3 +1,3 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
+ 
+ {{{ bash_perform_audit_adjtimex_settimeofday_stime_remediation() }}}
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_adjtimex/kubernetes/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_adjtimex/kubernetes/shared.yml
+index 49c97e395..51f48c0f9 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_adjtimex/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_adjtimex/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_clock_settime/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_clock_settime/bash/shared.sh
+index c511ede45..617b679c5 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_clock_settime/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_clock_settime/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
+ 
+ # First perform the remediation of the syscall rule
+ # Retrieve hardware architecture of the underlying system
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_clock_settime/kubernetes/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_clock_settime/kubernetes/shared.yml
+index ec76157d4..0f9e9f7cc 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_clock_settime/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_clock_settime/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_settimeofday/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_settimeofday/bash/shared.sh
+index b7f44ab38..e6b1d1856 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_settimeofday/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_settimeofday/bash/shared.sh
+@@ -1,3 +1,3 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
+ 
+ {{{ bash_perform_audit_adjtimex_settimeofday_stime_remediation() }}}
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_settimeofday/kubernetes/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_settimeofday/kubernetes/shared.yml
+index 3f43030e9..85e9a47c8 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_settimeofday/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_settimeofday/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_stime/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_stime/bash/shared.sh
+index b7f44ab38..e6b1d1856 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_stime/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_stime/bash/shared.sh
+@@ -1,3 +1,3 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
+ 
+ {{{ bash_perform_audit_adjtimex_settimeofday_stime_remediation() }}}
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_stime/kubernetes/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_stime/kubernetes/shared.yml
+index 8a58bbc38..1a73014dc 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_stime/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_stime/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_watch_localtime/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_watch_localtime/bash/shared.sh
+index 0899dcded..fa722e21d 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_watch_localtime/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_watch_localtime/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
+ 
+ # Perform the remediation for both possible tools: 'auditctl' and 'augenrules'
+ {{{ bash_fix_audit_watch_rule("auditctl", "/etc/localtime", "wa", "audit_time_rules") }}}
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_watch_localtime/kubernetes/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_watch_localtime/kubernetes/shared.yml
+index 140506b60..4290a051f 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_watch_localtime/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_watch_localtime/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/directory_access_var_log_audit/ansible/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/directory_access_var_log_audit/ansible/shared.yml
+index ec17adf55..0ecb4079c 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/directory_access_var_log_audit/ansible/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/directory_access_var_log_audit/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_rhv
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol,multi_platform_rhv
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/directory_group_ownership_var_log_audit/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/directory_group_ownership_var_log_audit/rule.yml
+index 4a9a0a15d..456801ada 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/directory_group_ownership_var_log_audit/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/directory_group_ownership_var_log_audit/rule.yml
+@@ -35,7 +35,7 @@ references:
+     pcidss: Req-10.5.1
+     srg: SRG-OS-000057-GPOS-00027,SRG-OS-000058-GPOS-00028,SRG-OS-000059-GPOS-00029,SRG-OS-000206-GPOS-00084
+     stigid@ol8: OL08-00-030110
+-    stigid@rhel8: RHEL-08-030110
++    stigid@almalinux8: RHEL-08-030110
+ 
+ ocil: |-
+     {{% if product =="ol8" %}}
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/directory_group_ownership_var_log_audit/tests/correct_value_non-root_group.pass.sh b/linux_os/guide/auditing/auditd_configure_rules/directory_group_ownership_var_log_audit/tests/correct_value_non-root_group.pass.sh
+index 09d4e8ff5..6a8e8bdab 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/directory_group_ownership_var_log_audit/tests/correct_value_non-root_group.pass.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/directory_group_ownership_var_log_audit/tests/correct_value_non-root_group.pass.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_rhel
++# platform = multi_platform_rhel,multi_platform_almalinux
+ 
+ groupadd group_test
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/directory_ownership_var_log_audit/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/directory_ownership_var_log_audit/rule.yml
+index 0fcc64592..43fcdc5ab 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/directory_ownership_var_log_audit/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/directory_ownership_var_log_audit/rule.yml
+@@ -31,7 +31,7 @@ references:
+     pcidss: Req-10.5.1
+     srg: SRG-OS-000057-GPOS-00027,SRG-OS-000058-GPOS-00028,SRG-OS-000059-GPOS-00029,SRG-OS-000206-GPOS-00084
+     stigid@ol8: OL08-00-030100
+-    stigid@rhel8: RHEL-08-030100
++    stigid@almalinux8: RHEL-08-030100
+ 
+ ocil_clause: the directory is not owned by root
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/bash/shared.sh
+index 0dad1bfe1..29632f729 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_ubuntu
++# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_ubuntu
+ 
+ if LC_ALL=C grep -iw ^log_file /etc/audit/auditd.conf; then
+   DIR=$(awk -F "=" '/^log_file/ {print $2}' /etc/audit/auditd.conf | tr -d ' ' | rev | cut -d"/" -f2- | rev)
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/rule.yml
+index 7f61d3dd6..1c3a5e1fe 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/rule.yml
+@@ -3,7 +3,7 @@ documentation_complete: true
+ title: 'System Audit Logs Must Have Mode 0750 or Less Permissive'
+ 
+ description: |-
+-    {{% if product in ["ol8", "rhel8"] %}}
++    {{% if product in ["ol8", "rhel8", "almalinux8"] %}}
+     Verify the audit log directories have a mode of "0700" or less permissive by first determining
+     where the audit logs are stored with the following command:
+     <pre>$ sudo grep -iw log_file /etc/audit/auditd.conf
+@@ -45,7 +45,7 @@ references:
+     nist-csf: DE.AE-3,DE.AE-5,PR.AC-4,PR.DS-5,PR.PT-1,RS.AN-1,RS.AN-4
+     srg: SRG-OS-000057-GPOS-00027,SRG-OS-000058-GPOS-00028,SRG-OS-000059-GPOS-00029
+     stigid@ol8: OL08-00-030120
+-    stigid@rhel8: RHEL-08-030120
++    stigid@almalinux8: RHEL-08-030120
+     stigid@ubuntu2004: UBTU-20-010128
+     stigid@ubuntu2204: UBTU-22-653060
+ 
+@@ -70,7 +70,7 @@ ocil: |-
+ 
+     Replace "[audit_log_directory]" to the correct audit log directory path, by default this location is "/var/log/audit".
+ 
+-    {{% if product in ["ol8", "rhel8"] %}}
++    {{% if product in ["ol8", "rhel8", "almalinux8"] %}}
+     The correct permissions are 0700
+     {{% else %}}
+     If the log_group is "root" or is not set, the correct permissions are 0700, otherwise they are 0750.
+@@ -83,7 +83,7 @@ fixtext: |-
+ 
+     $ sudo grep "^log_file" /etc/audit/auditd.conf
+ 
+-    {{% if product in ["ol8", "rhel8"] %}}
++    {{% if product in ["ol8", "rhel8", "almalinux8"] %}}
+     Set the correct permissions mode by the following command:
+ 
+     $ sudo chmod 0700 [audit_log_directory]
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/correct_value_0700.pass.sh b/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/correct_value_0700.pass.sh
+index 7e8c49123..999d914cd 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/correct_value_0700.pass.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/correct_value_0700.pass.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_ol,multi_platform_rhel
++# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ 
+ source common_0700.sh
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/correct_value_default_0700.pass.sh b/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/correct_value_default_0700.pass.sh
+index 7cfadc195..3bb0cefbb 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/correct_value_default_0700.pass.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/correct_value_default_0700.pass.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_ol,multi_platform_rhel
++# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ 
+ source common_0700.sh
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/incorrect_value_0700.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/incorrect_value_0700.fail.sh
+index 3654389ed..64e3e8ebc 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/incorrect_value_0700.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/incorrect_value_0700.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_ol,multi_platform_rhel
++# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ 
+ source common_0700.sh
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/incorrect_value_default_file_0700.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/incorrect_value_default_file_0700.fail.sh
+index b93254a4b..c7d66ccbb 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/incorrect_value_default_file_0700.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/incorrect_value_default_file_0700.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_ol,multi_platform_rhel
++# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ 
+ source common_0700.sh
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/rule.yml
+index a215acfcd..a43004d5b 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/rule.yml
+@@ -40,7 +40,7 @@ references:
+     pcidss: Req-10.5.1
+     srg: SRG-OS-000057-GPOS-00027,SRG-OS-000058-GPOS-00028,SRG-OS-000059-GPOS-00029,SRG-OS-000206-GPOS-00084
+     stigid@ol8: OL08-00-030090
+-    stigid@rhel8: RHEL-08-030090
++    stigid@almalinux8: RHEL-08-030090
+     stigid@ubuntu2004: UBTU-20-010124
+     stigid@ubuntu2204: UBTU-22-653055
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/tests/correct_value_non-root_group.pass.sh b/linux_os/guide/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/tests/correct_value_non-root_group.pass.sh
+index 6f19e15c6..b1d995c61 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/tests/correct_value_non-root_group.pass.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/tests/correct_value_non-root_group.pass.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_rhel
++# platform = multi_platform_rhel,multi_platform_almalinux
+ 
+ if grep -iwq "log_file" /etc/audit/auditd.conf; then
+     FILE=$(awk -F "=" '/^log_file/ {print $2}' /etc/audit/auditd.conf | tr -d ' ')
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/tests/wrong_value_non-root_group.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/tests/wrong_value_non-root_group.fail.sh
+index cf4b02b90..cd69f17c2 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/tests/wrong_value_non-root_group.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/tests/wrong_value_non-root_group.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_rhel
++# platform = multi_platform_rhel,multi_platform_almalinux
+ 
+ if grep -iwq "log_file" /etc/audit/auditd.conf; then
+     FILE=$(awk -F "=" '/^log_file/ {print $2}' /etc/audit/auditd.conf | tr -d ' ')
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/oval/shared.xml b/linux_os/guide/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/oval/shared.xml
+index 95acf5905..18954ffa1 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/oval/shared.xml
++++ b/linux_os/guide/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/oval/shared.xml
+@@ -6,7 +6,7 @@
+         <extend_definition comment="log_file not set in auditd.conf" definition_ref="auditd_conf_log_file_not_set" negate="true" />
+         <criterion comment="audit log files are root owned" test_ref="test_user_ownership_audit_log_files" />
+       </criteria>
+-      {{% if product in ["ol8", "rhel8"] %}}
++      {{% if product in ["ol8", "rhel8", "almalinux8"] %}}
+       <criteria operator="AND" comment="log_file not set">
+         <extend_definition comment="log_file not set in auditd.conf"
+           definition_ref="auditd_conf_log_file_not_set"/>
+@@ -28,7 +28,7 @@
+     <filter action="include">state_owner_not_root_var_log_audit</filter>
+   </unix:file_object>
+   
+-  {{% if product in ["ol8", "rhel8"] %}}
++  {{% if product in ["ol8", "rhel8", "almalinux8"] %}}
+   <unix:file_test check="all" check_existence="none_exist"
+       comment="var/log/audit/audit.log file uid root"
+       id="test_user_ownership_audit_default_log_files" version="1">
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/rule.yml
+index 6f09447bf..5b283802f 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/rule.yml
+@@ -35,7 +35,7 @@ references:
+     pcidss: Req-10.5.1
+     srg: SRG-OS-000057-GPOS-00027,SRG-OS-000058-GPOS-00028,SRG-OS-000059-GPOS-00029,SRG-OS-000206-GPOS-00084
+     stigid@ol8: OL08-00-030080
+-    stigid@rhel8: RHEL-08-030080
++    stigid@almalinux8: RHEL-08-030080
+     stigid@ubuntu2004: UBTU-20-010123
+     stigid@ubuntu2204: UBTU-22-653050
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/correct_value_default_file.pass.sh b/linux_os/guide/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/correct_value_default_file.pass.sh
+index 3a0d9a4e9..ab43ceb2b 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/correct_value_default_file.pass.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/correct_value_default_file.pass.sh
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_ol,multi_platform_rhel
++# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ #!/bin/bash
+ 
+ sed -i "/^\s*log_file.*/d" /etc/audit/auditd.conf
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/wrong_value.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/wrong_value.fail.sh
+index d597ca07f..75a41c4fd 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/wrong_value.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/wrong_value.fail.sh
+@@ -15,7 +15,7 @@ useradd testuser_123
+ touch "/var/log/audit/audit.log"
+ chown root "/var/log/audit/audit.log"
+ 
+-{{% if product in ["ol8", "rhel8"] %}}
++{{% if product in ["ol8", "rhel8", "almalinux8"] %}}
+ touch $FILE
+ chown testuser_123 $FILE
+ {{% else %}}
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/wrong_value_default_file.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/wrong_value_default_file.fail.sh
+index 1879113b8..8798ae1ae 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/wrong_value_default_file.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/wrong_value_default_file.fail.sh
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_ol,multi_platform_rhel
++# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ #!/bin/bash
+ 
+ sed -i "/^\s*log_file.*/d" /etc/audit/auditd.conf
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/ansible/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/ansible/shared.yml
+index 722f6731a..7f1879db2 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/ansible/shared.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/bash/shared.sh b/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/bash/shared.sh
+index 0b42da512..013401d8c 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/bash/shared.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_rhel,multi_platform_ol,multi_platform_fedora,multi_platform_rhv,multi_platform_sle,multi_platform_ubuntu
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_ol,multi_platform_fedora,multi_platform_rhv,multi_platform_sle,multi_platform_ubuntu
+ 
+ if LC_ALL=C grep -iw ^log_file /etc/audit/auditd.conf; then
+     FILE=$(awk -F "=" '/^log_file/ {print $2}' /etc/audit/auditd.conf | tr -d ' ')
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/rule.yml
+index b5b6d5790..66b4303d3 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/rule.yml
++++ b/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/rule.yml
+@@ -51,7 +51,7 @@ references:
+     stigid@ol7: OL07-00-910055
+     stigid@ol8: OL08-00-030070
+     stigid@rhel7: RHEL-07-910055
+-    stigid@rhel8: RHEL-08-030070
++    stigid@almalinux8: RHEL-08-030070
+     stigid@ubuntu2004: UBTU-20-010122
+     stigid@ubuntu2204: UBTU-22-653045
+ 
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/correct_value_0600.pass.sh b/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/correct_value_0600.pass.sh
+index 15023ca70..488ef3e3f 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/correct_value_0600.pass.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/correct_value_0600.pass.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+-# platform = multi_platform_ol,multi_platform_rhel
++# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ # packages = audit
+ 
+ source common_0600.sh
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/correct_value_default_file_0600.pass.sh b/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/correct_value_default_file_0600.pass.sh
+index 04d76809f..6475f83ae 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/correct_value_default_file_0600.pass.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/correct_value_default_file_0600.pass.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+-# platform = multi_platform_ol,multi_platform_rhel
++# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ # packages = audit
+ 
+ source common_0600.sh
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/incorrect_value_0600.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/incorrect_value_0600.fail.sh
+index aea9d1b10..3f045e4c7 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/incorrect_value_0600.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/incorrect_value_0600.fail.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+-# platform = multi_platform_ol,multi_platform_rhel
++# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ # packages = audit
+ 
+ source common_0600.sh
+diff --git a/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/incorrect_value_default_file_0600.fail.sh b/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/incorrect_value_default_file_0600.fail.sh
+index 003e3330f..368540adc 100644
+--- a/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/incorrect_value_default_file_0600.fail.sh
++++ b/linux_os/guide/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/incorrect_value_default_file_0600.fail.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+-# platform = multi_platform_ol,multi_platform_rhel
++# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ # packages = audit
+ 
+ source common_0600.sh
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/ansible/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/ansible/shared.yml
+index 1e0529f08..9ed9948a4 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/ansible/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
+ # reboot = false
+ # strategy = configure
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/bash/shared.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/bash/shared.sh
+index 53a56e255..554799735 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/bash/shared.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
+ 
+ {{{ bash_instantiate_variables("var_audispd_remote_server") }}}
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/tests/audit_remote_server_hostname.pass.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/tests/audit_remote_server_hostname.pass.sh
+index 44d9a1f74..a466bc72d 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/tests/audit_remote_server_hostname.pass.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/tests/audit_remote_server_hostname.pass.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = Red Hat Enterprise Linux 8,multi_platform_fedora
++# platform = Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_fedora
+ 
+ . $SHARED/auditd_utils.sh
+ prepare_auditd_test_enviroment
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/tests/audit_remote_server_not_there.fail.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/tests/audit_remote_server_not_there.fail.sh
+index 0bfa82083..93b11eb05 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/tests/audit_remote_server_not_there.fail.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/tests/audit_remote_server_not_there.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = Red Hat Enterprise Linux 8,multi_platform_fedora
++# platform = Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_fedora
+ 
+ . $SHARED/auditd_utils.sh
+ prepare_auditd_test_enviroment
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_configure_sufficiently_large_partition/rule.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_configure_sufficiently_large_partition/rule.yml
+index df5978bb2..dbdc4aeaf 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_configure_sufficiently_large_partition/rule.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_configure_sufficiently_large_partition/rule.yml
+@@ -44,7 +44,7 @@ references:
+     nist@sle15: AU-4
+     srg: SRG-OS-000341-GPOS-00132,SRG-OS-000342-GPOS-00133
+     stigid@ol8: OL08-00-030660
+-    stigid@rhel8: RHEL-08-030660
++    stigid@almalinux8: RHEL-08-030660
+     stigid@sle12: SLES-12-020020
+     stigid@sle15: SLES-15-030660
+     stigid@ubuntu2004: UBTU-20-010215
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_disk_full_action/ansible/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_disk_full_action/ansible/shared.yml
+index 942cd0f5d..a53df57b1 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_disk_full_action/ansible/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_disk_full_action/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
+ # reboot = false
+ # strategy = configure
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_disk_full_action/bash/shared.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_disk_full_action/bash/shared.sh
+index 36e7f8cda..842f3922d 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_disk_full_action/bash/shared.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_disk_full_action/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
+ 
+ {{{ bash_instantiate_variables("var_audispd_disk_full_action") }}}
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/bash/shared.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/bash/shared.sh
+index be3e74b0b..b6f46f51e 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/bash/shared.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/bash/shared.sh
+@@ -1,7 +1,7 @@
+ # platform = multi_platform_all
+ 
+ AUDISP_REMOTE_CONFIG="{{{ audisp_conf_path }}}/audisp-remote.conf"
+-{{% if product in ["rhel8", "fedora", "ol8", "rhv4"] %}}
++{{% if product in ["rhel8", "almalinux8", "fedora", "ol8", "rhv4"] %}}
+ option="^transport"
+ value="KRB5"
+ {{% else %}}
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/oval/shared.xml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/oval/shared.xml
+index e8d055f90..467e50704 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/oval/shared.xml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/oval/shared.xml
+@@ -2,7 +2,7 @@
+ 
+ <def-group>
+   <definition class="compliance" id="auditd_audispd_encrypt_sent_records" version="1">
+-    {{% if product in ["rhel8", "fedora", "ol8", "rhv4"] %}}
++    {{% if product in ["rhel8", "almalinux8", "fedora", "ol8", "rhv4"] %}}
+     {{{ oval_metadata("transport setting in " + audisp_config_file_path + " is set to 'KRB5'") }}}
+     {{% else %}}
+     {{{ oval_metadata("enable_krb5 setting in " + audisp_config_file_path + " is set to 'yes'") }}}
+@@ -22,7 +22,7 @@
+     <ind:filepath>{{{ audisp_config_file_path }}}</ind:filepath>
+     <!-- Allow only space (exactly) as delimiter -->
+     <!-- Require at least one space before and after the equal sign -->
+-{{% if product in ["rhel8", "fedora", "ol8", "rhv4"] %}}
++{{% if product in ["rhel8", "almalinux8", "fedora", "ol8", "rhv4"] %}}
+     <ind:pattern operation="pattern match">^[ ]*transport[ ]+=[ ]+KRB5[ ]*$</ind:pattern>
+ {{% else %}}
+     <ind:pattern operation="pattern match">^[ ]*enable_krb5[ ]+=[ ]+yes[ ]*$</ind:pattern>
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/rule.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/rule.yml
+index ad68d3a77..7e94d7ac4 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/rule.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/rule.yml
+@@ -6,7 +6,7 @@ title: 'Encrypt Audit Records Sent With audispd Plugin'
+ description: |-
+     Configure the operating system to encrypt the transfer of off-loaded audit
+     records onto a different system or media from the system being audited.
+-{{% if product in ["rhel8", "fedora", "ol8", "rhv4"] %}}
++{{% if product in ["rhel8", "almalinux8", "fedora", "ol8", "rhv4"] %}}
+     Set the <tt>transport</tt> option in <pre>{{{ audisp_conf_path }}}/audisp-remote.conf</pre>
+     to <tt>KRB5</tt>.
+ {{% else %}}
+@@ -44,7 +44,7 @@ ocil_clause: 'audispd is not encrypting audit records when sent over the network
+ ocil: |-
+     To verify the audispd plugin encrypts audit records off-loaded onto a different
+     system or media from the system being audited, run the following command:
+-{{% if product in ["rhel8", "fedora", "ol8", "rhv4"] %}}
++{{% if product in ["rhel8", "almalinux8", "fedora", "ol8", "rhv4"] %}}
+     <pre>$ sudo grep -i transport {{{ audisp_conf_path }}}/audisp-remote.conf</pre>
+     The output should return the following:
+     <pre>transport = KRB5</pre>
+@@ -56,7 +56,7 @@ ocil: |-
+ 
+ fixtext: |-
+     Configure {{{ full_name }}} to encrypt audit records sent with audispd plugin.
+-{{% if product in ["rhel8", "rhel9", "fedora", "ol8", "rhv4"] %}}
++{{% if product in ["rhel8", "almalinux8", "rhel9", "fedora", "ol8", "rhv4"] %}}
+     Set the "transport" option in "{{{ audisp_conf_path }}}/audisp-remote.conf" to "KRB5".
+ {{% else %}}
+     Uncomment the "enable_krb5" option in "{{{ audisp_conf_path }}}/audisp-remote.conf",
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_bogus_value.fail.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_bogus_value.fail.sh
+index 1ee02140b..711b6593d 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_bogus_value.fail.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_bogus_value.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = Red Hat Enterprise Linux 8,multi_platform_fedora
++# platform = Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_fedora
+ 
+ . $SHARED/auditd_utils.sh
+ prepare_auditd_test_enviroment
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_correct_value.pass.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_correct_value.pass.sh
+index b6775223d..b7fa1f1f4 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_correct_value.pass.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_correct_value.pass.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = Red Hat Enterprise Linux 8,multi_platform_fedora
++# platform = Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_fedora
+ 
+ . $SHARED/auditd_utils.sh
+ prepare_auditd_test_enviroment
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_not_there.fail.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_not_there.fail.sh
+index bf1c533c6..fb621cfff 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_not_there.fail.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_not_there.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = Red Hat Enterprise Linux 8,multi_platform_fedora
++# platform = Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_fedora
+ 
+ . $SHARED/auditd_utils.sh
+ prepare_auditd_test_enviroment
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_wrong_value.fail.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_wrong_value.fail.sh
+index 864e97b31..8c16af8f9 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_wrong_value.fail.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_wrong_value.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = Red Hat Enterprise Linux 8,multi_platform_fedora
++# platform = Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_fedora
+ 
+ . $SHARED/auditd_utils.sh
+ prepare_auditd_test_enviroment
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/ansible/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/ansible/shared.yml
+index 71fc81683..835402712 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/ansible/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
+ # reboot = false
+ # strategy = configure
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/bash/shared.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/bash/shared.sh
+index d1a513600..8ca091bea 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/bash/shared.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
+ 
+ {{{ bash_instantiate_variables("var_audispd_network_failure_action") }}}
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/tests/audisp_network_failure_action_absent.fail.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/tests/audisp_network_failure_action_absent.fail.sh
+index d244d4bd0..ec516de8a 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/tests/audisp_network_failure_action_absent.fail.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/tests/audisp_network_failure_action_absent.fail.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
+ 
+ . $SHARED/auditd_utils.sh
+ prepare_auditd_test_enviroment
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/tests/audisp_network_failure_action_set.pass.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/tests/audisp_network_failure_action_set.pass.sh
+index af96da871..3bcbba05c 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/tests/audisp_network_failure_action_set.pass.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/tests/audisp_network_failure_action_set.pass.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
+ 
+ . $SHARED/auditd_utils.sh
+ prepare_auditd_test_enviroment
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_activated.pass.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_activated.pass.sh
+index caf9766f5..8b2142f08 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_activated.pass.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_activated.pass.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
++# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
+ # remediation = bash
+ 
+ . $SHARED/auditd_utils.sh
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_activated_not_there.fail.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_activated_not_there.fail.sh
+index c87268eae..ffa87d06e 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_activated_not_there.fail.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_activated_not_there.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
++# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
+ # remediation = bash
+ 
+ . $SHARED/auditd_utils.sh
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_not_activated.fail.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_not_activated.fail.sh
+index 0bb1518ef..c54736340 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_not_activated.fail.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_not_activated.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
++# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
+ # remediation = bash
+ 
+ . $SHARED/auditd_utils.sh
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/ansible/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/ansible/shared.yml
+index b075778f5..d9baf1b4f 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/ansible/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/bash/shared.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/bash/shared.sh
+index d0065b38c..7027992a4 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/bash/shared.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel
++# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ 
+ {{{ bash_instantiate_variables("var_auditd_disk_error_action") }}}
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/kubernetes/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/kubernetes/shared.yml
+index 55f407e01..b9084af21 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/rule.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/rule.yml
+index 0b3dd7195..6a80d8565 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/rule.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/rule.yml
+@@ -38,7 +38,7 @@ references:
+     nist-csf: DE.AE-3,DE.AE-5,PR.DS-4,PR.PT-1,RS.AN-1,RS.AN-4
+     srg: SRG-OS-000047-GPOS-00023,SRG-APP-000098-CTR-000185,SRG-APP-000099-CTR-000190,SRG-APP-000100-CTR-000195,SRG-APP-000100-CTR-000200,SRG-APP-000109-CTR-000215,SRG-APP-000290-CTR-000670,SRG-APP-000357-CTR-000800
+     stigid@ol8: OL08-00-030040
+-    stigid@rhel8: RHEL-08-030040
++    stigid@almalinux8: RHEL-08-030040
+ 
+ ocil_clause: 'there is no evidence of appropriate action'
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/ansible/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/ansible/shared.yml
+index 06f4a10c6..ba788edbf 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/ansible/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/bash/shared.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/bash/shared.sh
+index 78726bbc6..0a36846ab 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/bash/shared.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel
++# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ 
+ {{{ bash_instantiate_variables("var_auditd_disk_error_action") }}}
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/kubernetes/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/kubernetes/shared.yml
+index 55f407e01..b9084af21 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/ansible/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/ansible/shared.yml
+index 0adf2b538..376952524 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/ansible/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/bash/shared.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/bash/shared.sh
+index ce4f4d029..6ab8e06dd 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/bash/shared.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
++# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
+ 
+ {{{ bash_instantiate_variables("var_auditd_disk_full_action") }}}
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/kubernetes/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/kubernetes/shared.yml
+index 55f407e01..b9084af21 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/rule.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/rule.yml
+index 9d244f44f..47492b668 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/rule.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/rule.yml
+@@ -44,7 +44,7 @@ references:
+     nist@sle12: AU-5(b),AU-5.1(iv)
+     srg: SRG-OS-000047-GPOS-00023
+     stigid@ol8: OL08-00-030060
+-    stigid@rhel8: RHEL-08-030060
++    stigid@almalinux8: RHEL-08-030060
+     stigid@sle12: SLES-12-020060
+     stigid@sle15: SLES-15-030590
+     stigid@ubuntu2004: UBTU-20-010118
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/ansible/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/ansible/shared.yml
+index 61cc4751d..7f66a5c15 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/ansible/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/bash/shared.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/bash/shared.sh
+index 8ab6e16ab..110211558 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/bash/shared.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
++# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
+ 
+ {{{ bash_instantiate_variables("var_auditd_disk_full_action") }}}
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/kubernetes/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/kubernetes/shared.yml
+index 55f407e01..b9084af21 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/ansible/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/ansible/shared.yml
+index b82e6d174..717e52b99 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/ansible/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/bash/shared.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/bash/shared.sh
+index dfb8d3035..28e3fd6c9 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/bash/shared.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
+ 
+ {{{ bash_instantiate_variables("var_auditd_action_mail_acct") }}}
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/rule.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/rule.yml
+index 02929698b..4801a29ef 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/rule.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/rule.yml
+@@ -46,7 +46,7 @@ references:
+     stigid@ol7: OL07-00-030350
+     stigid@ol8: OL08-00-030020
+     stigid@rhel7: RHEL-07-030350
+-    stigid@rhel8: RHEL-08-030020
++    stigid@almalinux8: RHEL-08-030020
+     stigid@sle12: SLES-12-020040
+     stigid@sle15: SLES-15-030570
+     stigid@ubuntu2004: UBTU-20-010117
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/ansible/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/ansible/shared.yml
+index 49efdc918..ab901e892 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/ansible/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/bash/shared.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/bash/shared.sh
+index f377a92dd..44680a119 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/bash/shared.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
+ 
+ {{{ bash_instantiate_variables("var_auditd_admin_space_left_action") }}}
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/kubernetes/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/kubernetes/shared.yml
+index 55f407e01..b9084af21 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/ansible/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/ansible/shared.yml
+index 9c8afcfa3..53a6da7e0 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/ansible/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/bash/shared.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/bash/shared.sh
+index 79b916559..40632d099 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/bash/shared.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_sle
++# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
+ 
+ {{{ bash_instantiate_variables("var_auditd_flush") }}}
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/kubernetes/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/kubernetes/shared.yml
+index 55f407e01..b9084af21 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_data.fail.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_data.fail.sh
+index ba44b2bb5..303e1d8f7 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_data.fail.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_data.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel
++# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ # profiles = xccdf_org.ssgproject.content_profile_ospp
+ # remediation = bash
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_incremental.fail.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_incremental.fail.sh
+index a8f68412c..0c0d35e0d 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_incremental.fail.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_incremental.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel
++# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ # profiles = xccdf_org.ssgproject.content_profile_ospp
+ # remediation = bash
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_incremental_async.pass.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_incremental_async.pass.sh
+index f3301e81a..eb39696dd 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_incremental_async.pass.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_incremental_async.pass.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel
++# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ # profiles = xccdf_org.ssgproject.content_profile_ospp
+ # remediation = bash
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_none.fail.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_none.fail.sh
+index 64ebd312f..c43471049 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_none.fail.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_none.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel
++# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ # profiles = xccdf_org.ssgproject.content_profile_ospp
+ # remediation = bash
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_not_there.fail.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_not_there.fail.sh
+index f6e0c1088..a51782746 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_not_there.fail.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_not_there.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel
++# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ # profiles = xccdf_org.ssgproject.content_profile_ospp
+ # remediation = bash
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_sync.fail.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_sync.fail.sh
+index 47f3daf89..5cab1da02 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_sync.fail.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_sync.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = audit
+-# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel
++# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
+ # profiles = xccdf_org.ssgproject.content_profile_ospp
+ # remediation = bash
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/ansible/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/ansible/shared.yml
+index c70cd104e..c97fbf56e 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/ansible/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/bash/shared.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/bash/shared.sh
+index 8a53bf847..95c5446b6 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/bash/shared.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
+ 
+ {{{ bash_instantiate_variables("var_auditd_max_log_file") }}}
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/kubernetes/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/kubernetes/shared.yml
+index 55f407e01..b9084af21 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/ansible/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/ansible/shared.yml
+index 69ae3cb89..f48f36569 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/ansible/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/bash/shared.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/bash/shared.sh
+index 5007f965f..4c06ea831 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/bash/shared.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
+ 
+ {{{ bash_instantiate_variables("var_auditd_max_log_file_action") }}}
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/kubernetes/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/kubernetes/shared.yml
+index 55f407e01..b9084af21 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/ansible/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/ansible/shared.yml
+index 69ae3cb89..f48f36569 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/ansible/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/bash/shared.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/bash/shared.sh
+index 4609f8ec9..f4b4664e3 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/bash/shared.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
+ 
+ {{{ bash_instantiate_variables("var_auditd_max_log_file_action") }}}
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/kubernetes/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/kubernetes/shared.yml
+index 55f407e01..b9084af21 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_num_logs/ansible/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_num_logs/ansible/shared.yml
+index 7deaa0607..748a59d80 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_num_logs/ansible/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_num_logs/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_num_logs/kubernetes/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_num_logs/kubernetes/shared.yml
+index 55f407e01..b9084af21 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_num_logs/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_num_logs/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/ansible/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/ansible/shared.yml
+index ab0bea58e..a6158699d 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/ansible/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_rhel,multi_platform_ol,multi_platform_sle
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_ol,multi_platform_sle
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/bash/shared.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/bash/shared.sh
+index a53f062b5..e0200450d 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/bash/shared.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_rhel,multi_platform_ol,multi_platform_sle,multi_platform_ubuntu
++# platform = Red Hat Virtualization 4,multi_platform_rhel,multi_platform_almalinux,multi_platform_ol,multi_platform_sle,multi_platform_ubuntu
+ 
+ {{{ bash_instantiate_variables("var_auditd_space_left") }}}
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/kubernetes/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/kubernetes/shared.yml
+index 55f407e01..b9084af21 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/ansible/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/ansible/shared.yml
+index ec0ed4850..3c3b130e8 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/ansible/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/bash/shared.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/bash/shared.sh
+index b6e0267bb..990063e2f 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/bash/shared.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
++# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
+ 
+ {{{ bash_instantiate_variables("var_auditd_space_left_action") }}}
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/kubernetes/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/kubernetes/shared.yml
+index 55f407e01..b9084af21 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/rule.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/rule.yml
+index 0f768a25d..0e52577c4 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/rule.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/rule.yml
+@@ -57,7 +57,7 @@ references:
+     stigid@ol7: OL07-00-030340
+     stigid@ol8: OL08-00-030731
+     stigid@rhel7: RHEL-07-030340
+-    stigid@rhel8: RHEL-08-030731
++    stigid@almalinux8: RHEL-08-030731
+     stigid@ubuntu2004: UBTU-20-010217
+     stigid@ubuntu2204: UBTU-22-653040
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_percentage/rule.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_percentage/rule.yml
+index 9cd9a6b0f..b7f0d0272 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_percentage/rule.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_percentage/rule.yml
+@@ -37,7 +37,7 @@ references:
+     stigid@ol7: OL07-00-030330
+     stigid@ol8: OL08-00-030730
+     stigid@rhel7: RHEL-07-030330
+-    stigid@rhel8: RHEL-08-030730
++    stigid@almalinux8: RHEL-08-030730
+     stigid@ubuntu2004: UBTU-20-010217
+     stigid@ubuntu2204: UBTU-22-653040
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_freq/kubernetes/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_freq/kubernetes/shared.yml
+index 55f407e01..b9084af21 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_freq/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_freq/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_local_events/kubernetes/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_local_events/kubernetes/shared.yml
+index 55f407e01..b9084af21 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_local_events/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_local_events/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_local_events/rule.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_local_events/rule.yml
+index 75590e720..0b5a09999 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_local_events/rule.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_local_events/rule.yml
+@@ -25,7 +25,7 @@ references:
+     ospp: FAU_GEN.1
+     srg: SRG-OS-000062-GPOS-00031,SRG-OS-000480-GPOS-00227
+     stigid@ol8: OL08-00-030061
+-    stigid@rhel8: RHEL-08-030061
++    stigid@almalinux8: RHEL-08-030061
+ 
+ ocil_clause: local_events isn't set to yes
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_log_format/kubernetes/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_log_format/kubernetes/shared.yml
+index 55f407e01..b9084af21 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_log_format/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_log_format/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_log_format/rule.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_log_format/rule.yml
+index ef1666af1..631c426df 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_log_format/rule.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_log_format/rule.yml
+@@ -26,7 +26,7 @@ references:
+     ospp: FAU_GEN.1.2
+     srg: SRG-OS-000255-GPOS-00096,SRG-OS-000480-GPOS-00227,SRG-APP-000096-CTR-000175,SRG-APP-000097-CTR-000180,SRG-APP-000098-CTR-000185,SRG-APP-000099-CTR-000190,SRG-APP-000100-CTR-000195,SRG-APP-000100-CTR-000200,SRG-APP-000109-CTR-000215,SRG-APP-000290-CTR-000670,SRG-APP-000357-CTR-000800
+     stigid@ol8: OL08-00-030063
+-    stigid@rhel8: RHEL-08-030063
++    stigid@almalinux8: RHEL-08-030063
+ 
+ ocil_clause: log_format isn't set to ENRICHED
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_name_format/ansible/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_name_format/ansible/shared.yml
+index 015e9d6ef..cb221f19e 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_name_format/ansible/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_name_format/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_ol
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_ol
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_name_format/bash/shared.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_name_format/bash/shared.sh
+index a08fddc90..1b881f0ff 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_name_format/bash/shared.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_name_format/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_ol
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_ol
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_name_format/kubernetes/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_name_format/kubernetes/shared.yml
+index 55f407e01..b9084af21 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_name_format/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_name_format/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_name_format/rule.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_name_format/rule.yml
+index 45245f923..9e3a28a99 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_name_format/rule.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_name_format/rule.yml
+@@ -30,7 +30,7 @@ references:
+     stigid@ol7: OL07-00-030211
+     stigid@ol8: OL08-00-030062
+     stigid@rhel7: RHEL-07-030211
+-    stigid@rhel8: RHEL-08-030062
++    stigid@almalinux8: RHEL-08-030062
+ 
+ ocil_clause: name_format isn't set to {{{ xccdf_value("var_auditd_name_format") }}}
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_overflow_action/ansible/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_overflow_action/ansible/shared.yml
+index 12d8541cb..a3d1c459b 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_overflow_action/ansible/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_overflow_action/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_ol
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_ol
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_overflow_action/bash/shared.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_overflow_action/bash/shared.sh
+index f308bd675..e9789ea24 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_overflow_action/bash/shared.sh
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_overflow_action/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_ol
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_ol
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_overflow_action/rule.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_overflow_action/rule.yml
+index a058b881c..1427b39ca 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_overflow_action/rule.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_overflow_action/rule.yml
+@@ -32,7 +32,7 @@ references:
+     stigid@ol7: OL07-00-030210
+     stigid@ol8: OL08-00-030700
+     stigid@rhel7: RHEL-07-030210
+-    stigid@rhel8: RHEL-08-030700
++    stigid@almalinux8: RHEL-08-030700
+ 
+ ocil_clause: 'auditd overflow action is not set correctly'
+ 
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_write_logs/kubernetes/shared.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_write_logs/kubernetes/shared.yml
+index 55f407e01..b9084af21 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_write_logs/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_write_logs/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
+ # reboot = true
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/auditing/configure_auditd_data_retention/var_audispd_remote_server.var b/linux_os/guide/auditing/configure_auditd_data_retention/var_audispd_remote_server.var
+index bcafc35b8..1579dc90f 100644
+--- a/linux_os/guide/auditing/configure_auditd_data_retention/var_audispd_remote_server.var
++++ b/linux_os/guide/auditing/configure_auditd_data_retention/var_audispd_remote_server.var
+@@ -3,7 +3,7 @@ documentation_complete: true
+ title: 'Remote server for audispd to send audit records'
+ 
+ description: |-
+-{{% if product in ["rhel8", "fedora"] %}}
++{{% if product in ["rhel8", "almalinux8", "fedora"] %}}
+     The setting for remote_server in /etc/audit/audisp-remote.conf
+ {{% else %}}
+     The setting for remote_server in /etc/audisp/audisp-remote.conf
+diff --git a/linux_os/guide/auditing/grub2_audit_argument/rule.yml b/linux_os/guide/auditing/grub2_audit_argument/rule.yml
+index c9be28d06..9a19b717e 100644
+--- a/linux_os/guide/auditing/grub2_audit_argument/rule.yml
++++ b/linux_os/guide/auditing/grub2_audit_argument/rule.yml
+@@ -44,7 +44,7 @@ references:
+     pcidss: Req-10.3
+     srg: SRG-OS-000037-GPOS-00015,SRG-OS-000042-GPOS-00020,SRG-OS-000062-GPOS-00031,SRG-OS-000392-GPOS-00172,SRG-OS-000462-GPOS-00206,SRG-OS-000471-GPOS-00215,SRG-OS-000473-GPOS-00218,SRG-OS-000254-GPOS-00095
+     stigid@ol8: OL08-00-030601
+-    stigid@rhel8: RHEL-08-030601
++    stigid@almalinux8: RHEL-08-030601
+     stigid@ubuntu2004: UBTU-20-010198
+     stigid@ubuntu2204: UBTU-22-212015
+ 
+diff --git a/linux_os/guide/auditing/grub2_audit_argument/tests/blank_grubenv_rhel8.fail.sh b/linux_os/guide/auditing/grub2_audit_argument/tests/blank_grubenv_rhel8.fail.sh
+index 4a03a2117..365d018a2 100644
+--- a/linux_os/guide/auditing/grub2_audit_argument/tests/blank_grubenv_rhel8.fail.sh
++++ b/linux_os/guide/auditing/grub2_audit_argument/tests/blank_grubenv_rhel8.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ 
+-# platform = Oracle Linux 8,Red Hat Enterprise Linux 8
++# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8
+ # remediation = none
+ 
+ # Removes audit argument from kernel command line in /boot/grub2/grubenv
+diff --git a/linux_os/guide/auditing/grub2_audit_argument/tests/double_value_rhel8.fail.sh b/linux_os/guide/auditing/grub2_audit_argument/tests/double_value_rhel8.fail.sh
+index 065c1d459..75db9892c 100644
+--- a/linux_os/guide/auditing/grub2_audit_argument/tests/double_value_rhel8.fail.sh
++++ b/linux_os/guide/auditing/grub2_audit_argument/tests/double_value_rhel8.fail.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+-# platform = Oracle Linux 8,Red Hat Enterprise Linux 8
++# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8
+ 
+ # Break the audit argument in kernel command line in /boot/grub2/grubenv
+ file="/boot/grub2/grubenv"
+diff --git a/linux_os/guide/auditing/grub2_audit_argument/tests/wrong_value_rhel8.fail.sh b/linux_os/guide/auditing/grub2_audit_argument/tests/wrong_value_rhel8.fail.sh
+index 35034f242..3f1e63b11 100644
+--- a/linux_os/guide/auditing/grub2_audit_argument/tests/wrong_value_rhel8.fail.sh
++++ b/linux_os/guide/auditing/grub2_audit_argument/tests/wrong_value_rhel8.fail.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+-# platform = Oracle Linux 8,Red Hat Enterprise Linux 8
++# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8
+ 
+ # Break the audit argument in kernel command line in /boot/grub2/grubenv
+ file="/boot/grub2/grubenv"
+diff --git a/linux_os/guide/auditing/grub2_audit_backlog_limit_argument/rule.yml b/linux_os/guide/auditing/grub2_audit_backlog_limit_argument/rule.yml
+index f725ae136..68b15c2e2 100644
+--- a/linux_os/guide/auditing/grub2_audit_backlog_limit_argument/rule.yml
++++ b/linux_os/guide/auditing/grub2_audit_backlog_limit_argument/rule.yml
+@@ -34,7 +34,7 @@ references:
+     ospp: FAU_STG.1,FAU_STG.3
+     srg: SRG-OS-000037-GPOS-00015,SRG-OS-000042-GPOS-00020,SRG-OS-000062-GPOS-00031,SRG-OS-000254-GPOS-00095,SRG-OS-000341-GPOS-00132,SRG-OS-000392-GPOS-00172,SRG-OS-000462-GPOS-00206,SRG-OS-000471-GPOS-00215
+     stigid@ol8: OL08-00-030602
+-    stigid@rhel8: RHEL-08-030602
++    stigid@almalinux8: RHEL-08-030602
+ 
+ ocil_clause: 'audit backlog limit is not configured'
+ 
+diff --git a/linux_os/guide/auditing/grub2_audit_backlog_limit_argument/tests/correct_grubenv.pass.sh b/linux_os/guide/auditing/grub2_audit_backlog_limit_argument/tests/correct_grubenv.pass.sh
+index aaffbf476..f3e10ad43 100644
+--- a/linux_os/guide/auditing/grub2_audit_backlog_limit_argument/tests/correct_grubenv.pass.sh
++++ b/linux_os/guide/auditing/grub2_audit_backlog_limit_argument/tests/correct_grubenv.pass.sh
+@@ -1,4 +1,4 @@
+ #!/bin/bash
+-# platform = Oracle Linux 8,Red Hat Enterprise Linux 8
++# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8
+ 
+ grub2-editenv - set "$(grub2-editenv - list | grep kernelopts) audit_backlog_limit=8192"
+diff --git a/linux_os/guide/auditing/grub2_audit_backlog_limit_argument/tests/wrong_value_rhel8.fail.sh b/linux_os/guide/auditing/grub2_audit_backlog_limit_argument/tests/wrong_value_rhel8.fail.sh
+index f93dc5644..1fa37409f 100644
+--- a/linux_os/guide/auditing/grub2_audit_backlog_limit_argument/tests/wrong_value_rhel8.fail.sh
++++ b/linux_os/guide/auditing/grub2_audit_backlog_limit_argument/tests/wrong_value_rhel8.fail.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+-# platform = Oracle Linux 8,Red Hat Enterprise Linux 8
++# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8
+ 
+ # Break the audit_backlog_limit argument in kernel command line in /boot/grub2/grubenv
+ file="/boot/grub2/grubenv"
+diff --git a/linux_os/guide/auditing/package_audit-audispd-plugins_installed/rule.yml b/linux_os/guide/auditing/package_audit-audispd-plugins_installed/rule.yml
+index 0e80ce5f7..02b436a35 100644
+--- a/linux_os/guide/auditing/package_audit-audispd-plugins_installed/rule.yml
++++ b/linux_os/guide/auditing/package_audit-audispd-plugins_installed/rule.yml
+@@ -35,7 +35,7 @@ template:
+         pkgname@ubuntu1804: audispd-plugins
+         pkgname@ubuntu2004: audispd-plugins
+ 
+-{{% if product in ["rhel7", "rhel8", "rhel9"] %}}
++{{% if product in ["rhel7", "rhel8", "almalinux8", "rhel9"] %}}
+ warnings:
+     - general:
+         This package is not available in {{{ full_name }}} [{{{ product }}}]. The correct package
+diff --git a/linux_os/guide/auditing/package_audit_installed/rule.yml b/linux_os/guide/auditing/package_audit_installed/rule.yml
+index 3933bd78a..5ba607eec 100644
+--- a/linux_os/guide/auditing/package_audit_installed/rule.yml
++++ b/linux_os/guide/auditing/package_audit_installed/rule.yml
+@@ -30,7 +30,7 @@ references:
+     pcidss: Req-10.1
+     srg: SRG-OS-000062-GPOS-00031,SRG-OS-000037-GPOS-00015,SRG-OS-000038-GPOS-00016,SRG-OS-000039-GPOS-00017,SRG-OS-000040-GPOS-00018,SRG-OS-000041-GPOS-00019,SRG-OS-000042-GPOS-00021,SRG-OS-000051-GPOS-00024,SRG-OS-000054-GPOS-00025,SRG-OS-000122-GPOS-00063,SRG-OS-000254-GPOS-00095,SRG-OS-000255-GPOS-00096,SRG-OS-000337-GPOS-00129,SRG-OS-000348-GPOS-00136,SRG-OS-000349-GPOS-00137,SRG-OS-000350-GPOS-00138,SRG-OS-000351-GPOS-00139,SRG-OS-000352-GPOS-00140,SRG-OS-000353-GPOS-00141,SRG-OS-000354-GPOS-00142,SRG-OS-000358-GPOS-00145,SRG-OS-000365-GPOS-00152,SRG-OS-000392-GPOS-00172,SRG-OS-000475-GPOS-00220
+     stigid@ol8: OL08-00-030180
+-    stigid@rhel8: RHEL-08-030180
++    stigid@almalinux8: RHEL-08-030180
+     stigid@sle12: SLES-12-020000
+     stigid@sle15: SLES-15-030650
+     stigid@ubuntu2004: UBTU-20-010182
+diff --git a/linux_os/guide/auditing/policy_rules/audit_access_failed_aarch64/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_access_failed_aarch64/kubernetes/shared.yml
+index f29a4afc6..26ac0688c 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_access_failed_aarch64/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_access_failed_aarch64/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/policy_rules/audit_access_failed_ppc64le/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_access_failed_ppc64le/kubernetes/shared.yml
+index 412c67f15..ec1467404 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_access_failed_ppc64le/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_access_failed_ppc64le/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/policy_rules/audit_access_success/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_access_success/kubernetes/shared.yml
+index 413293083..3f8c50a39 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_access_success/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_access_success/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/policy_rules/audit_access_success_aarch64/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_access_success_aarch64/kubernetes/shared.yml
+index 1d08bae3a..3e2300448 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_access_success_aarch64/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_access_success_aarch64/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/policy_rules/audit_access_success_ppc64le/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_access_success_ppc64le/kubernetes/shared.yml
+index 372b7c27c..4e2ce77e9 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_access_success_ppc64le/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_access_success_ppc64le/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/policy_rules/audit_basic_configuration/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_basic_configuration/kubernetes/shared.yml
+index f62426900..bd3ddd10a 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_basic_configuration/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_basic_configuration/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/policy_rules/audit_create_failed_aarch64/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_create_failed_aarch64/kubernetes/shared.yml
+index c26dc39be..d32b854fd 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_create_failed_aarch64/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_create_failed_aarch64/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/policy_rules/audit_create_failed_ppc64le/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_create_failed_ppc64le/kubernetes/shared.yml
+index 08c8dc855..e9277f263 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_create_failed_ppc64le/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_create_failed_ppc64le/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/policy_rules/audit_delete_failed/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_delete_failed/kubernetes/shared.yml
+index dab3d0eaa..620596c44 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_delete_failed/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_delete_failed/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/policy_rules/audit_delete_failed_aarch64/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_delete_failed_aarch64/kubernetes/shared.yml
+index 22d3990f0..ed4f8bce8 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_delete_failed_aarch64/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_delete_failed_aarch64/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/policy_rules/audit_delete_failed_ppc64le/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_delete_failed_ppc64le/kubernetes/shared.yml
+index 2fb2c25aa..e182781c4 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_delete_failed_ppc64le/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_delete_failed_ppc64le/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/policy_rules/audit_delete_success/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_delete_success/kubernetes/shared.yml
+index bff04fe4c..a56d7f18f 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_delete_success/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_delete_success/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ 
+ {{% set file_contents = """## Successful file delete
+ -a always,exit -F arch=b32 -S unlink,unlinkat,rename,renameat -F success=1 -F auid&gt;=" ~ uid_min ~ " -F auid!=unset -F key=successful-delete
+diff --git a/linux_os/guide/auditing/policy_rules/audit_delete_success_aarch64/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_delete_success_aarch64/kubernetes/shared.yml
+index 37b8b3676..d1be71273 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_delete_success_aarch64/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_delete_success_aarch64/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ 
+ {{% set file_contents = """## Successful file delete
+ -a always,exit -F arch=b32 -S unlink,unlinkat,rename,renameat -F success=1 -F auid>=" ~ uid_min ~ " -F auid!=unset -F key=successful-delete
+diff --git a/linux_os/guide/auditing/policy_rules/audit_delete_success_ppc64le/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_delete_success_ppc64le/kubernetes/shared.yml
+index a46066d62..731636c7f 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_delete_success_ppc64le/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_delete_success_ppc64le/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ 
+ {{% set file_contents = """## Successful file delete
+ -a always,exit -F arch=b64 -S unlink,unlinkat,rename,renameat -F success=1 -F auid>=" ~ uid_min ~ " -F auid!=unset -F key=successful-delete""" -%}}
+diff --git a/linux_os/guide/auditing/policy_rules/audit_immutable_login_uids/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_immutable_login_uids/kubernetes/shared.yml
+index ff5e61676..f7012bed2 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_immutable_login_uids/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_immutable_login_uids/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/policy_rules/audit_modify_failed/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_modify_failed/kubernetes/shared.yml
+index 2d9279849..ec6477378 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_modify_failed/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_modify_failed/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/policy_rules/audit_modify_failed_aarch64/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_modify_failed_aarch64/kubernetes/shared.yml
+index dae466002..527bc8489 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_modify_failed_aarch64/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_modify_failed_aarch64/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/policy_rules/audit_modify_failed_ppc64le/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_modify_failed_ppc64le/kubernetes/shared.yml
+index f07ff3607..62de7826c 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_modify_failed_ppc64le/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_modify_failed_ppc64le/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/policy_rules/audit_modify_success/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_modify_success/kubernetes/shared.yml
+index c6f796967..7a6e545c4 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_modify_success/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_modify_success/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/policy_rules/audit_modify_success_aarch64/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_modify_success_aarch64/kubernetes/shared.yml
+index 212ec4ba5..62e1ee6de 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_modify_success_aarch64/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_modify_success_aarch64/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/policy_rules/audit_modify_success_ppc64le/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_modify_success_ppc64le/kubernetes/shared.yml
+index 92310b977..e76e314a6 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_modify_success_ppc64le/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_modify_success_ppc64le/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/policy_rules/audit_module_load/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_module_load/kubernetes/shared.yml
+index f8cd8b73d..090554c02 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_module_load/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_module_load/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/policy_rules/audit_module_load_ppc64le/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_module_load_ppc64le/kubernetes/shared.yml
+index 231034a9c..460877cec 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_module_load_ppc64le/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_module_load_ppc64le/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/policy_rules/audit_ospp_general/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_ospp_general/kubernetes/shared.yml
+index 6002067e5..0515753c4 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_ospp_general/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_ospp_general/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/policy_rules/audit_ospp_general_aarch64/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_ospp_general_aarch64/kubernetes/shared.yml
+index c122b209f..d1f676a94 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_ospp_general_aarch64/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_ospp_general_aarch64/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/policy_rules/audit_ospp_general_ppc64le/kubernetes/shared.yml b/linux_os/guide/auditing/policy_rules/audit_ospp_general_ppc64le/kubernetes/shared.yml
+index fa81ece03..7a26684d2 100644
+--- a/linux_os/guide/auditing/policy_rules/audit_ospp_general_ppc64le/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/policy_rules/audit_ospp_general_ppc64le/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/service_auditd_enabled/kubernetes/shared.yml b/linux_os/guide/auditing/service_auditd_enabled/kubernetes/shared.yml
+index 89d6152dc..7afbf02b7 100644
+--- a/linux_os/guide/auditing/service_auditd_enabled/kubernetes/shared.yml
++++ b/linux_os/guide/auditing/service_auditd_enabled/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_rhcos
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ spec:
+diff --git a/linux_os/guide/auditing/service_auditd_enabled/rule.yml b/linux_os/guide/auditing/service_auditd_enabled/rule.yml
+index 5fca5c1a4..f88dc12d5 100644
+--- a/linux_os/guide/auditing/service_auditd_enabled/rule.yml
++++ b/linux_os/guide/auditing/service_auditd_enabled/rule.yml
+@@ -55,7 +55,7 @@ references:
+     stigid@ol7: OL07-00-030000
+     stigid@ol8: OL08-00-030181
+     stigid@rhel7: RHEL-07-030000
+-    stigid@rhel8: RHEL-08-030181
++    stigid@almalinux8: RHEL-08-030181
+     stigid@sle12: SLES-12-020010
+     stigid@sle15: SLES-15-030050
+     stigid@ubuntu2004: UBTU-20-010182
 diff --git a/linux_os/guide/services/base/package_abrt_removed/rule.yml b/linux_os/guide/services/base/package_abrt_removed/rule.yml
 index e04cfe6ff..27ad8a3f0 100644
 --- a/linux_os/guide/services/base/package_abrt_removed/rule.yml
@@ -168,18 +4208,18 @@ index 1f6a233ed..9f3a4d6b4 100644
  
  kdump --disable
 diff --git a/linux_os/guide/services/base/service_kdump_disabled/rule.yml b/linux_os/guide/services/base/service_kdump_disabled/rule.yml
-index 45a7019bf..764d594c3 100644
+index a2331569a..7a89459d1 100644
 --- a/linux_os/guide/services/base/service_kdump_disabled/rule.yml
 +++ b/linux_os/guide/services/base/service_kdump_disabled/rule.yml
-@@ -40,7 +40,7 @@ references:
+@@ -45,7 +45,7 @@ references:
      stigid@ol7: OL07-00-021300
      stigid@ol8: OL08-00-010670
      stigid@rhel7: RHEL-07-021300
 -    stigid@rhel8: RHEL-08-010670
 +    stigid@almalinux8: RHEL-08-010670
-     stigid@rhel9: RHEL-09-213115
      stigid@sle12: SLES-12-010840
      stigid@sle15: SLES-15-040190
+     stigid@ubuntu2004: UBTU-20-010413
 diff --git a/linux_os/guide/services/fapolicyd/fapolicy_default_deny/rule.yml b/linux_os/guide/services/fapolicyd/fapolicy_default_deny/rule.yml
 index 67fc86c42..a397633e8 100644
 --- a/linux_os/guide/services/fapolicyd/fapolicy_default_deny/rule.yml
@@ -212,7 +4252,7 @@ index 67fc86c42..a397633e8 100644
      Build the whitelist in the "/etc/fapolicyd/fapolicyd.rules" file ensuring the last rule is "deny perm=any all : all".
  
 diff --git a/linux_os/guide/services/fapolicyd/package_fapolicyd_installed/rule.yml b/linux_os/guide/services/fapolicyd/package_fapolicyd_installed/rule.yml
-index 52fc6fe69..03fb0c022 100644
+index 9638b0963..bd19d32ce 100644
 --- a/linux_os/guide/services/fapolicyd/package_fapolicyd_installed/rule.yml
 +++ b/linux_os/guide/services/fapolicyd/package_fapolicyd_installed/rule.yml
 @@ -22,7 +22,7 @@ references:
@@ -221,11 +4261,11 @@ index 52fc6fe69..03fb0c022 100644
      stigid@ol8: OL08-00-040135
 -    stigid@rhel8: RHEL-08-040135
 +    stigid@almalinux8: RHEL-08-040135
-     stigid@rhel9: RHEL-09-433010
  
  ocil_clause: 'the fapolicyd package is not installed'
+ 
 diff --git a/linux_os/guide/services/fapolicyd/service_fapolicyd_enabled/rule.yml b/linux_os/guide/services/fapolicyd/service_fapolicyd_enabled/rule.yml
-index d7dd2954b..f7c17fee5 100644
+index 73abf83e0..90013b2cd 100644
 --- a/linux_os/guide/services/fapolicyd/service_fapolicyd_enabled/rule.yml
 +++ b/linux_os/guide/services/fapolicyd/service_fapolicyd_enabled/rule.yml
 @@ -24,7 +24,7 @@ references:
@@ -234,24 +4274,24 @@ index d7dd2954b..f7c17fee5 100644
      stigid@ol8: OL08-00-040136
 -    stigid@rhel8: RHEL-08-040136
 +    stigid@almalinux8: RHEL-08-040136
-     stigid@rhel9: RHEL-09-433015
  
  ocil_clause: 'the service is not enabled'
+ 
 diff --git a/linux_os/guide/services/ftp/disabling_vsftpd/package_vsftpd_removed/rule.yml b/linux_os/guide/services/ftp/disabling_vsftpd/package_vsftpd_removed/rule.yml
-index 915ca1269..a27c61b9c 100644
+index 615a5cbc9..7f71e66d2 100644
 --- a/linux_os/guide/services/ftp/disabling_vsftpd/package_vsftpd_removed/rule.yml
 +++ b/linux_os/guide/services/ftp/disabling_vsftpd/package_vsftpd_removed/rule.yml
-@@ -39,7 +39,7 @@ references:
+@@ -35,7 +35,7 @@ references:
      stigid@ol7: OL07-00-040690
      stigid@ol8: OL08-00-040360
      stigid@rhel7: RHEL-07-040690
 -    stigid@rhel8: RHEL-08-040360
 +    stigid@almalinux8: RHEL-08-040360
-     stigid@rhel9: RHEL-09-215015
      stigid@sle12: SLES-12-030011
      stigid@sle15: SLES-15-010030
+ 
 diff --git a/linux_os/guide/services/kerberos/kerberos_disable_no_keytab/rule.yml b/linux_os/guide/services/kerberos/kerberos_disable_no_keytab/rule.yml
-index 13751ebbd..49e09ac22 100644
+index 9326eac21..5a2843571 100644
 --- a/linux_os/guide/services/kerberos/kerberos_disable_no_keytab/rule.yml
 +++ b/linux_os/guide/services/kerberos/kerberos_disable_no_keytab/rule.yml
 @@ -26,7 +26,7 @@ references:
@@ -260,9 +4300,9 @@ index 13751ebbd..49e09ac22 100644
      stigid@ol8: OL08-00-010161
 -    stigid@rhel8: RHEL-08-010161
 +    stigid@almalinux8: RHEL-08-010161
-     stigid@rhel9: RHEL-09-611205
  
  platforms:
+     - krb5_server_older_than_1_17-18 and krb5_workstation_older_than_1_17-18
 diff --git a/linux_os/guide/services/kerberos/package_krb5-server_removed/rule.yml b/linux_os/guide/services/kerberos/package_krb5-server_removed/rule.yml
 index 36dc8de85..e64652a1b 100644
 --- a/linux_os/guide/services/kerberos/package_krb5-server_removed/rule.yml
@@ -313,18 +4353,18 @@ index a2b8325d2..1b7a24e1f 100644
  ocil_clause: 'the package is not installed'
  
 diff --git a/linux_os/guide/services/mail/package_sendmail_removed/rule.yml b/linux_os/guide/services/mail/package_sendmail_removed/rule.yml
-index 77344dee5..39201604d 100644
+index 4daf930b4..416109c90 100644
 --- a/linux_os/guide/services/mail/package_sendmail_removed/rule.yml
 +++ b/linux_os/guide/services/mail/package_sendmail_removed/rule.yml
-@@ -34,7 +34,7 @@ references:
+@@ -33,7 +33,7 @@ references:
      nist-csf: PR.IP-1,PR.PT-3
      srg: SRG-OS-000480-GPOS-00227,SRG-OS-000095-GPOS-00049
      stigid@ol8: OL08-00-040002
 -    stigid@rhel8: RHEL-08-040002
 +    stigid@almalinux8: RHEL-08-040002
-     stigid@rhel9: RHEL-09-215020
  
  {{{ complete_ocil_entry_package(package="sendmail") }}}
+ 
 diff --git a/linux_os/guide/services/mail/postfix_client/postfix_client_configure_mail_alias/ansible/shared.yml b/linux_os/guide/services/mail/postfix_client/postfix_client_configure_mail_alias/ansible/shared.yml
 index 3a86771d6..bacfaa7d0 100644
 --- a/linux_os/guide/services/mail/postfix_client/postfix_client_configure_mail_alias/ansible/shared.yml
@@ -346,7 +4386,7 @@ index 743d47775..54354e10c 100644
  {{{ bash_instantiate_variables("var_postfix_root_mail_alias") }}}
  
 diff --git a/linux_os/guide/services/mail/postfix_client/postfix_client_configure_mail_alias_postmaster/rule.yml b/linux_os/guide/services/mail/postfix_client/postfix_client_configure_mail_alias_postmaster/rule.yml
-index d81aa3e41..f027ffa73 100644
+index 1f8ff5831..09393bc47 100644
 --- a/linux_os/guide/services/mail/postfix_client/postfix_client_configure_mail_alias_postmaster/rule.yml
 +++ b/linux_os/guide/services/mail/postfix_client/postfix_client_configure_mail_alias_postmaster/rule.yml
 @@ -29,7 +29,7 @@ references:
@@ -355,9 +4395,9 @@ index d81aa3e41..f027ffa73 100644
      stigid@ol8: OL08-00-030030
 -    stigid@rhel8: RHEL-08-030030
 +    stigid@almalinux8: RHEL-08-030030
-     stigid@rhel9: RHEL-09-252060
  
  ocil_clause: 'the alias is not set or is not root'
+ 
 diff --git a/linux_os/guide/services/mail/postfix_client/postfix_network_listening_disabled/ansible/shared.yml b/linux_os/guide/services/mail/postfix_client/postfix_network_listening_disabled/ansible/shared.yml
 index c5e7ae18c..1ab2a0a40 100644
 --- a/linux_os/guide/services/mail/postfix_client/postfix_network_listening_disabled/ansible/shared.yml
@@ -379,7 +4419,7 @@ index befe1acf3..e36b1fd3e 100644
  {{{ bash_instantiate_variables("var_postfix_inet_interfaces") }}}
  
 diff --git a/linux_os/guide/services/mail/postfix_harden_os/postfix_server_cfg/postfix_server_relay/postfix_prevent_unrestricted_relay/rule.yml b/linux_os/guide/services/mail/postfix_harden_os/postfix_server_cfg/postfix_server_relay/postfix_prevent_unrestricted_relay/rule.yml
-index 4f38c42c8..b76e0f884 100644
+index 8cf59a2ed..430979325 100644
 --- a/linux_os/guide/services/mail/postfix_harden_os/postfix_server_cfg/postfix_server_relay/postfix_prevent_unrestricted_relay/rule.yml
 +++ b/linux_os/guide/services/mail/postfix_harden_os/postfix_server_cfg/postfix_server_relay/postfix_prevent_unrestricted_relay/rule.yml
 @@ -26,7 +26,7 @@ references:
@@ -388,11 +4428,11 @@ index 4f38c42c8..b76e0f884 100644
      stigid@rhel7: RHEL-07-040680
 -    stigid@rhel8: RHEL-08-040290
 +    stigid@almalinux8: RHEL-08-040290
-     stigid@rhel9: RHEL-09-252050
  
  ocil_clause: 'the "smtpd_client_restrictions" parameter contains any entries other than "permit_mynetworks" and "reject"'
+ 
 diff --git a/linux_os/guide/services/nfs_and_rpc/nfs_configuring_clients/mounting_remote_filesystems/mount_option_nodev_remote_filesystems/rule.yml b/linux_os/guide/services/nfs_and_rpc/nfs_configuring_clients/mounting_remote_filesystems/mount_option_nodev_remote_filesystems/rule.yml
-index 0b3c6a1a1..0891eef6f 100644
+index 46eee5e28..8c385573a 100644
 --- a/linux_os/guide/services/nfs_and_rpc/nfs_configuring_clients/mounting_remote_filesystems/mount_option_nodev_remote_filesystems/rule.yml
 +++ b/linux_os/guide/services/nfs_and_rpc/nfs_configuring_clients/mounting_remote_filesystems/mount_option_nodev_remote_filesystems/rule.yml
 @@ -27,7 +27,7 @@ references:
@@ -401,11 +4441,11 @@ index 0b3c6a1a1..0891eef6f 100644
      stigid@ol8: OL08-00-010640
 -    stigid@rhel8: RHEL-08-010640
 +    stigid@almalinux8: RHEL-08-010640
-     stigid@rhel9: RHEL-09-231065
  
  ocil_clause: 'the setting does not show'
+ 
 diff --git a/linux_os/guide/services/nfs_and_rpc/nfs_configuring_clients/mounting_remote_filesystems/mount_option_noexec_remote_filesystems/rule.yml b/linux_os/guide/services/nfs_and_rpc/nfs_configuring_clients/mounting_remote_filesystems/mount_option_noexec_remote_filesystems/rule.yml
-index c8da85560..c93e7f926 100644
+index 9dade3e52..3b963f44d 100644
 --- a/linux_os/guide/services/nfs_and_rpc/nfs_configuring_clients/mounting_remote_filesystems/mount_option_noexec_remote_filesystems/rule.yml
 +++ b/linux_os/guide/services/nfs_and_rpc/nfs_configuring_clients/mounting_remote_filesystems/mount_option_noexec_remote_filesystems/rule.yml
 @@ -33,7 +33,7 @@ references:
@@ -414,11 +4454,11 @@ index c8da85560..c93e7f926 100644
      stigid@rhel7: RHEL-07-021021
 -    stigid@rhel8: RHEL-08-010630
 +    stigid@almalinux8: RHEL-08-010630
-     stigid@rhel9: RHEL-09-231070
      stigid@sle12: SLES-12-010820
      stigid@sle15: SLES-15-040170
+ 
 diff --git a/linux_os/guide/services/nfs_and_rpc/nfs_configuring_clients/mounting_remote_filesystems/mount_option_nosuid_remote_filesystems/rule.yml b/linux_os/guide/services/nfs_and_rpc/nfs_configuring_clients/mounting_remote_filesystems/mount_option_nosuid_remote_filesystems/rule.yml
-index 96ef1d137..b82157d88 100644
+index fa1aa0f38..64d53ae11 100644
 --- a/linux_os/guide/services/nfs_and_rpc/nfs_configuring_clients/mounting_remote_filesystems/mount_option_nosuid_remote_filesystems/rule.yml
 +++ b/linux_os/guide/services/nfs_and_rpc/nfs_configuring_clients/mounting_remote_filesystems/mount_option_nosuid_remote_filesystems/rule.yml
 @@ -31,7 +31,7 @@ references:
@@ -427,9 +4467,9 @@ index 96ef1d137..b82157d88 100644
      stigid@rhel7: RHEL-07-021020
 -    stigid@rhel8: RHEL-08-010650
 +    stigid@almalinux8: RHEL-08-010650
-     stigid@rhel9: RHEL-09-231075
      stigid@sle12: SLES-12-010810
      stigid@sle15: SLES-15-040160
+ 
 diff --git a/linux_os/guide/services/ntp/chronyd_client_only/bash/shared.sh b/linux_os/guide/services/ntp/chronyd_client_only/bash/shared.sh
 index 524cdc7d0..2678708d2 100644
 --- a/linux_os/guide/services/ntp/chronyd_client_only/bash/shared.sh
@@ -452,7 +4492,7 @@ index c435df983..b80ffbf7b 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/services/ntp/chronyd_client_only/rule.yml b/linux_os/guide/services/ntp/chronyd_client_only/rule.yml
-index 87f4bbadd..2da6b80af 100644
+index eebe0fe1e..2a5f6c8df 100644
 --- a/linux_os/guide/services/ntp/chronyd_client_only/rule.yml
 +++ b/linux_os/guide/services/ntp/chronyd_client_only/rule.yml
 @@ -28,7 +28,7 @@ references:
@@ -461,9 +4501,9 @@ index 87f4bbadd..2da6b80af 100644
      stigid@ol8: OL08-00-030741
 -    stigid@rhel8: RHEL-08-030741
 +    stigid@almalinux8: RHEL-08-030741
-     stigid@rhel9: RHEL-09-252025
  
  ocil_clause: 'the "port" option is not set to "0", is commented out, or is missing'
+ 
 diff --git a/linux_os/guide/services/ntp/chronyd_no_chronyc_network/bash/shared.sh b/linux_os/guide/services/ntp/chronyd_no_chronyc_network/bash/shared.sh
 index 25b768688..a1e46bc12 100644
 --- a/linux_os/guide/services/ntp/chronyd_no_chronyc_network/bash/shared.sh
@@ -486,7 +4526,7 @@ index c435df983..b80ffbf7b 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/services/ntp/chronyd_no_chronyc_network/rule.yml b/linux_os/guide/services/ntp/chronyd_no_chronyc_network/rule.yml
-index 7384d0e0e..108ab2c7f 100644
+index d2606da14..f0dc141f4 100644
 --- a/linux_os/guide/services/ntp/chronyd_no_chronyc_network/rule.yml
 +++ b/linux_os/guide/services/ntp/chronyd_no_chronyc_network/rule.yml
 @@ -27,7 +27,7 @@ references:
@@ -495,9 +4535,9 @@ index 7384d0e0e..108ab2c7f 100644
      stigid@ol8: OL08-00-030742
 -    stigid@rhel8: RHEL-08-030742
 +    stigid@almalinux8: RHEL-08-030742
-     stigid@rhel9: RHEL-09-252030
  
  ocil_clause: 'the "cmdport" option is not set to "0", is commented out, or is missing'
+ 
 diff --git a/linux_os/guide/services/ntp/chronyd_or_ntpd_set_maxpoll/kubernetes/shared.yml b/linux_os/guide/services/ntp/chronyd_or_ntpd_set_maxpoll/kubernetes/shared.yml
 index c435df983..b80ffbf7b 100644
 --- a/linux_os/guide/services/ntp/chronyd_or_ntpd_set_maxpoll/kubernetes/shared.yml
@@ -510,7 +4550,7 @@ index c435df983..b80ffbf7b 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/services/ntp/chronyd_or_ntpd_set_maxpoll/rule.yml b/linux_os/guide/services/ntp/chronyd_or_ntpd_set_maxpoll/rule.yml
-index 03acce756..51cdc3fbe 100644
+index 750b51871..f3b7d3ded 100644
 --- a/linux_os/guide/services/ntp/chronyd_or_ntpd_set_maxpoll/rule.yml
 +++ b/linux_os/guide/services/ntp/chronyd_or_ntpd_set_maxpoll/rule.yml
 @@ -94,7 +94,7 @@ references:
@@ -519,9 +4559,9 @@ index 03acce756..51cdc3fbe 100644
      stigid@rhel7: RHEL-07-040500
 -    stigid@rhel8: RHEL-08-030740
 +    stigid@almalinux8: RHEL-08-030740
-     stigid@rhel9: RHEL-09-252020
      stigid@sle12: SLES-12-030300
      stigid@sle15: SLES-15-010400
+     stigid@ubuntu2004: UBTU-20-010435
 diff --git a/linux_os/guide/services/ntp/chronyd_or_ntpd_specify_multiple_servers/bash/shared.sh b/linux_os/guide/services/ntp/chronyd_or_ntpd_specify_multiple_servers/bash/shared.sh
 index 6b76902a1..3925ca7b9 100644
 --- a/linux_os/guide/services/ntp/chronyd_or_ntpd_specify_multiple_servers/bash/shared.sh
@@ -565,12 +4605,12 @@ index c435df983..b80ffbf7b 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/services/ntp/chronyd_run_as_chrony_user/ansible/shared.yml b/linux_os/guide/services/ntp/chronyd_run_as_chrony_user/ansible/shared.yml
-index 63880e804..076146db2 100644
+index 595aa3c95..86379b4fc 100644
 --- a/linux_os/guide/services/ntp/chronyd_run_as_chrony_user/ansible/shared.yml
 +++ b/linux_os/guide/services/ntp/chronyd_run_as_chrony_user/ansible/shared.yml
 @@ -1,11 +1,11 @@
--# platform = multi_platform_fedora,Red Hat Enterprise Linux 7,Red Hat Enterprise Linux 8
-+# platform = multi_platform_fedora,Red Hat Enterprise Linux 7,Red Hat Enterprise Linux 8,AlmaLinux 8
+-# platform = multi_platform_fedora,multi_platform_ol,Red Hat Enterprise Linux 7,Red Hat Enterprise Linux 8
++# platform = multi_platform_fedora,multi_platform_ol,Red Hat Enterprise Linux 7,Red Hat Enterprise Linux 8,AlmaLinux 8
  # reboot = false
  # strategy = configure
  # complexity = low
@@ -606,7 +4646,7 @@ index e1d712f25..325ed08c1 100644
  {{%- endif %}}
  
 diff --git a/linux_os/guide/services/ntp/chronyd_run_as_chrony_user/rule.yml b/linux_os/guide/services/ntp/chronyd_run_as_chrony_user/rule.yml
-index f6c62f1e6..e1127ab4c 100644
+index b49373989..724442144 100644
 --- a/linux_os/guide/services/ntp/chronyd_run_as_chrony_user/rule.yml
 +++ b/linux_os/guide/services/ntp/chronyd_run_as_chrony_user/rule.yml
 @@ -4,7 +4,7 @@ documentation_complete: true
@@ -641,24 +4681,24 @@ index b75e59c2e..6c3415c34 100644
  
  
 diff --git a/linux_os/guide/services/ntp/chronyd_run_as_chrony_user/tests/empty.pass.sh b/linux_os/guide/services/ntp/chronyd_run_as_chrony_user/tests/empty.pass.sh
-index edd19015f..11fcd1bce 100644
+index e7c266e7f..7ce4dd93a 100644
 --- a/linux_os/guide/services/ntp/chronyd_run_as_chrony_user/tests/empty.pass.sh
 +++ b/linux_os/guide/services/ntp/chronyd_run_as_chrony_user/tests/empty.pass.sh
 @@ -1,5 +1,5 @@
  #!/bin/bash
--# platform = multi_platform_rhel,multi_platform_fedora
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora
+-# platform = multi_platform_ol,multi_platform_rhel,multi_platform_fedora
++# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora
  # packages = chrony
  
  
 diff --git a/linux_os/guide/services/ntp/chronyd_run_as_chrony_user/tests/empty_options.pass.sh b/linux_os/guide/services/ntp/chronyd_run_as_chrony_user/tests/empty_options.pass.sh
-index 83120046d..12b9d1a42 100644
+index 7b9cbcb9a..154effcbd 100644
 --- a/linux_os/guide/services/ntp/chronyd_run_as_chrony_user/tests/empty_options.pass.sh
 +++ b/linux_os/guide/services/ntp/chronyd_run_as_chrony_user/tests/empty_options.pass.sh
 @@ -1,5 +1,5 @@
  #!/bin/bash
--# platform = multi_platform_rhel,multi_platform_fedora
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora
+-# platform = multi_platform_ol,multi_platform_rhel,multi_platform_fedora
++# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora
  # packages = chrony
  
  
@@ -685,7 +4725,7 @@ index 69908e41f..0c506bca3 100644
  
  
 diff --git a/linux_os/guide/services/ntp/chronyd_server_directive/rule.yml b/linux_os/guide/services/ntp/chronyd_server_directive/rule.yml
-index 556495bcc..5eb0649f8 100644
+index 0b386f6bc..20ec745c8 100644
 --- a/linux_os/guide/services/ntp/chronyd_server_directive/rule.yml
 +++ b/linux_os/guide/services/ntp/chronyd_server_directive/rule.yml
 @@ -23,7 +23,7 @@ references:
@@ -694,9 +4734,9 @@ index 556495bcc..5eb0649f8 100644
      stigid@ol8: OL08-00-030740
 -    stigid@rhel8: RHEL-08-030740
 +    stigid@almalinux8: RHEL-08-030740
-     stigid@rhel9: RHEL-09-252020
  
  ocil_clause: 'an authoritative remote time server is not configured or configured with pool directive'
+ 
 diff --git a/linux_os/guide/services/ntp/chronyd_server_directive/tests/file_empty.fail.sh b/linux_os/guide/services/ntp/chronyd_server_directive/tests/file_empty.fail.sh
 index b2427c1d5..2d62ca68b 100644
 --- a/linux_os/guide/services/ntp/chronyd_server_directive/tests/file_empty.fail.sh
@@ -769,6 +4809,19 @@ index ec9e58c75..1a31ccf74 100644
  
  sed -i "^pool.*" {{{ chrony_conf_path }}}
  echo "server 0.pool.ntp.org" > {{{ chrony_conf_path }}}
+diff --git a/linux_os/guide/services/ntp/chronyd_specify_remote_server/rule.yml b/linux_os/guide/services/ntp/chronyd_specify_remote_server/rule.yml
+index dfd7c6fef..85b3740b3 100644
+--- a/linux_os/guide/services/ntp/chronyd_specify_remote_server/rule.yml
++++ b/linux_os/guide/services/ntp/chronyd_specify_remote_server/rule.yml
+@@ -36,7 +36,7 @@ references:
+     nist: CM-6(a),AU-8(1)(a)
+     pcidss: Req-10.4.3
+     srg: SRG-OS-000355-GPOS-00143
+-    stigid@rhel8: RHEL-08-030740
++    stigid@almalinux8: RHEL-08-030740
+ 
+ ocil_clause: 'a remote time server is not configured'
+ 
 diff --git a/linux_os/guide/services/ntp/chronyd_specify_remote_server/tests/correct.pass.sh b/linux_os/guide/services/ntp/chronyd_specify_remote_server/tests/correct.pass.sh
 index d74bde623..8f83241cd 100644
 --- a/linux_os/guide/services/ntp/chronyd_specify_remote_server/tests/correct.pass.sh
@@ -868,8 +4921,34 @@ index f8a77aeee..33166cac2 100644
  # reboot = false
  # strategy = enable
  # complexity = low
+diff --git a/linux_os/guide/services/ntp/service_ntp_enabled/rule.yml b/linux_os/guide/services/ntp/service_ntp_enabled/rule.yml
+index bb3ac288b..3f0e37529 100644
+--- a/linux_os/guide/services/ntp/service_ntp_enabled/rule.yml
++++ b/linux_os/guide/services/ntp/service_ntp_enabled/rule.yml
+@@ -47,7 +47,7 @@ template:
+     vars:
+         servicename: ntp
+ 
+-{{% if product in ["rhel7", "rhel8", "rhel9", "sle15"] %}}
++{{% if product in ["rhel7", "rhel8", "almalinux8", "rhel9", "sle15"] %}}
+ warnings:
+     - general:
+         {{% if product == "rhel7" %}}
+diff --git a/linux_os/guide/services/ntp/service_ntpd_enabled/rule.yml b/linux_os/guide/services/ntp/service_ntpd_enabled/rule.yml
+index 3cfd6d067..565265906 100644
+--- a/linux_os/guide/services/ntp/service_ntpd_enabled/rule.yml
++++ b/linux_os/guide/services/ntp/service_ntpd_enabled/rule.yml
+@@ -49,7 +49,7 @@ template:
+ 
+ platform: package[ntp]
+ 
+-{{% if product in ["rhel8", "rhel9", "sle15"] %}}
++{{% if product in ["rhel8", "almalinux8", "rhel9", "sle15"] %}}
+ warnings:
+     - general:
+         The <pre>ntp</pre> package is not available in {{{ full_name }}}. Please
 diff --git a/linux_os/guide/services/obsolete/r_services/no_host_based_files/rule.yml b/linux_os/guide/services/obsolete/r_services/no_host_based_files/rule.yml
-index ec023c163..6a9998c70 100644
+index a0e4996aa..70385711d 100644
 --- a/linux_os/guide/services/obsolete/r_services/no_host_based_files/rule.yml
 +++ b/linux_os/guide/services/obsolete/r_services/no_host_based_files/rule.yml
 @@ -29,7 +29,7 @@ references:
@@ -878,9 +4957,9 @@ index ec023c163..6a9998c70 100644
      stigid@rhel7: RHEL-07-040550
 -    stigid@rhel8: RHEL-08-010460
 +    stigid@almalinux8: RHEL-08-010460
-     stigid@rhel9: RHEL-09-252070
      stigid@sle12: SLES-12-010410
      stigid@sle15: SLES-15-040030
+ 
 diff --git a/linux_os/guide/services/obsolete/r_services/no_rsh_trust_files/ansible/shared.yml b/linux_os/guide/services/obsolete/r_services/no_rsh_trust_files/ansible/shared.yml
 index 9c6fc297c..7db8e8320 100644
 --- a/linux_os/guide/services/obsolete/r_services/no_rsh_trust_files/ansible/shared.yml
@@ -902,7 +4981,7 @@ index e64838b15..baaa07631 100644
  find /root -xdev -type f -name ".rhosts" -exec rm -f {} \;
  find /home -maxdepth 2 -xdev -type f -name ".rhosts" -exec rm -f {} \;
 diff --git a/linux_os/guide/services/obsolete/r_services/no_user_host_based_files/rule.yml b/linux_os/guide/services/obsolete/r_services/no_user_host_based_files/rule.yml
-index 15af7c169..a1997bbae 100644
+index 6240cdc30..a0c7c858f 100644
 --- a/linux_os/guide/services/obsolete/r_services/no_user_host_based_files/rule.yml
 +++ b/linux_os/guide/services/obsolete/r_services/no_user_host_based_files/rule.yml
 @@ -32,7 +32,7 @@ references:
@@ -911,23 +4990,23 @@ index 15af7c169..a1997bbae 100644
      stigid@rhel7: RHEL-07-040540
 -    stigid@rhel8: RHEL-08-010470
 +    stigid@almalinux8: RHEL-08-010470
-     stigid@rhel9: RHEL-09-252075
      stigid@sle12: SLES-12-010400
      stigid@sle15: SLES-15-040020
+ 
 diff --git a/linux_os/guide/services/obsolete/r_services/package_rsh-server_removed/rule.yml b/linux_os/guide/services/obsolete/r_services/package_rsh-server_removed/rule.yml
-index 9d2888a1b..46baea6a4 100644
+index ada9d1653..7a4a935ab 100644
 --- a/linux_os/guide/services/obsolete/r_services/package_rsh-server_removed/rule.yml
 +++ b/linux_os/guide/services/obsolete/r_services/package_rsh-server_removed/rule.yml
-@@ -39,7 +39,7 @@ references:
+@@ -37,7 +37,7 @@ references:
      stigid@ol7: OL07-00-020000
      stigid@ol8: OL08-00-040010
      stigid@rhel7: RHEL-07-020000
 -    stigid@rhel8: RHEL-08-040010
 +    stigid@almalinux8: RHEL-08-040010
-     stigid@rhel9: RHEL-09-215035
      stigid@ubuntu2004: UBTU-20-010406
+     stigid@ubuntu2204: UBTU-22-215030
  
-@@ -50,7 +50,7 @@ template:
+@@ -48,7 +48,7 @@ template:
      vars:
          pkgname: rsh-server
  
@@ -937,10 +5016,10 @@ index 9d2888a1b..46baea6a4 100644
      - general:
          The package is not available in {{{ full_name }}}.
 diff --git a/linux_os/guide/services/obsolete/r_services/package_rsh_removed/rule.yml b/linux_os/guide/services/obsolete/r_services/package_rsh_removed/rule.yml
-index fa615a76d..b1687e9d9 100644
+index bf34d2106..0ff6dd23c 100644
 --- a/linux_os/guide/services/obsolete/r_services/package_rsh_removed/rule.yml
 +++ b/linux_os/guide/services/obsolete/r_services/package_rsh_removed/rule.yml
-@@ -58,7 +58,7 @@ template:
+@@ -56,7 +56,7 @@ template:
          pkgname@ubuntu2004: rsh-client
          pkgname@ubuntu2204: rsh-client
  
@@ -950,10 +5029,10 @@ index fa615a76d..b1687e9d9 100644
      - general:
          The package is not available in {{{ full_name }}}.
 diff --git a/linux_os/guide/services/obsolete/talk/package_talk-server_removed/rule.yml b/linux_os/guide/services/obsolete/talk/package_talk-server_removed/rule.yml
-index 2b6b3a9c9..11f9b5a34 100644
+index e5ebfb140..87280a20c 100644
 --- a/linux_os/guide/services/obsolete/talk/package_talk-server_removed/rule.yml
 +++ b/linux_os/guide/services/obsolete/talk/package_talk-server_removed/rule.yml
-@@ -32,7 +32,7 @@ template:
+@@ -29,7 +29,7 @@ template:
      vars:
          pkgname: talk-server
  
@@ -963,10 +5042,10 @@ index 2b6b3a9c9..11f9b5a34 100644
      - general:
          The package is not available in {{{ full_name }}}.
 diff --git a/linux_os/guide/services/obsolete/talk/package_talk_removed/rule.yml b/linux_os/guide/services/obsolete/talk/package_talk_removed/rule.yml
-index fd15f0f82..f79aedf92 100644
+index 9990302be..343cdb90f 100644
 --- a/linux_os/guide/services/obsolete/talk/package_talk_removed/rule.yml
 +++ b/linux_os/guide/services/obsolete/talk/package_talk_removed/rule.yml
-@@ -40,7 +40,7 @@ template:
+@@ -38,7 +38,7 @@ template:
      vars:
          pkgname: talk
  
@@ -976,33 +5055,33 @@ index fd15f0f82..f79aedf92 100644
      - general:
          The package is not available in {{{ full_name }}}.
 diff --git a/linux_os/guide/services/obsolete/telnet/package_telnet-server_removed/rule.yml b/linux_os/guide/services/obsolete/telnet/package_telnet-server_removed/rule.yml
-index 9a4aae595..0f5b2853c 100644
+index 8e2e18450..9bf570ad9 100644
 --- a/linux_os/guide/services/obsolete/telnet/package_telnet-server_removed/rule.yml
 +++ b/linux_os/guide/services/obsolete/telnet/package_telnet-server_removed/rule.yml
-@@ -53,7 +53,7 @@ references:
+@@ -47,7 +47,7 @@ references:
      stigid@ol7: OL07-00-021710
      stigid@ol8: OL08-00-040000
      stigid@rhel7: RHEL-07-021710
 -    stigid@rhel8: RHEL-08-040000
 +    stigid@almalinux8: RHEL-08-040000
-     stigid@rhel9: RHEL-09-215040
      stigid@sle12: SLES-12-030000
      stigid@sle15: SLES-15-010180
+ 
 diff --git a/linux_os/guide/services/obsolete/tftp/package_tftp-server_removed/rule.yml b/linux_os/guide/services/obsolete/tftp/package_tftp-server_removed/rule.yml
-index 10bea8cdb..48157c113 100644
+index 6b97936e7..36ab18395 100644
 --- a/linux_os/guide/services/obsolete/tftp/package_tftp-server_removed/rule.yml
 +++ b/linux_os/guide/services/obsolete/tftp/package_tftp-server_removed/rule.yml
-@@ -42,7 +42,7 @@ references:
+@@ -36,7 +36,7 @@ references:
      stigid@ol7: OL07-00-040700
      stigid@ol8: OL08-00-040190
      stigid@rhel7: RHEL-07-040700
 -    stigid@rhel8: RHEL-08-040190
 +    stigid@almalinux8: RHEL-08-040190
-     stigid@rhel9: RHEL-09-215060
  
  {{{ complete_ocil_entry_package(package="tftp-server") }}}
+ 
 diff --git a/linux_os/guide/services/obsolete/tftp/tftpd_uses_secure_mode/rule.yml b/linux_os/guide/services/obsolete/tftp/tftpd_uses_secure_mode/rule.yml
-index 10ca18526..f1d31a4f2 100644
+index 6e5cedf70..b8de76983 100644
 --- a/linux_os/guide/services/obsolete/tftp/tftpd_uses_secure_mode/rule.yml
 +++ b/linux_os/guide/services/obsolete/tftp/tftpd_uses_secure_mode/rule.yml
 @@ -6,7 +6,7 @@ title: 'Ensure tftp Daemon Uses Secure Mode'
@@ -1014,13 +5093,12 @@ index 10ca18526..f1d31a4f2 100644
      ensure <tt>/etc/xinetd.d/tftp</tt> includes <tt>-s</tt> as a command line argument,
      as shown in the following example:
      <pre>server_args = -s {{{ xccdf_value("var_tftpd_secure_directory") }}}</pre>
-@@ -46,11 +46,11 @@ references:
+@@ -46,10 +46,10 @@ references:
      stigid@ol7: OL07-00-040720
      stigid@ol8: OL08-00-040350
      stigid@rhel7: RHEL-07-040720
 -    stigid@rhel8: RHEL-08-040350
 +    stigid@almalinux8: RHEL-08-040350
-     stigid@rhel9: RHEL-09-252055
  
  ocil_clause: |-
 -{{%- if product in ["rhel7","ol7","rhel8","ol8","rhv4"] %}}
@@ -1028,7 +5106,7 @@ index 10ca18526..f1d31a4f2 100644
      '"server_args" line does not have a "-s" option, and a subdirectory is not assigned'
  {{%- else %}}
      'the "ExecStart" line does not have a "-s" option, and a subdirectory is not assigned'
-@@ -60,7 +60,7 @@ ocil: |-
+@@ -59,7 +59,7 @@ ocil: |-
      Verify the TFTP daemon is configured to operate in secure mode.
  
      Check if a TFTP server is installed with the following command:
@@ -1037,7 +5115,7 @@ index 10ca18526..f1d31a4f2 100644
      <pre>$ rpm -qa | grep tftp</pre>
      {{% else %}}
      <pre>$ sudo dnf list --installed tftp-server
-@@ -70,7 +70,7 @@ ocil: |-
+@@ -69,7 +69,7 @@ ocil: |-
  
      If a TFTP server is not installed, this is Not Applicable.
      <br /><br />
@@ -1046,7 +5124,7 @@ index 10ca18526..f1d31a4f2 100644
      If a TFTP server is installed, verify TFTP is configured by with
      the <tt>-s</tt> option by running the following command:
  
-@@ -84,7 +84,7 @@ ocil: |-
+@@ -83,7 +83,7 @@ ocil: |-
      {{% endif %}}
  
  fixtext: |-
@@ -1056,7 +5134,7 @@ index 10ca18526..f1d31a4f2 100644
  
      server_args = -s {{{ xccdf_value("var_tftpd_secure_directory") }}}
 diff --git a/linux_os/guide/services/rng/service_rngd_enabled/rule.yml b/linux_os/guide/services/rng/service_rngd_enabled/rule.yml
-index 2764446e3..fb9670d0b 100644
+index 4c675f52c..0e9b3823f 100644
 --- a/linux_os/guide/services/rng/service_rngd_enabled/rule.yml
 +++ b/linux_os/guide/services/rng/service_rngd_enabled/rule.yml
 @@ -23,7 +23,7 @@ references:
@@ -1065,9 +5143,9 @@ index 2764446e3..fb9670d0b 100644
      stigid@ol8: OL08-00-010473
 -    stigid@rhel8: RHEL-08-010471
 +    stigid@almalinux8: RHEL-08-010471
-     stigid@rhel9: RHEL-09-211035
  
  {{% if product == "ol8" %}}
+ platform: os_linux[ol]<8.4 or not runtime_kernel_fips_enabled
 diff --git a/linux_os/guide/services/smb/configuring_samba/require_smb_client_signing/ansible/shared.yml b/linux_os/guide/services/smb/configuring_samba/require_smb_client_signing/ansible/shared.yml
 index a66068605..f25b95045 100644
 --- a/linux_os/guide/services/smb/configuring_samba/require_smb_client_signing/ansible/shared.yml
@@ -1261,18 +5339,18 @@ index 16878dc1d..6c3983a9d 100644
  test_user="cac_testuser"
  useradd $test_user
 diff --git a/linux_os/guide/services/ssh/file_permissions_sshd_private_key/rule.yml b/linux_os/guide/services/ssh/file_permissions_sshd_private_key/rule.yml
-index 6fc7992a1..28f5c07c7 100644
+index e4f1b1363..a56ea939f 100644
 --- a/linux_os/guide/services/ssh/file_permissions_sshd_private_key/rule.yml
 +++ b/linux_os/guide/services/ssh/file_permissions_sshd_private_key/rule.yml
-@@ -58,7 +58,7 @@ references:
+@@ -53,7 +53,7 @@ references:
      stigid@ol7: OL07-00-040420
      stigid@ol8: OL08-00-010490
      stigid@rhel7: RHEL-07-040420
 -    stigid@rhel8: RHEL-08-010490
 +    stigid@almalinux8: RHEL-08-010490
-     stigid@rhel9: RHEL-09-255120
      stigid@sle12: SLES-12-030220
      stigid@sle15: SLES-15-040250
+ 
 diff --git a/linux_os/guide/services/ssh/file_permissions_sshd_private_key/tests/altcorrect_permissions.pass.sh b/linux_os/guide/services/ssh/file_permissions_sshd_private_key/tests/altcorrect_permissions.pass.sh
 index 28325e1f7..d19148a0b 100644
 --- a/linux_os/guide/services/ssh/file_permissions_sshd_private_key/tests/altcorrect_permissions.pass.sh
@@ -1307,20 +5385,20 @@ index 48ecfbcac..c5a05db8b 100644
  FAKE_KEY=$(mktemp -p /etc/ssh/ XXXX_key)
  chown root:ssh_keys "$FAKE_KEY"
 diff --git a/linux_os/guide/services/ssh/file_permissions_sshd_pub_key/rule.yml b/linux_os/guide/services/ssh/file_permissions_sshd_pub_key/rule.yml
-index 9aaf68cb9..afc49df93 100644
+index 695fd89ee..1ae41664c 100644
 --- a/linux_os/guide/services/ssh/file_permissions_sshd_pub_key/rule.yml
 +++ b/linux_os/guide/services/ssh/file_permissions_sshd_pub_key/rule.yml
-@@ -41,7 +41,7 @@ references:
+@@ -37,7 +37,7 @@ references:
      stigid@ol7: OL07-00-040410
      stigid@ol8: OL08-00-010480
      stigid@rhel7: RHEL-07-040410
 -    stigid@rhel8: RHEL-08-010480
 +    stigid@almalinux8: RHEL-08-010480
-     stigid@rhel9: RHEL-09-255125
      stigid@sle12: SLES-12-030210
      stigid@sle15: SLES-15-040240
+ 
 diff --git a/linux_os/guide/services/ssh/package_openssh-server_installed/rule.yml b/linux_os/guide/services/ssh/package_openssh-server_installed/rule.yml
-index 2a665e70e..067893a82 100644
+index 2fbdd219a..6407197d1 100644
 --- a/linux_os/guide/services/ssh/package_openssh-server_installed/rule.yml
 +++ b/linux_os/guide/services/ssh/package_openssh-server_installed/rule.yml
 @@ -31,7 +31,7 @@ references:
@@ -1329,11 +5407,11 @@ index 2a665e70e..067893a82 100644
      stigid@rhel7: RHEL-07-040300
 -    stigid@rhel8: RHEL-08-040159
 +    stigid@almalinux8: RHEL-08-040159
-     stigid@rhel9: RHEL-09-255010
      stigid@ubuntu2004: UBTU-20-010042
+     stigid@ubuntu2204: UBTU-22-255010
  
 diff --git a/linux_os/guide/services/ssh/service_sshd_enabled/rule.yml b/linux_os/guide/services/ssh/service_sshd_enabled/rule.yml
-index ba53a8c3d..dba3ca619 100644
+index 9d2f306d5..37ad865f5 100644
 --- a/linux_os/guide/services/ssh/service_sshd_enabled/rule.yml
 +++ b/linux_os/guide/services/ssh/service_sshd_enabled/rule.yml
 @@ -40,7 +40,7 @@ references:
@@ -1342,9 +5420,9 @@ index ba53a8c3d..dba3ca619 100644
      stigid@rhel7: RHEL-07-040310
 -    stigid@rhel8: RHEL-08-040160
 +    stigid@almalinux8: RHEL-08-040160
-     stigid@rhel9: RHEL-09-255015
      stigid@sle12: SLES-12-030100
      stigid@sle15: SLES-15-010530
+     stigid@ubuntu2004: UBTU-20-010042
 diff --git a/linux_os/guide/services/ssh/ssh_client/ssh_client_use_strong_rng_csh/ansible/shared.yml b/linux_os/guide/services/ssh/ssh_client/ssh_client_use_strong_rng_csh/ansible/shared.yml
 index 1c878701e..be1bff4cf 100644
 --- a/linux_os/guide/services/ssh/ssh_client/ssh_client_use_strong_rng_csh/ansible/shared.yml
@@ -1386,18 +5464,18 @@ index 13306db45..7a5ca21fc 100644
  # put line into the file
  echo "export SSH_USE_STRONG_RNG=32" > /etc/profile.d/cc-ssh-strong-rng.sh
 diff --git a/linux_os/guide/services/ssh/ssh_client/ssh_keys_passphrase_protected/rule.yml b/linux_os/guide/services/ssh/ssh_client/ssh_keys_passphrase_protected/rule.yml
-index e886b61d9..599e965d0 100644
+index 184f5d6c4..15e604068 100644
 --- a/linux_os/guide/services/ssh/ssh_client/ssh_keys_passphrase_protected/rule.yml
 +++ b/linux_os/guide/services/ssh/ssh_client/ssh_keys_passphrase_protected/rule.yml
-@@ -23,7 +23,7 @@ identifiers:
- 
+@@ -24,7 +24,7 @@ identifiers:
  references:
      srg: SRG-OS-000067-GPOS-00035
+     stigid@ol8: OL08-00-010100
 -    stigid@rhel8: RHEL-08-010100
 +    stigid@almalinux8: RHEL-08-010100
-     stigid@rhel9: RHEL-09-611190
  
  ocil_clause: 'no ssh private key is accessible without a passcode'
+ 
 diff --git a/linux_os/guide/services/ssh/ssh_server/disable_host_auth/kubernetes/shared.yml b/linux_os/guide/services/ssh/ssh_server/disable_host_auth/kubernetes/shared.yml
 index 5a97f74df..104b27f3f 100644
 --- a/linux_os/guide/services/ssh/ssh_server/disable_host_auth/kubernetes/shared.yml
@@ -1450,33 +5528,33 @@ index c7212d5b8..dc1e8c4b9 100644
  {{{ bash_instantiate_variables("var_sshd_disable_compression") }}}
  {{{ bash_sshd_remediation("Compression", "$var_sshd_disable_compression") }}}
 diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_disable_empty_passwords/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_disable_empty_passwords/rule.yml
-index 40960565c..06d3b974e 100644
+index 64d518cd8..7dcaf9358 100644
 --- a/linux_os/guide/services/ssh/ssh_server/sshd_disable_empty_passwords/rule.yml
 +++ b/linux_os/guide/services/ssh/ssh_server/sshd_disable_empty_passwords/rule.yml
-@@ -57,7 +57,7 @@ references:
+@@ -52,7 +52,7 @@ references:
      stigid@ol7: OL07-00-010300
      stigid@ol8: OL08-00-020330
      stigid@rhel7: RHEL-07-010300
 -    stigid@rhel8: RHEL-08-020330
 +    stigid@almalinux8: RHEL-08-020330
-     stigid@rhel9: RHEL-09-255040
      stigid@sle12: SLES-12-030150
      stigid@sle15: SLES-15-040440
+     stigid@ubuntu2004: UBTU-20-010047
 diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_disable_gssapi_auth/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_disable_gssapi_auth/rule.yml
-index c45531648..522df4731 100644
+index 84e5d497f..63794190a 100644
 --- a/linux_os/guide/services/ssh/ssh_server/sshd_disable_gssapi_auth/rule.yml
 +++ b/linux_os/guide/services/ssh/ssh_server/sshd_disable_gssapi_auth/rule.yml
-@@ -44,7 +44,7 @@ references:
+@@ -43,7 +43,7 @@ references:
      stigid@ol7: OL07-00-040430
      stigid@ol8: OL08-00-010522
      stigid@rhel7: RHEL-07-040430
 -    stigid@rhel8: RHEL-08-010522
 +    stigid@almalinux8: RHEL-08-010522
-     stigid@rhel9: RHEL-09-255135
  
  {{{ complete_ocil_entry_sshd_option(default="yes", option="GSSAPIAuthentication", value="no") }}}
+ 
 diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_disable_kerb_auth/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_disable_kerb_auth/rule.yml
-index 969e5a708..dc91af19a 100644
+index 05de4709b..247057b8e 100644
 --- a/linux_os/guide/services/ssh/ssh_server/sshd_disable_kerb_auth/rule.yml
 +++ b/linux_os/guide/services/ssh/ssh_server/sshd_disable_kerb_auth/rule.yml
 @@ -44,7 +44,7 @@ references:
@@ -1485,9 +5563,9 @@ index 969e5a708..dc91af19a 100644
      stigid@rhel7: RHEL-07-040440
 -    stigid@rhel8: RHEL-08-010521
 +    stigid@almalinux8: RHEL-08-010521
-     stigid@rhel9: RHEL-09-255140
  
  {{{ complete_ocil_entry_sshd_option(default="yes", option="KerberosAuthentication", value="no") }}}
+ 
 diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_disable_rhosts_rsa/ansible/shared.yml b/linux_os/guide/services/ssh/ssh_server/sshd_disable_rhosts_rsa/ansible/shared.yml
 index 228a1166a..6ba91af43 100644
 --- a/linux_os/guide/services/ssh/ssh_server/sshd_disable_rhosts_rsa/ansible/shared.yml
@@ -1509,20 +5587,20 @@ index 5a1ec5cf7..d240b4711 100644
  
  {{{ bash_replace_or_append('/etc/ssh/sshd_config', '^RhostsRSAAuthentication', 'no', '%s %s') }}}
 diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_disable_root_login/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_disable_root_login/rule.yml
-index 479d26bc6..c04978f0f 100644
+index c4b786ae9..519a25aff 100644
 --- a/linux_os/guide/services/ssh/ssh_server/sshd_disable_root_login/rule.yml
 +++ b/linux_os/guide/services/ssh/ssh_server/sshd_disable_root_login/rule.yml
-@@ -54,7 +54,7 @@ references:
+@@ -49,7 +49,7 @@ references:
      stigid@ol7: OL07-00-040370
      stigid@ol8: OL08-00-010550
      stigid@rhel7: RHEL-07-040370
 -    stigid@rhel8: RHEL-08-010550
 +    stigid@almalinux8: RHEL-08-010550
-     stigid@rhel9: RHEL-09-255045
      stigid@sle12: SLES-12-030140
      stigid@sle15: SLES-15-020040
+ 
 diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_disable_user_known_hosts/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_disable_user_known_hosts/rule.yml
-index 780b846b0..37e5ea9ae 100644
+index 0bb62b7c9..abd0e26ca 100644
 --- a/linux_os/guide/services/ssh/ssh_server/sshd_disable_user_known_hosts/rule.yml
 +++ b/linux_os/guide/services/ssh/ssh_server/sshd_disable_user_known_hosts/rule.yml
 @@ -40,7 +40,7 @@ references:
@@ -1531,37 +5609,37 @@ index 780b846b0..37e5ea9ae 100644
      stigid@rhel7: RHEL-07-040380
 -    stigid@rhel8: RHEL-08-010520
 +    stigid@almalinux8: RHEL-08-010520
-     stigid@rhel9: RHEL-09-255150
      stigid@sle12: SLES-12-030200
      stigid@sle15: SLES-15-040230
+ 
 diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_disable_x11_forwarding/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_disable_x11_forwarding/rule.yml
-index 6018d7002..1555669cf 100644
+index 24eafaade..a9f21c3ba 100644
 --- a/linux_os/guide/services/ssh/ssh_server/sshd_disable_x11_forwarding/rule.yml
 +++ b/linux_os/guide/services/ssh/ssh_server/sshd_disable_x11_forwarding/rule.yml
-@@ -46,7 +46,7 @@ references:
+@@ -43,7 +43,7 @@ references:
      stigid@ol7: OL07-00-040710
      stigid@ol8: OL08-00-040340
      stigid@rhel7: RHEL-07-040710
 -    stigid@rhel8: RHEL-08-040340
 +    stigid@almalinux8: RHEL-08-040340
-     stigid@rhel9: RHEL-09-255155
      stigid@sle15: SLES-15-040290
      stigid@ubuntu2004: UBTU-20-010048
+     stigid@ubuntu2204: UBTU-22-255040
 diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_do_not_permit_user_env/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_do_not_permit_user_env/rule.yml
-index 4e168c61e..3492caa81 100644
+index b007cf14e..7f690110a 100644
 --- a/linux_os/guide/services/ssh/ssh_server/sshd_do_not_permit_user_env/rule.yml
 +++ b/linux_os/guide/services/ssh/ssh_server/sshd_do_not_permit_user_env/rule.yml
-@@ -51,7 +51,7 @@ references:
+@@ -47,7 +47,7 @@ references:
      stigid@ol7: OL07-00-010460
      stigid@ol8: OL08-00-010830
      stigid@rhel7: RHEL-07-010460
 -    stigid@rhel8: RHEL-08-010830
 +    stigid@almalinux8: RHEL-08-010830
-     stigid@rhel9: RHEL-09-255085
      stigid@sle12: SLES-12-030151
      stigid@sle15: SLES-15-040440
+     stigid@ubuntu2004: UBTU-20-010047
 diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_enable_strictmodes/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_enable_strictmodes/rule.yml
-index 65cf32d3c..c48920cdd 100644
+index 322890154..de933b808 100644
 --- a/linux_os/guide/services/ssh/ssh_server/sshd_enable_strictmodes/rule.yml
 +++ b/linux_os/guide/services/ssh/ssh_server/sshd_enable_strictmodes/rule.yml
 @@ -43,7 +43,7 @@ references:
@@ -1570,24 +5648,24 @@ index 65cf32d3c..c48920cdd 100644
      stigid@rhel7: RHEL-07-040450
 -    stigid@rhel8: RHEL-08-010500
 +    stigid@almalinux8: RHEL-08-010500
-     stigid@rhel9: RHEL-09-255160
      stigid@sle12: SLES-12-030230
      stigid@sle15: SLES-15-040260
+ 
 diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_enable_warning_banner/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_enable_warning_banner/rule.yml
-index 87aaf6326..e1f67cd59 100644
+index 2ac928bb6..ae0f964a4 100644
 --- a/linux_os/guide/services/ssh/ssh_server/sshd_enable_warning_banner/rule.yml
 +++ b/linux_os/guide/services/ssh/ssh_server/sshd_enable_warning_banner/rule.yml
-@@ -46,7 +46,7 @@ references:
+@@ -45,7 +45,7 @@ references:
      stigid@ol7: OL07-00-040170
      stigid@ol8: OL08-00-010040
      stigid@rhel7: RHEL-07-040170
 -    stigid@rhel8: RHEL-08-010040
 +    stigid@almalinux8: RHEL-08-010040
-     stigid@rhel9: RHEL-09-255025
      stigid@sle12: SLES-12-030050
      stigid@sle15: SLES-15-010040
+ 
 diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_print_last_log/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_print_last_log/rule.yml
-index 59b6850a0..6c6e70e01 100644
+index 685504061..7ff5fd566 100644
 --- a/linux_os/guide/services/ssh/ssh_server/sshd_print_last_log/rule.yml
 +++ b/linux_os/guide/services/ssh/ssh_server/sshd_print_last_log/rule.yml
 @@ -38,7 +38,7 @@ references:
@@ -1596,11 +5674,11 @@ index 59b6850a0..6c6e70e01 100644
      stigid@rhel7: RHEL-07-040360
 -    stigid@rhel8: RHEL-08-020350
 +    stigid@almalinux8: RHEL-08-020350
-     stigid@rhel9: RHEL-09-255165
      stigid@sle12: SLES-12-030130
      stigid@sle15: SLES-15-020120
+ 
 diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_rekey_limit/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_rekey_limit/rule.yml
-index 8cb93257c..570980352 100644
+index 9b1f144d7..0711b2bcd 100644
 --- a/linux_os/guide/services/ssh/ssh_server/sshd_rekey_limit/rule.yml
 +++ b/linux_os/guide/services/ssh/ssh_server/sshd_rekey_limit/rule.yml
 @@ -27,7 +27,7 @@ references:
@@ -1609,9 +5687,9 @@ index 8cb93257c..570980352 100644
      stigid@ol8: OL08-00-040161
 -    stigid@rhel8: RHEL-08-040161
 +    stigid@almalinux8: RHEL-08-040161
-     stigid@rhel9: RHEL-09-255090
  
  ocil_clause: 'it is commented out or is not set'
+ 
 diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_rekey_limit/tests/rhel8_ospp_ok.pass.sh b/linux_os/guide/services/ssh/ssh_server/sshd_rekey_limit/tests/rhel8_ospp_ok.pass.sh
 index a31a14f8a..08ad17d7b 100644
 --- a/linux_os/guide/services/ssh/ssh_server/sshd_rekey_limit/tests/rhel8_ospp_ok.pass.sh
@@ -1633,18 +5711,18 @@ index 5b54ab892..4213bc152 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_set_idle_timeout/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_set_idle_timeout/rule.yml
-index 80a054ce6..3f8a863ce 100644
+index dd23dc26b..285e41fd8 100644
 --- a/linux_os/guide/services/ssh/ssh_server/sshd_set_idle_timeout/rule.yml
 +++ b/linux_os/guide/services/ssh/ssh_server/sshd_set_idle_timeout/rule.yml
-@@ -64,7 +64,7 @@ references:
+@@ -53,7 +53,7 @@ references:
      stigid@ol7: OL07-00-040320
      stigid@ol8: OL08-00-010201
      stigid@rhel7: RHEL-07-040320
 -    stigid@rhel8: RHEL-08-010201
 +    stigid@almalinux8: RHEL-08-010201
-     stigid@rhel9: RHEL-09-255100
      stigid@sle12: SLES-12-030190
      stigid@sle15: SLES-15-010280
+     stigid@ubuntu2004: UBTU-20-010037
 diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_set_keepalive/ansible/shared.yml b/linux_os/guide/services/ssh/ssh_server/sshd_set_keepalive/ansible/shared.yml
 index be6b3672f..869beb409 100644
 --- a/linux_os/guide/services/ssh/ssh_server/sshd_set_keepalive/ansible/shared.yml
@@ -1666,18 +5744,18 @@ index e777ce8fe..588ca64d7 100644
  {{{ bash_instantiate_variables("var_sshd_set_keepalive") }}}
  
 diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_set_keepalive/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_set_keepalive/rule.yml
-index cc6387f6a..2f7cfa3ce 100644
+index 9a3fbb8cd..d878a0152 100644
 --- a/linux_os/guide/services/ssh/ssh_server/sshd_set_keepalive/rule.yml
 +++ b/linux_os/guide/services/ssh/ssh_server/sshd_set_keepalive/rule.yml
-@@ -56,7 +56,7 @@ references:
+@@ -51,7 +51,7 @@ references:
      pcidss: Req-8.1.8
-     pcidss4: "8.2.8"
      srg: SRG-OS-000163-GPOS-00072,SRG-OS-000279-GPOS-00109
+     stigid@ol8: OL08-00-010200
 -    stigid@rhel8: RHEL-08-010200
 +    stigid@almalinux8: RHEL-08-010200
-     stigid@rhel9: RHEL-09-255095
      stigid@sle12: SLES-12-030191
      stigid@sle15: SLES-15-010320
+     stigid@ubuntu2004: UBTU-20-010036
 diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_set_max_auth_tries/ansible/shared.yml b/linux_os/guide/services/ssh/ssh_server/sshd_set_max_auth_tries/ansible/shared.yml
 index a7a2ed3d6..f4ba85ff9 100644
 --- a/linux_os/guide/services/ssh/ssh_server/sshd_set_max_auth_tries/ansible/shared.yml
@@ -1720,7 +5798,7 @@ index fcdb800c2..77c3e82da 100644
  #!/bin/bash
  SSHD_CONFIG="/etc/ssh/sshd_config"
 diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_kex_ordered_stig/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_kex_ordered_stig/rule.yml
-index 4173ce47f..07b35af4d 100644
+index 769f0fe21..cdd29d515 100644
 --- a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_kex_ordered_stig/rule.yml
 +++ b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_kex_ordered_stig/rule.yml
 @@ -48,7 +48,7 @@ references:
@@ -1889,7 +5967,7 @@ index d23f8b669..3f06a2fa3 100644
  ocil: |-
      To determine whether the SSH service is configured to use strong entropy seed,
 diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_x11_use_localhost/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_x11_use_localhost/rule.yml
-index c3694805c..cfc34fb14 100644
+index 3dba53561..666ec0257 100644
 --- a/linux_os/guide/services/ssh/ssh_server/sshd_x11_use_localhost/rule.yml
 +++ b/linux_os/guide/services/ssh/ssh_server/sshd_x11_use_localhost/rule.yml
 @@ -38,7 +38,7 @@ references:
@@ -1898,9 +5976,9 @@ index c3694805c..cfc34fb14 100644
      stigid@rhel7: RHEL-07-040711
 -    stigid@rhel8: RHEL-08-040341
 +    stigid@almalinux8: RHEL-08-040341
-     stigid@rhel9: RHEL-09-255175
      stigid@sle12: SLES-12-030261
      stigid@ubuntu2004: UBTU-20-010049
+     stigid@ubuntu2204: UBTU-22-255045
 diff --git a/linux_os/guide/services/sssd/sssd-ldap/sssd_ldap_configure_tls_ca_dir/ansible/shared.yml b/linux_os/guide/services/sssd/sssd-ldap/sssd_ldap_configure_tls_ca_dir/ansible/shared.yml
 index 202fc7f44..711cc57c6 100644
 --- a/linux_os/guide/services/sssd/sssd-ldap/sssd_ldap_configure_tls_ca_dir/ansible/shared.yml
@@ -1961,7 +6039,7 @@ index 564e32815..02bed6db8 100644
  {{{ bash_sssd_ldap_config(parameter="ldap_id_use_start_tls", value="true") }}}
  
 diff --git a/linux_os/guide/services/sssd/sssd_certificate_verification/ansible/shared.yml b/linux_os/guide/services/sssd/sssd_certificate_verification/ansible/shared.yml
-index c93d7a59d..a6dff6f85 100644
+index 02cfde93e..1b9644302 100644
 --- a/linux_os/guide/services/sssd/sssd_certificate_verification/ansible/shared.yml
 +++ b/linux_os/guide/services/sssd/sssd_certificate_verification/ansible/shared.yml
 @@ -1,4 +1,4 @@
@@ -1971,7 +6049,7 @@ index c93d7a59d..a6dff6f85 100644
  # strategy = configure
  # complexity = low
 diff --git a/linux_os/guide/services/sssd/sssd_certificate_verification/bash/shared.sh b/linux_os/guide/services/sssd/sssd_certificate_verification/bash/shared.sh
-index ea3c0946c..08e66dade 100644
+index a7e449e52..84da3094e 100644
 --- a/linux_os/guide/services/sssd/sssd_certificate_verification/bash/shared.sh
 +++ b/linux_os/guide/services/sssd/sssd_certificate_verification/bash/shared.sh
 @@ -1,4 +1,4 @@
@@ -1981,7 +6059,7 @@ index ea3c0946c..08e66dade 100644
  # strategy = configure
  # complexity = low
 diff --git a/linux_os/guide/services/sssd/sssd_certificate_verification/rule.yml b/linux_os/guide/services/sssd/sssd_certificate_verification/rule.yml
-index df4e19807..b5948e9d6 100644
+index 7ed2eede2..f50e10729 100644
 --- a/linux_os/guide/services/sssd/sssd_certificate_verification/rule.yml
 +++ b/linux_os/guide/services/sssd/sssd_certificate_verification/rule.yml
 @@ -24,7 +24,7 @@ references:
@@ -1990,11 +6068,11 @@ index df4e19807..b5948e9d6 100644
      stigid@ol8: OL08-00-010400
 -    stigid@rhel8: RHEL-08-010400
 +    stigid@almalinux8: RHEL-08-010400
-     stigid@rhel9: RHEL-09-611170
  
  ocil_clause: 'certificate_verification in sssd is not configured'
+ 
 diff --git a/linux_os/guide/services/sssd/sssd_enable_certmap/rule.yml b/linux_os/guide/services/sssd/sssd_enable_certmap/rule.yml
-index 6791df75f..2aae5273f 100644
+index c633d6f9f..285490934 100644
 --- a/linux_os/guide/services/sssd/sssd_enable_certmap/rule.yml
 +++ b/linux_os/guide/services/sssd/sssd_enable_certmap/rule.yml
 @@ -30,7 +30,7 @@ references:
@@ -2003,9 +6081,9 @@ index 6791df75f..2aae5273f 100644
     stigid@ol8: OL08-00-020090
 -   stigid@rhel8: RHEL-08-020090
 +   stigid@almalinux8: RHEL-08-020090
-    stigid@rhel9: RHEL-09-631015
  
  warnings:
+     - general: |-
 diff --git a/linux_os/guide/services/sssd/sssd_enable_pam_services/bash/shared.sh b/linux_os/guide/services/sssd/sssd_enable_pam_services/bash/shared.sh
 index 09e863e4a..ba1f546e9 100644
 --- a/linux_os/guide/services/sssd/sssd_enable_pam_services/bash/shared.sh
@@ -2017,12 +6095,12 @@ index 09e863e4a..ba1f546e9 100644
  
  
 diff --git a/linux_os/guide/services/sssd/sssd_enable_smartcards/ansible/shared.yml b/linux_os/guide/services/sssd/sssd_enable_smartcards/ansible/shared.yml
-index f82c9e386..e57bdf163 100644
+index 1fec69763..c6caf6908 100644
 --- a/linux_os/guide/services/sssd/sssd_enable_smartcards/ansible/shared.yml
 +++ b/linux_os/guide/services/sssd/sssd_enable_smartcards/ansible/shared.yml
-@@ -34,7 +34,7 @@
-     create: yes
-     mode: 0600
+@@ -47,7 +47,7 @@
+     replace: 'pam_cert_auth = True'
+   with_items: "{{ sssd_conf_d_files.files }}"
  
 -{{% if product in ["fedora", "ol8", "ol9", "rhel8", "rhel9"] %}}
 +{{% if product in ["fedora", "ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
@@ -2030,7 +6108,7 @@ index f82c9e386..e57bdf163 100644
    ansible.builtin.stat:
      path: /usr/bin/authselect
 diff --git a/linux_os/guide/services/sssd/sssd_enable_smartcards/bash/shared.sh b/linux_os/guide/services/sssd/sssd_enable_smartcards/bash/shared.sh
-index 4e2e00554..619d3f684 100644
+index b896f4f7d..af7771778 100644
 --- a/linux_os/guide/services/sssd/sssd_enable_smartcards/bash/shared.sh
 +++ b/linux_os/guide/services/sssd/sssd_enable_smartcards/bash/shared.sh
 @@ -13,7 +13,7 @@ umask u=rw,go=
@@ -2043,7 +6121,7 @@ index 4e2e00554..619d3f684 100644
      {{{ bash_enable_authselect_feature('with-smartcard') | indent(4) }}}
  else
 diff --git a/linux_os/guide/services/sssd/sssd_enable_smartcards/oval/shared.xml b/linux_os/guide/services/sssd/sssd_enable_smartcards/oval/shared.xml
-index c2ae4d39a..010ff0410 100644
+index 1cadee2e4..1c1a2507f 100644
 --- a/linux_os/guide/services/sssd/sssd_enable_smartcards/oval/shared.xml
 +++ b/linux_os/guide/services/sssd/sssd_enable_smartcards/oval/shared.xml
 @@ -5,7 +5,7 @@
@@ -2055,9 +6133,9 @@ index c2ae4d39a..010ff0410 100644
        <criterion comment="Check allow_missing_name in /etc/pam.d/smartcard-auth"
                   test_ref="test_sssd_enable_smartcards_allow_missing_name_smartcard_auth"/>
        <criterion comment="Check try_cert_auth or require_cert_auth in /etc/pam.d/system-auth"
-@@ -25,7 +25,7 @@
-     <ind:instance datatype="int">1</ind:instance>
-   </ind:textfilecontent54_object>
+@@ -30,7 +30,7 @@
+     <ind:subexpression operation="pattern match">(?i)true</ind:subexpression>
+   </ind:textfilecontent54_state>
  
 -  {{% if product in ["fedora", "ol8", "ol9", "rhel8", "rhel9"] %}}
 +  {{% if product in ["fedora", "ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
@@ -2065,7 +6143,7 @@ index c2ae4d39a..010ff0410 100644
    comment="tests the presence of try_cert_auth or require_cert_auth in /etc/pam.d/smartcard-auth"
    id="test_sssd_enable_smartcards_allow_missing_name_smartcard_auth" version="2">
 diff --git a/linux_os/guide/services/sssd/sssd_enable_smartcards/rule.yml b/linux_os/guide/services/sssd/sssd_enable_smartcards/rule.yml
-index b4d314374..585daaa7e 100644
+index bb15da50b..bfb112bbe 100644
 --- a/linux_os/guide/services/sssd/sssd_enable_smartcards/rule.yml
 +++ b/linux_os/guide/services/sssd/sssd_enable_smartcards/rule.yml
 @@ -10,7 +10,7 @@ description: |-
@@ -2077,16 +6155,16 @@ index b4d314374..585daaa7e 100644
      Add or update "pam_sss.so" line in auth section of "/etc/pam.d/system-auth" file to include
      "try_cert_auth" or "require_cert_auth" option, like in the following example:
      <pre>
-@@ -51,7 +51,7 @@ references:
-     pcidss4: "8.4"
+@@ -50,7 +50,7 @@ references:
+     pcidss: Req-8.3
      srg: SRG-OS-000375-GPOS-00160,SRG-OS-000105-GPOS-00052,SRG-OS-000106-GPOS-00053,SRG-OS-000107-GPOS-00054,SRG-OS-000108-GPOS-00055
      stigid@ol8: OL08-00-020250
 -    stigid@rhel8: RHEL-08-020250
 +    stigid@almalinux8: RHEL-08-020250
-     stigid@rhel9: RHEL-09-611165
  
  ocil_clause: 'smart cards are not enabled in SSSD'
-@@ -62,7 +62,7 @@ ocil: |-
+ 
+@@ -60,7 +60,7 @@ ocil: |-
      If configured properly, output should be
      <pre>pam_cert_auth = True</pre>
  
@@ -2095,7 +6173,7 @@ index b4d314374..585daaa7e 100644
      To verify that smart cards are enabled in PAM files, run the following command:
      <pre>$ sudo grep -e "auth.*pam_sss\.so.*\(allow_missing_name\|try_cert_auth\)" /etc/pam.d/smartcard-auth /etc/pam.d/system-auth</pre>
      If configured properly, output should be
-@@ -77,7 +77,7 @@ fixtext: |-
+@@ -75,7 +75,7 @@ fixtext: |-
  
      pam_cert_auth = True
  
@@ -2140,6 +6218,18 @@ index 860e0bb6c..b1763e438 100644
  
  SSSD_FILE="/etc/sssd/sssd.conf"
  echo "[pam]" > $SSSD_FILE
+diff --git a/linux_os/guide/services/sssd/sssd_enable_smartcards/tests/authselect_smartcard_enabled_conf_d.pass.sh b/linux_os/guide/services/sssd/sssd_enable_smartcards/tests/authselect_smartcard_enabled_conf_d.pass.sh
+index 7e2019cff..ca200076f 100644
+--- a/linux_os/guide/services/sssd/sssd_enable_smartcards/tests/authselect_smartcard_enabled_conf_d.pass.sh
++++ b/linux_os/guide/services/sssd/sssd_enable_smartcards/tests/authselect_smartcard_enabled_conf_d.pass.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = authselect,sssd
+-# platform = multi_platform_fedora,Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
++# platform = multi_platform_fedora,Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux 8,Red Hat Enterprise Linux 9
+ 
+ SSSD_FILE="/etc/sssd/conf.d/unused.conf"
+ echo "[pam]" > $SSSD_FILE
 diff --git a/linux_os/guide/services/sssd/sssd_enable_smartcards/tests/authselect_smartcard_enabled_lower.pass.sh b/linux_os/guide/services/sssd/sssd_enable_smartcards/tests/authselect_smartcard_enabled_lower.pass.sh
 index 78b79752a..2f436c9e9 100644
 --- a/linux_os/guide/services/sssd/sssd_enable_smartcards/tests/authselect_smartcard_enabled_lower.pass.sh
@@ -2164,6 +6254,18 @@ index aaf33d7b0..a20a8c190 100644
  
  SSSD_FILE="/etc/sssd/sssd.conf"
  echo "[pam]" > $SSSD_FILE
+diff --git a/linux_os/guide/services/sssd/sssd_enable_smartcards/tests/authselect_sssd_parameter_false_conf_d.fail.sh b/linux_os/guide/services/sssd/sssd_enable_smartcards/tests/authselect_sssd_parameter_false_conf_d.fail.sh
+index b1ed28f39..576cf7649 100644
+--- a/linux_os/guide/services/sssd/sssd_enable_smartcards/tests/authselect_sssd_parameter_false_conf_d.fail.sh
++++ b/linux_os/guide/services/sssd/sssd_enable_smartcards/tests/authselect_sssd_parameter_false_conf_d.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = authselect,sssd
+-# platform = multi_platform_fedora,Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
++# platform = multi_platform_fedora,Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux 8,Red Hat Enterprise Linux 9
+ 
+ SSSD_FILE="/etc/sssd/conf.d/unused.conf"
+ echo "[pam]" > $SSSD_FILE
 diff --git a/linux_os/guide/services/sssd/sssd_enable_smartcards/tests/authselect_sssd_parameter_missing.fail.sh b/linux_os/guide/services/sssd/sssd_enable_smartcards/tests/authselect_sssd_parameter_missing.fail.sh
 index 85bb1de67..a1ef34292 100644
 --- a/linux_os/guide/services/sssd/sssd_enable_smartcards/tests/authselect_sssd_parameter_missing.fail.sh
@@ -2189,7 +6291,7 @@ index 43e19d382..2848e2072 100644
  SSSD_FILE="/etc/sssd/sssd.conf"
  rm -f $SSSD_FILE
 diff --git a/linux_os/guide/services/sssd/sssd_has_trust_anchor/rule.yml b/linux_os/guide/services/sssd/sssd_has_trust_anchor/rule.yml
-index 65eb8d8b3..87c26855d 100644
+index 7c5b26320..546bc8747 100644
 --- a/linux_os/guide/services/sssd/sssd_has_trust_anchor/rule.yml
 +++ b/linux_os/guide/services/sssd/sssd_has_trust_anchor/rule.yml
 @@ -36,7 +36,7 @@ references:
@@ -2198,11 +6300,11 @@ index 65eb8d8b3..87c26855d 100644
    stigid@ol8: OL08-00-010090
 -  stigid@rhel8: RHEL-08-010090
 +  stigid@almalinux8: RHEL-08-010090
-   stigid@rhel9: RHEL-09-631010
  
  warnings:
+     - general: |-
 diff --git a/linux_os/guide/services/sssd/sssd_memcache_timeout/ansible/shared.yml b/linux_os/guide/services/sssd/sssd_memcache_timeout/ansible/shared.yml
-index 7cfba003b..fb36bb099 100644
+index efd5408e4..8e7ade7bc 100644
 --- a/linux_os/guide/services/sssd/sssd_memcache_timeout/ansible/shared.yml
 +++ b/linux_os/guide/services/sssd/sssd_memcache_timeout/ansible/shared.yml
 @@ -1,4 +1,4 @@
@@ -2222,7 +6324,7 @@ index e7d5d3916..ed768f876 100644
  {{{ bash_instantiate_variables("var_sssd_memcache_timeout") }}}
  
 diff --git a/linux_os/guide/services/sssd/sssd_offline_cred_expiration/oval/shared.xml b/linux_os/guide/services/sssd/sssd_offline_cred_expiration/oval/shared.xml
-index 3a5bd52c1..8c24e41bf 100644
+index 2ecac5d70..866d42258 100644
 --- a/linux_os/guide/services/sssd/sssd_offline_cred_expiration/oval/shared.xml
 +++ b/linux_os/guide/services/sssd/sssd_offline_cred_expiration/oval/shared.xml
 @@ -4,7 +4,7 @@
@@ -2234,17 +6336,17 @@ index 3a5bd52c1..8c24e41bf 100644
        <criterion comment="Check cache_credentials in /etc/sssd/sssd.conf"
        test_ref="test_sssd_cache_credentials" />
        {{% endif %}}
-@@ -20,7 +20,7 @@
-     <ind:pattern operation="pattern match">^[\s]*\[pam](?:[^\n\[]*\n+)+?[\s]*offline_credentials_expiration[\s]*=[\s]*1\s*(?:#.*)?$</ind:pattern>
-     <ind:instance datatype="int">1</ind:instance>
-   </ind:textfilecontent54_object>
+@@ -25,7 +25,7 @@
+   <ind:textfilecontent54_state id="state_sssd_offline_cred_expiration" version="1">
+     <ind:subexpression>1</ind:subexpression>
+   </ind:textfilecontent54_state>
 -  {{% if product in ["ol8", "rhel8"] %}}
 +  {{% if product in ["ol8", "rhel8", "almalinux8"] %}}
    <ind:textfilecontent54_test check="all" check_existence="any_exist"
    comment="tests the value of cache_credentials setting in the /etc/sssd/sssd.conf file"
    id="test_sssd_cache_credentials" version="1">
 diff --git a/linux_os/guide/services/sssd/sssd_offline_cred_expiration/rule.yml b/linux_os/guide/services/sssd/sssd_offline_cred_expiration/rule.yml
-index 36187d683..113849b46 100644
+index 749eacd99..a85893fda 100644
 --- a/linux_os/guide/services/sssd/sssd_offline_cred_expiration/rule.yml
 +++ b/linux_os/guide/services/sssd/sssd_offline_cred_expiration/rule.yml
 @@ -5,7 +5,7 @@ title: 'Configure SSSD to Expire Offline Credentials'
@@ -2262,9 +6364,9 @@ index 36187d683..113849b46 100644
      stigid@ol8: OL08-00-020290
 -    stigid@rhel8: RHEL-08-020290
 +    stigid@almalinux8: RHEL-08-020290
-     stigid@rhel9: RHEL-09-631020
      stigid@sle12: SLES-12-010680
      stigid@sle15: SLES-15-010500
+     stigid@ubuntu2004: UBTU-20-010441
 @@ -55,7 +55,7 @@ references:
  ocil_clause: 'it does not exist or is not configured properly'
  
@@ -2297,7 +6399,7 @@ index 3da9609d7..06586bd8a 100644
  MAIN_CONF="/etc/sssd/conf.d/ospp.conf"
  
 diff --git a/linux_os/guide/services/sssd/sssd_ssh_known_hosts_timeout/ansible/shared.yml b/linux_os/guide/services/sssd/sssd_ssh_known_hosts_timeout/ansible/shared.yml
-index 599683567..8fa06fa65 100644
+index b92e1d3a6..747a90b31 100644
 --- a/linux_os/guide/services/sssd/sssd_ssh_known_hosts_timeout/ansible/shared.yml
 +++ b/linux_os/guide/services/sssd/sssd_ssh_known_hosts_timeout/ansible/shared.yml
 @@ -1,4 +1,4 @@
@@ -2326,7 +6428,7 @@ index 331627492..72a361b30 100644
 +# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_rhcos
  {{{ kubernetes_usbguard_set(["xccdf_org.ssgproject.content_rule_package_usbguard_installed"]) }}}
 diff --git a/linux_os/guide/services/usbguard/configure_usbguard_auditbackend/rule.yml b/linux_os/guide/services/usbguard/configure_usbguard_auditbackend/rule.yml
-index 70864f734..9b0a73a0b 100644
+index e0cbdd9ac..8564b0f85 100644
 --- a/linux_os/guide/services/usbguard/configure_usbguard_auditbackend/rule.yml
 +++ b/linux_os/guide/services/usbguard/configure_usbguard_auditbackend/rule.yml
 @@ -26,7 +26,7 @@ references:
@@ -2335,9 +6437,9 @@ index 70864f734..9b0a73a0b 100644
      stigid@ol8: OL08-00-030603
 -    stigid@rhel8: RHEL-08-030603
 +    stigid@almalinux8: RHEL-08-030603
-     stigid@rhel9: RHEL-09-291025
  
  platform: package[usbguard]
+ 
 diff --git a/linux_os/guide/services/usbguard/package_usbguard_installed/kubernetes/shared.yml b/linux_os/guide/services/usbguard/package_usbguard_installed/kubernetes/shared.yml
 index 9f18591b3..b49d5217a 100644
 --- a/linux_os/guide/services/usbguard/package_usbguard_installed/kubernetes/shared.yml
@@ -2350,18 +6452,18 @@ index 9f18591b3..b49d5217a 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/services/usbguard/package_usbguard_installed/rule.yml b/linux_os/guide/services/usbguard/package_usbguard_installed/rule.yml
-index e9e56f124..b9eb36658 100644
+index fdfbf27e7..009729f9d 100644
 --- a/linux_os/guide/services/usbguard/package_usbguard_installed/rule.yml
 +++ b/linux_os/guide/services/usbguard/package_usbguard_installed/rule.yml
-@@ -50,7 +50,7 @@ references:
+@@ -49,7 +49,7 @@ references:
      nist: CM-8(3),IA-3
-     srg: SRG-OS-000378-GPOS-00163
+     srg: SRG-OS-000378-GPOS-00163,SRG-APP-000141-CTR-000315
      stigid@ol8: OL08-00-040139
 -    stigid@rhel8: RHEL-08-040139
 +    stigid@almalinux8: RHEL-08-040139
-     stigid@rhel9: RHEL-09-291015
  
  ocil_clause: 'the package is not installed'
+ 
 diff --git a/linux_os/guide/services/usbguard/service_usbguard_enabled/kubernetes/shared.yml b/linux_os/guide/services/usbguard/service_usbguard_enabled/kubernetes/shared.yml
 index e9c55dfb0..9be805c13 100644
 --- a/linux_os/guide/services/usbguard/service_usbguard_enabled/kubernetes/shared.yml
@@ -2374,18 +6476,18 @@ index e9c55dfb0..9be805c13 100644
  kind: MachineConfig
  metadata:
 diff --git a/linux_os/guide/services/usbguard/service_usbguard_enabled/rule.yml b/linux_os/guide/services/usbguard/service_usbguard_enabled/rule.yml
-index 703949026..bb5493ff8 100644
+index c3131c2ae..a3feb179d 100644
 --- a/linux_os/guide/services/usbguard/service_usbguard_enabled/rule.yml
 +++ b/linux_os/guide/services/usbguard/service_usbguard_enabled/rule.yml
-@@ -26,7 +26,7 @@ references:
+@@ -25,7 +25,7 @@ references:
      ospp: FMT_SMF_EXT.1
-     srg: SRG-OS-000378-GPOS-00163
+     srg: SRG-OS-000378-GPOS-00163,SRG-APP-000141-CTR-000315
      stigid@ol8: OL08-00-040141
 -    stigid@rhel8: RHEL-08-040141
 +    stigid@almalinux8: RHEL-08-040141
-     stigid@rhel9: RHEL-09-291020
  
  ocil_clause: 'the service is not enabled'
+ 
 diff --git a/linux_os/guide/services/usbguard/usbguard_allow_hid_and_hub/kubernetes/shared.yml b/linux_os/guide/services/usbguard/usbguard_allow_hid_and_hub/kubernetes/shared.yml
 index 5ef460be8..8a12559f6 100644
 --- a/linux_os/guide/services/usbguard/usbguard_allow_hid_and_hub/kubernetes/shared.yml
@@ -2418,18 +6520,18 @@ index 88d55f160..f2f336700 100644
  # strategy = configure
  # complexity = low
 diff --git a/linux_os/guide/services/usbguard/usbguard_generate_policy/rule.yml b/linux_os/guide/services/usbguard/usbguard_generate_policy/rule.yml
-index c762f9318..9320755b5 100644
+index 46c7d024b..8d39c898a 100644
 --- a/linux_os/guide/services/usbguard/usbguard_generate_policy/rule.yml
 +++ b/linux_os/guide/services/usbguard/usbguard_generate_policy/rule.yml
-@@ -26,7 +26,7 @@ references:
+@@ -25,7 +25,7 @@ references:
      ospp: FMT_SMF_EXT.1
      srg: SRG-OS-000378-GPOS-00163
      stigid@ol8: OL08-00-040140
 -    stigid@rhel8: RHEL-08-040140
 +    stigid@almalinux8: RHEL-08-040140
-     stigid@rhel9: RHEL-09-291030
  
  ocil_clause: 'there is no evidence that unauthorized peripherals are being blocked before establishing a connection'
+ 
 diff --git a/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_remove_packages/ansible/shared.yml b/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_remove_packages/ansible/shared.yml
 index a5ff9b07b..71f4bc705 100644
 --- a/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_remove_packages/ansible/shared.yml
@@ -2441,7 +6543,7 @@ index a5ff9b07b..71f4bc705 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_remove_packages/rule.yml b/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_remove_packages/rule.yml
-index 55ecb9f2e..091e4ad14 100644
+index f6c161529..5e04745d5 100644
 --- a/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_remove_packages/rule.yml
 +++ b/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_remove_packages/rule.yml
 @@ -41,7 +41,7 @@ references:
@@ -2450,22 +6552,22 @@ index 55ecb9f2e..091e4ad14 100644
      stigid@rhel7: RHEL-07-040730
 -    stigid@rhel8: RHEL-08-040320
 +    stigid@almalinux8: RHEL-08-040320
-     stigid@rhel9: RHEL-09-215070
  
  ocil_clause: 'xorg related packages are not removed and run level is not correctly configured'
+ 
 diff --git a/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_runlevel_target/rule.yml b/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_runlevel_target/rule.yml
-index 1d939a95f..737cf51fe 100644
+index fc3356a15..fedd0d939 100644
 --- a/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_runlevel_target/rule.yml
 +++ b/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_runlevel_target/rule.yml
-@@ -39,7 +39,7 @@ references:
+@@ -37,7 +37,7 @@ references:
      nist-csf: PR.AC-3,PR.PT-4
      srg: SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-040321
 -    stigid@rhel8: RHEL-08-040321
 +    stigid@almalinux8: RHEL-08-040321
-     stigid@rhel9: RHEL-09-211030
  
  ocil_clause: 'the system default target is not set to "multi-user.target" and the Information System Security Officer (ISSO) lacks a documented requirement for a graphical user interface'
+ 
 diff --git a/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_runlevel_target/tests/correct_target.pass.sh b/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_runlevel_target/tests/correct_target.pass.sh
 index 33bb72648..0242c8c28 100644
 --- a/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_runlevel_target/tests/correct_target.pass.sh
@@ -2526,19 +6628,30 @@ index 63ceaaf88..e50ada3e4 100644
  
  {{{ bash_instantiate_variables("login_banner_text") }}}
  
+diff --git a/linux_os/guide/system/accounts/accounts-banners/banner_etc_issue/kubernetes/shared.yml b/linux_os/guide/system/accounts/accounts-banners/banner_etc_issue/kubernetes/shared.yml
+index c2feb1fbc..116c6cde5 100644
+--- a/linux_os/guide/system/accounts/accounts-banners/banner_etc_issue/kubernetes/shared.yml
++++ b/linux_os/guide/system/accounts/accounts-banners/banner_etc_issue/kubernetes/shared.yml
+@@ -1,5 +1,5 @@
+ ---
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
+ apiVersion: machineconfiguration.openshift.io/v1
+ kind: MachineConfig
+ metadata:
 diff --git a/linux_os/guide/system/accounts/accounts-banners/banner_etc_issue/rule.yml b/linux_os/guide/system/accounts/accounts-banners/banner_etc_issue/rule.yml
-index b6012519b..4ce615545 100644
+index 933d4c7ef..3211afb7e 100644
 --- a/linux_os/guide/system/accounts/accounts-banners/banner_etc_issue/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-banners/banner_etc_issue/rule.yml
-@@ -117,7 +117,7 @@ references:
+@@ -121,7 +121,7 @@ references:
      stigid@ol7: OL07-00-010050
      stigid@ol8: OL08-00-010060
      stigid@rhel7: RHEL-07-010050
 -    stigid@rhel8: RHEL-08-010060
 +    stigid@almalinux8: RHEL-08-010060
-     stigid@rhel9: RHEL-09-211020
      stigid@sle12: SLES-12-010030
      stigid@sle15: SLES-15-010020
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-banners/banner_etc_motd/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-banners/banner_etc_motd/ansible/shared.yml
 index 5735d2035..0ca7771ef 100644
 --- a/linux_os/guide/system/accounts/accounts-banners/banner_etc_motd/ansible/shared.yml
@@ -2570,18 +6683,18 @@ index 5814a30bd..aa4aa4c5c 100644
  # strategy = unknown
  # complexity = low
 diff --git a/linux_os/guide/system/accounts/accounts-banners/gui_login_banner/dconf_gnome_banner_enabled/rule.yml b/linux_os/guide/system/accounts/accounts-banners/gui_login_banner/dconf_gnome_banner_enabled/rule.yml
-index 6e2c5bd63..21de86a25 100644
+index 84a4a0348..9e9b83c22 100644
 --- a/linux_os/guide/system/accounts/accounts-banners/gui_login_banner/dconf_gnome_banner_enabled/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-banners/gui_login_banner/dconf_gnome_banner_enabled/rule.yml
-@@ -59,7 +59,7 @@ references:
+@@ -55,7 +55,7 @@ references:
      stigid@ol7: OL07-00-010030
      stigid@ol8: OL08-00-010049
      stigid@rhel7: RHEL-07-010030
 -    stigid@rhel8: RHEL-08-010049
 +    stigid@almalinux8: RHEL-08-010049
-     stigid@rhel9: RHEL-09-271010,RHEL-09-271015
      stigid@sle12: SLES-12-010040
      stigid@sle15: SLES-15-010080
+     stigid@ubuntu2004: UBTU-20-010002
 diff --git a/linux_os/guide/system/accounts/accounts-banners/gui_login_banner/dconf_gnome_login_banner_text/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-banners/gui_login_banner/dconf_gnome_login_banner_text/ansible/shared.yml
 index 86aff54f9..b295782b0 100644
 --- a/linux_os/guide/system/accounts/accounts-banners/gui_login_banner/dconf_gnome_login_banner_text/ansible/shared.yml
@@ -2593,10 +6706,10 @@ index 86aff54f9..b295782b0 100644
  # strategy = unknown
  # complexity = low
 diff --git a/linux_os/guide/system/accounts/accounts-banners/gui_login_banner/dconf_gnome_login_banner_text/rule.yml b/linux_os/guide/system/accounts/accounts-banners/gui_login_banner/dconf_gnome_login_banner_text/rule.yml
-index 6601ba6b6..9056b451b 100644
+index c4653647c..c0e9b4274 100644
 --- a/linux_os/guide/system/accounts/accounts-banners/gui_login_banner/dconf_gnome_login_banner_text/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-banners/gui_login_banner/dconf_gnome_login_banner_text/rule.yml
-@@ -63,7 +63,7 @@ references:
+@@ -59,7 +59,7 @@ references:
      stigid@ol7: OL07-00-010040
      stigid@ol8: OL08-00-010050
      stigid@rhel7: RHEL-07-010040
@@ -2650,7 +6763,7 @@ index a9def9bfb..e1627ffc6 100644
  # packages = dconf,gdm
  
 diff --git a/linux_os/guide/system/accounts/accounts-pam/disallow_bypass_password_sudo/rule.yml b/linux_os/guide/system/accounts/accounts-pam/disallow_bypass_password_sudo/rule.yml
-index 0859ad2d5..650278ab9 100644
+index 2c5fbef58..9630f761d 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/disallow_bypass_password_sudo/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/disallow_bypass_password_sudo/rule.yml
 @@ -30,7 +30,7 @@ references:
@@ -2659,9 +6772,9 @@ index 0859ad2d5..650278ab9 100644
      stigid@rhel7: RHEL-07-010344
 -    stigid@rhel8: RHEL-08-010385
 +    stigid@almalinux8: RHEL-08-010385
-     stigid@rhel9: RHEL-09-611145
      stigid@sle12: SLES-12-010114
      stigid@sle15: SLES-15-020104
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-pam/display_login_attempts/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-pam/display_login_attempts/ansible/shared.yml
 index 428fbd7fa..390b6513d 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/display_login_attempts/ansible/shared.yml
@@ -2683,18 +6796,18 @@ index badc79bff..f6c602159 100644
  {{%- if "sle" in product or "ubuntu" in product %}}
  {{%- set pam_lastlog_path = "/etc/pam.d/login" %}}
 diff --git a/linux_os/guide/system/accounts/accounts-pam/display_login_attempts/rule.yml b/linux_os/guide/system/accounts/accounts-pam/display_login_attempts/rule.yml
-index b96e9f3db..c12b57eb3 100644
+index d897045e3..2b2b5f344 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/display_login_attempts/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/display_login_attempts/rule.yml
-@@ -55,7 +55,7 @@ references:
+@@ -54,7 +54,7 @@ references:
      stigid@ol7: OL07-00-040530
      stigid@ol8: OL08-00-020340
      stigid@rhel7: RHEL-07-040530
 -    stigid@rhel8: RHEL-08-020340
 +    stigid@almalinux8: RHEL-08-020340
-     stigid@rhel9: RHEL-09-412075
      stigid@sle12: SLES-12-010390
      stigid@sle15: SLES-15-020080
+     stigid@ubuntu2004: UBTU-20-010453
 diff --git a/linux_os/guide/system/accounts/accounts-pam/display_login_attempts/tests/authselect_correct_options.pass.sh b/linux_os/guide/system/accounts/accounts-pam/display_login_attempts/tests/authselect_correct_options.pass.sh
 index 79b84c92e..a881bf04e 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/display_login_attempts/tests/authselect_correct_options.pass.sh
@@ -2752,33 +6865,81 @@ index 9c752e052..c38f0caf3 100644
      echo "session    required     pam_namespace.so" >> "/etc/pam.d/login"
  fi
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_password_auth/rule.yml b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_password_auth/rule.yml
-index d3eeadde6..2fef71784 100644
+index 49dad8c55..a9cdc812b 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_password_auth/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_password_auth/rule.yml
 @@ -20,7 +20,7 @@ references:
-     disa: CCI-000044
      nist: AC-7 (a)
      srg: SRG-OS-000021-GPOS-00005
+     stigid@ol8: OL08-00-020026
 -    stigid@rhel8: RHEL-08-020026
 +    stigid@almalinux8: RHEL-08-020026
-     stigid@rhel9: RHEL-09-611035
  
  ocil_clause: 'the pam_faillock.so module is not present in the "/etc/pam.d/password-auth" file with the "preauth" line listed before pam_unix.so'
+ 
+diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_password_auth/tests/correct_value.pass.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_password_auth/tests/correct_value.pass.sh
+index 98fab1858..1dc7417b6 100644
+--- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_password_auth/tests/correct_value.pass.sh
++++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_password_auth/tests/correct_value.pass.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = authselect,pam
+-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
++# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux 8,Red Hat Enterprise Linux 9
+ 
+ authselect create-profile test_profile -b sssd
+ authselect select "custom/test_profile" --force
+diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_password_auth/tests/no_value.fail.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_password_auth/tests/no_value.fail.sh
+index ce36c2d22..ac0d46b24 100644
+--- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_password_auth/tests/no_value.fail.sh
++++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_password_auth/tests/no_value.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = authselect,pam
+-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
++# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux 8,Red Hat Enterprise Linux 9
+ 
+ authselect create-profile test_profile -b sssd
+ authselect select "custom/test_profile" --force
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_system_auth/rule.yml b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_system_auth/rule.yml
-index 1c48f48e3..f614bf692 100644
+index acc86a1ba..fe4291cde 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_system_auth/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_system_auth/rule.yml
 @@ -20,7 +20,7 @@ references:
-     disa: CCI-000044
      nist: AC-7 (a)
      srg: SRG-OS-000021-GPOS-00005
+     stigid@ol8: OL08-00-020025
 -    stigid@rhel8: RHEL-08-020025
 +    stigid@almalinux8: RHEL-08-020025
-     stigid@rhel9: RHEL-09-611030
  
  ocil_clause: 'the pam_faillock.so module is not present in the "/etc/pam.d/system-auth" file with the "preauth" line listed before pam_unix.so'
+ 
+diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_system_auth/tests/correct_value.pass.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_system_auth/tests/correct_value.pass.sh
+index 98fab1858..1dc7417b6 100644
+--- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_system_auth/tests/correct_value.pass.sh
++++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_system_auth/tests/correct_value.pass.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = authselect,pam
+-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
++# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux 8,Red Hat Enterprise Linux 9
+ 
+ authselect create-profile test_profile -b sssd
+ authselect select "custom/test_profile" --force
+diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_system_auth/tests/no_value.fail.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_system_auth/tests/no_value.fail.sh
+index ce36c2d22..ac0d46b24 100644
+--- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_system_auth/tests/no_value.fail.sh
++++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_system_auth/tests/no_value.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = authselect,pam
+-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
++# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux 8,Red Hat Enterprise Linux 9
+ 
+ authselect create-profile test_profile -b sssd
+ authselect select "custom/test_profile" --force
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_selinux_faillock_dir/rule.yml b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_selinux_faillock_dir/rule.yml
-index 680a2f520..a58fe6f40 100644
+index c3cd0386b..1f2235b31 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_selinux_faillock_dir/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_selinux_faillock_dir/rule.yml
 @@ -22,7 +22,7 @@ references:
@@ -2787,9 +6948,9 @@ index 680a2f520..a58fe6f40 100644
      stigid@ol8: OL08-00-020027,OL08-00-020028
 -    stigid@rhel8: RHEL-08-020027,RHEL-08-020028
 +    stigid@almalinux8: RHEL-08-020027,RHEL-08-020028
-     stigid@rhel9: RHEL-09-431020
  
  platform: machine
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_passwords_pam_faillock_audit/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_passwords_pam_faillock_audit/ansible/shared.yml
 index e9ecd879f..74e4c0b09 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_passwords_pam_faillock_audit/ansible/shared.yml
@@ -2856,18 +7017,18 @@ index 365006509..2a10d041b 100644
  {{{ bash_instantiate_variables("var_password_pam_remember", "var_password_pam_remember_control_flag") }}}
  
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_password_auth/rule.yml b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_password_auth/rule.yml
-index 98c92bbd4..3d5bc318d 100644
+index 20835ee9b..813f51382 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_password_auth/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_password_auth/rule.yml
-@@ -61,7 +61,7 @@ references:
+@@ -57,7 +57,7 @@ references:
      stigid@ol7: OL07-00-010270
      stigid@ol8: OL08-00-020220
      stigid@rhel7: RHEL-07-010270
 -    stigid@rhel8: RHEL-08-020220
 +    stigid@almalinux8: RHEL-08-020220
-     stigid@rhel9: RHEL-09-611015
  
  ocil_clause: |-
+     the pam_pwhistory.so module is not used, the "remember" module option is not set in
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_password_auth/tests/authselect_conflict_settings.fail.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_password_auth/tests/authselect_conflict_settings.fail.sh
 index bef6bbcea..8263dd4a0 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_password_auth/tests/authselect_conflict_settings.fail.sh
@@ -2997,18 +7158,18 @@ index a55f86dc3..5506f8c40 100644
  {{{ bash_instantiate_variables("var_password_pam_remember", "var_password_pam_remember_control_flag") }}}
  
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_system_auth/rule.yml b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_system_auth/rule.yml
-index 22d76c770..6b202abfd 100644
+index 83841d142..a8e3bed95 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_system_auth/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_system_auth/rule.yml
-@@ -61,7 +61,7 @@ references:
+@@ -57,7 +57,7 @@ references:
      stigid@ol7: OL07-00-010270
      stigid@ol8: OL08-00-020221
      stigid@rhel7: RHEL-07-010270
 -    stigid@rhel8: RHEL-08-020221
 +    stigid@almalinux8: RHEL-08-020221
-     stigid@rhel9: RHEL-09-611020
  
  ocil_clause: |-
+     the pam_pwhistory.so module is not used, the "remember" module option is not set in
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/authselect_conflict_settings.fail.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/authselect_conflict_settings.fail.sh
 index fe238b41b..84c181749 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_password_pam_pwhistory_remember_system_auth/tests/authselect_conflict_settings.fail.sh
@@ -3278,7 +7439,7 @@ index 021a400c0..09b9d3918 100644
  {{{ bash_pam_faillock_enable() }}}
  {{{ bash_pam_faillock_parameter_value("audit", authfail=False)}}}
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_audit/rule.yml b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_audit/rule.yml
-index 1bce7f622..954fc4e8d 100644
+index f80717ab2..0d0bf92bd 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_audit/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_audit/rule.yml
 @@ -19,7 +19,7 @@ references:
@@ -3287,8 +7448,8 @@ index 1bce7f622..954fc4e8d 100644
      stigid@ol8: OL08-00-020020,OL08-00-020021
 -    stigid@rhel8: RHEL-08-020021
 +    stigid@almalinux8: RHEL-08-020021
-     stigid@rhel9: RHEL-09-412045
      stigid@ubuntu2004: UBTU-20-010072
+     stigid@ubuntu2204: UBTU-22-411045
  
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_audit/tests/conflicting_settings_authselect.fail.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_audit/tests/conflicting_settings_authselect.fail.sh
 index d805aa018..d188e828a 100644
@@ -3358,17 +7519,17 @@ index 449d912d0..22f5dc375 100644
  {{{ bash_instantiate_variables("var_accounts_passwords_pam_faillock_deny") }}}
  
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_deny/rule.yml b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_deny/rule.yml
-index f4a2acb18..3a67e37df 100644
+index 41fba8804..c87f7a976 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_deny/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_deny/rule.yml
-@@ -63,7 +63,7 @@ references:
+@@ -57,7 +57,7 @@ references:
      stigid@ol7: OL07-00-010320
      stigid@ol8: OL08-00-020010,OL08-00-020011
      stigid@rhel7: RHEL-07-010320
 -    stigid@rhel8: RHEL-08-020011
 +    stigid@almalinux8: RHEL-08-020011
-     stigid@rhel9: RHEL-09-411075
      stigid@ubuntu2004: UBTU-20-010072
+     stigid@ubuntu2204: UBTU-22-411045
  
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_deny/tests/authselect_modified_pam.fail.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_deny/tests/authselect_modified_pam.fail.sh
 index b3232cc93..ec32d65f7 100644
@@ -3496,18 +7657,18 @@ index 09d8aeee0..72b3aeacb 100644
  {{{ bash_pam_faillock_enable() }}}
  {{{ bash_pam_faillock_parameter_value("even_deny_root", "") }}}
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_deny_root/rule.yml b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_deny_root/rule.yml
-index 3c0e1430e..d1dd0ffc3 100644
+index b744f39be..1baddd6b1 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_deny_root/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_deny_root/rule.yml
-@@ -44,7 +44,7 @@ references:
+@@ -41,7 +41,7 @@ references:
      stigid@ol7: OL07-00-010330
      stigid@ol8: OL08-00-020022,OL08-00-020023
      stigid@rhel7: RHEL-07-010330
 -    stigid@rhel8: RHEL-08-020023
 +    stigid@almalinux8: RHEL-08-020023
-     stigid@rhel9: RHEL-09-411080
  
  {{% if product == "rhel8" %}}
+ platform: os_linux[rhel]>=8.2
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_deny_root/tests/authselect_modified_pam.fail.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_deny_root/tests/authselect_modified_pam.fail.sh
 index b3232cc93..ec32d65f7 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_deny_root/tests/authselect_modified_pam.fail.sh
@@ -3568,7 +7729,7 @@ index 7c702d669..06c0d31e2 100644
  
  authselect select sssd --force
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_dir/rule.yml b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_dir/rule.yml
-index e199c9f99..81903f742 100644
+index 76c632b16..71b84dedc 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_dir/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_dir/rule.yml
 @@ -33,7 +33,7 @@ references:
@@ -3577,9 +7738,9 @@ index e199c9f99..81903f742 100644
      stigid@ol8: OL08-00-020016,OL08-00-020017
 -    stigid@rhel8: RHEL-08-020016,RHEL-08-020017
 +    stigid@almalinux8: RHEL-08-020016,RHEL-08-020017
-     stigid@rhel9: RHEL-09-411105
  
  ocil_clause: 'the "dir" option is not set to a non-default documented tally log directory, is missing or commented out'
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_dir/tests/conflicting_settings_authselect.fail.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_dir/tests/conflicting_settings_authselect.fail.sh
 index 679e47bcc..4f798d486 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_dir/tests/conflicting_settings_authselect.fail.sh
@@ -3705,17 +7866,17 @@ index e7a0882f2..c07fd02e0 100644
  {{{ bash_instantiate_variables("var_accounts_passwords_pam_faillock_fail_interval") }}}
  
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_interval/rule.yml b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_interval/rule.yml
-index ecd22ef90..ed030b4f4 100644
+index f4e2cc50c..7a55130c9 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_interval/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_interval/rule.yml
-@@ -53,7 +53,7 @@ references:
+@@ -52,7 +52,7 @@ references:
      stigid@ol7: OL07-00-010320
      stigid@ol8: OL08-00-020012,OL08-00-020013
      stigid@rhel7: RHEL-07-010320
 -    stigid@rhel8: RHEL-08-020012,RHEL-08-020013
 +    stigid@almalinux8: RHEL-08-020012,RHEL-08-020013
-     stigid@rhel9: RHEL-09-411085
      stigid@ubuntu2004: UBTU-20-010072
+     stigid@ubuntu2204: UBTU-22-411045
  
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_interval/tests/authselect_modified_pam.fail.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_interval/tests/authselect_modified_pam.fail.sh
 index b3232cc93..ec32d65f7 100644
@@ -3823,7 +7984,7 @@ index c71a12afe..6dd3f50d6 100644
  
  authselect select sssd --force
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_silent/rule.yml b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_silent/rule.yml
-index 5e228a5f6..84040d04d 100644
+index 71ca92bfa..4e6b05a6f 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_silent/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_silent/rule.yml
 @@ -29,7 +29,7 @@ references:
@@ -3833,8 +7994,8 @@ index 5e228a5f6..84040d04d 100644
 -    stigid@rhel8: RHEL-08-020018,RHEL-08-020019
 +    stigid@almalinux8: RHEL-08-020018,RHEL-08-020019
      stigid@ubuntu2004: UBTU-20-010072
+     stigid@ubuntu2204: UBTU-22-411045
  
- ocil_clause: 'the system shows messages when three unsuccessful logon attempts occur'
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_silent/tests/expected_faillock_conf.pass.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_silent/tests/expected_faillock_conf.pass.sh
 index fdd0c4c06..ec8195db8 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_silent/tests/expected_faillock_conf.pass.sh
@@ -3915,17 +8076,17 @@ index 3a32aad36..d1f4a0327 100644
  {{{ bash_instantiate_variables("var_accounts_passwords_pam_faillock_unlock_time") }}}
  
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_unlock_time/rule.yml b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_unlock_time/rule.yml
-index b2ea25f78..7ff4967ac 100644
+index ea9414e6b..897352309 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_unlock_time/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_unlock_time/rule.yml
-@@ -65,7 +65,7 @@ references:
+@@ -59,7 +59,7 @@ references:
      stigid@ol7: OL07-00-010320
      stigid@ol8: OL08-00-020014,OL08-00-020015
      stigid@rhel7: RHEL-07-010320
 -    stigid@rhel8: RHEL-08-020014,RHEL-08-020015
 +    stigid@almalinux8: RHEL-08-020014,RHEL-08-020015
-     stigid@rhel9: RHEL-09-411090
      stigid@ubuntu2004: UBTU-20-010072
+     stigid@ubuntu2204: UBTU-22-411045
  
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_unlock_time/tests/authselect_modified_pam.fail.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_unlock_time/tests/authselect_modified_pam.fail.sh
 index b3232cc93..ec32d65f7 100644
@@ -4033,59 +8194,59 @@ index a57645eb1..a7e7b8e9c 100644
  
  authselect select sssd --force
 diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_dcredit/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_dcredit/rule.yml
-index 2a2f7076e..d88b55261 100644
+index 1aca3efe6..e7edb6dab 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_dcredit/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_dcredit/rule.yml
-@@ -53,7 +53,7 @@ references:
+@@ -49,7 +49,7 @@ references:
      stigid@ol7: OL07-00-010140
      stigid@ol8: OL08-00-020130
      stigid@rhel7: RHEL-07-010140
 -    stigid@rhel8: RHEL-08-020130
 +    stigid@almalinux8: RHEL-08-020130
-     stigid@rhel9: RHEL-09-611070
      stigid@ubuntu2004: UBTU-20-010052
+     stigid@ubuntu2204: UBTU-22-611020
  
 diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_dictcheck/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_dictcheck/rule.yml
-index 6f3644a50..ec6a61a97 100644
+index 1f0b9b186..133f2cc6a 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_dictcheck/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_dictcheck/rule.yml
-@@ -32,7 +32,7 @@ references:
+@@ -30,7 +30,7 @@ references:
      nist: IA-5(c),IA-5(1)(a),CM-6(a),IA-5(4)
      srg: SRG-OS-000480-GPOS-00225
      stigid@ol8: OL08-00-020300
 -    stigid@rhel8: RHEL-08-020300
 +    stigid@almalinux8: RHEL-08-020300
-     stigid@rhel9: RHEL-09-611105
      stigid@ubuntu2004: UBTU-20-010056
+     stigid@ubuntu2204: UBTU-22-611030
  
 diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_difok/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_difok/rule.yml
-index b624c85ee..235d97c97 100644
+index a615793c2..18f48ee10 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_difok/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_difok/rule.yml
-@@ -49,7 +49,7 @@ references:
+@@ -47,7 +47,7 @@ references:
      stigid@ol7: OL07-00-010160
      stigid@ol8: OL08-00-020170
      stigid@rhel7: RHEL-07-010160
 -    stigid@rhel8: RHEL-08-020170
 +    stigid@almalinux8: RHEL-08-020170
-     stigid@rhel9: RHEL-09-611115
      stigid@ubuntu2004: UBTU-20-010053
+     stigid@ubuntu2204: UBTU-22-611040
  
 diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_lcredit/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_lcredit/rule.yml
-index 97155923c..03a247a3e 100644
+index 9f4b51c3b..3008a117b 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_lcredit/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_lcredit/rule.yml
-@@ -53,7 +53,7 @@ references:
+@@ -49,7 +49,7 @@ references:
      stigid@ol7: OL07-00-010130
      stigid@ol8: OL08-00-020120
      stigid@rhel7: RHEL-07-010130
 -    stigid@rhel8: RHEL-08-020120
 +    stigid@almalinux8: RHEL-08-020120
-     stigid@rhel9: RHEL-09-611065
      stigid@ubuntu2004: UBTU-20-010051
+     stigid@ubuntu2204: UBTU-22-611015
  
 diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_maxclassrepeat/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_maxclassrepeat/rule.yml
-index 12a53da33..7b5e527a3 100644
+index 97e0e2da9..0975737f2 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_maxclassrepeat/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_maxclassrepeat/rule.yml
 @@ -39,7 +39,7 @@ references:
@@ -4094,60 +8255,60 @@ index 12a53da33..7b5e527a3 100644
      stigid@rhel7: RHEL-07-010190
 -    stigid@rhel8: RHEL-08-020140
 +    stigid@almalinux8: RHEL-08-020140
-     stigid@rhel9: RHEL-09-611120
  
  ocil_clause: the value of "maxclassrepeat" is set to "0", more than "{{{ xccdf_value("var_password_pam_maxclassrepeat") }}}" or is commented out
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_maxrepeat/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_maxrepeat/rule.yml
-index 3a9a9b66f..d4318c674 100644
+index b9967a53c..6ad00f043 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_maxrepeat/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_maxrepeat/rule.yml
-@@ -43,7 +43,7 @@ references:
+@@ -41,7 +41,7 @@ references:
      stigid@ol7: OL07-00-010180
      stigid@ol8: OL08-00-020150
      stigid@rhel7: RHEL-07-010180
 -    stigid@rhel8: RHEL-08-020150
 +    stigid@almalinux8: RHEL-08-020150
-     stigid@rhel9: RHEL-09-611125
  
  ocil_clause: the value of "maxrepeat" is set to more than "{{{ xccdf_value("var_password_pam_maxrepeat") }}}" or is commented out
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_minclass/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_minclass/rule.yml
-index 5865b5d32..0fc0ceeb9 100644
+index aff25f139..16198d917 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_minclass/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_minclass/rule.yml
-@@ -60,7 +60,7 @@ references:
+@@ -56,7 +56,7 @@ references:
      stigid@ol7: OL07-00-010170
      stigid@ol8: OL08-00-020160
      stigid@rhel7: RHEL-07-010170
 -    stigid@rhel8: RHEL-08-020160
 +    stigid@almalinux8: RHEL-08-020160
-     stigid@rhel9: RHEL-09-611130
  
  ocil_clause: the value of "minclass" is set to less than "{{{ xccdf_value("var_password_pam_minclass") }}}" or is commented out
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_minlen/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_minlen/rule.yml
-index a47d1052d..6e15f685c 100644
+index 30512ca7e..a1d4c2b45 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_minlen/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_minlen/rule.yml
-@@ -55,7 +55,7 @@ references:
+@@ -49,7 +49,7 @@ references:
      stigid@ol7: OL07-00-010280
      stigid@ol8: OL08-00-020230
      stigid@rhel7: RHEL-07-010280
 -    stigid@rhel8: RHEL-08-020230
 +    stigid@almalinux8: RHEL-08-020230
-     stigid@rhel9: RHEL-09-611090
      stigid@ubuntu2004: UBTU-20-010054
+     stigid@ubuntu2204: UBTU-22-611035
  
 diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_ocredit/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_ocredit/rule.yml
-index 4ec95bbc0..cc6092638 100644
+index 129e683c9..b08b90e17 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_ocredit/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_ocredit/rule.yml
-@@ -53,7 +53,7 @@ references:
+@@ -50,7 +50,7 @@ references:
      stigid@ol7: OL07-00-010150
      stigid@ol8: OL08-00-020280
      stigid@rhel7: RHEL-07-010150
 -    stigid@rhel8: RHEL-08-020280
 +    stigid@almalinux8: RHEL-08-020280
-     stigid@rhel9: RHEL-09-611100
      stigid@ubuntu2004: UBTU-20-010055
+     stigid@ubuntu2204: UBTU-22-611025
  
 diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/ansible/shared.yml
 index 06f7962fd..dc6eea20d 100644
@@ -4169,7 +8330,7 @@ index a55859203..377efc82e 100644
  
  {{{ bash_ensure_pam_module_configuration('/etc/pam.d/password-auth', 'password', 'requisite', 'pam_pwquality.so', '', '', '^account.*required.*pam_permit\.so') }}}
 diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/rule.yml
-index 90a06a460..1b556d644 100644
+index aa2834ad9..eaaf614b8 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/rule.yml
 @@ -24,7 +24,7 @@ references:
@@ -4178,9 +8339,9 @@ index 90a06a460..1b556d644 100644
      stigid@ol8: OL08-00-020100
 -    stigid@rhel8: RHEL-08-020100
 +    stigid@almalinux8: RHEL-08-020100
-     stigid@rhel9: RHEL-09-611040
  
  ocil_clause: 'pam_pwquality.so is not enabled in password-auth'
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/tests/authselect_commented_entry.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/tests/authselect_commented_entry.fail.sh
 index 81d2955d3..8c9b1d1f2 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/tests/authselect_commented_entry.fail.sh
@@ -4261,7 +8422,7 @@ index 4ea10f4c4..6c1de4e4c 100644
  
  {{{ bash_ensure_pam_module_configuration('/etc/pam.d/system-auth', 'password', 'requisite', 'pam_pwquality.so', '', '', '^account.*required.*pam_permit\.so') }}}
 diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/rule.yml
-index c7c408229..f3a817cd9 100644
+index c66283c18..10354f948 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/rule.yml
 @@ -24,7 +24,7 @@ references:
@@ -4270,9 +8431,9 @@ index c7c408229..f3a817cd9 100644
      stigid@ol8: OL08-00-020101
 -    stigid@rhel8: RHEL-08-020101
 +    stigid@almalinux8: RHEL-08-020101
-     stigid@rhel9: RHEL-09-611045
  
  ocil_clause: 'pam_pwquality.so is not enabled in system-auth'
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/tests/authselect_commented_entry.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/tests/authselect_commented_entry.fail.sh
 index f68622be4..c8e13631a 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_system_auth/tests/authselect_commented_entry.fail.sh
@@ -4344,17 +8505,17 @@ index 36e9a27b9..fe1b603ab 100644
  # strategy = configure
  # complexity = low
 diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/rule.yml
-index de894c403..0764b83d1 100644
+index 411a67363..08d84e584 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/rule.yml
-@@ -53,7 +53,7 @@ references:
+@@ -49,7 +49,7 @@ references:
      stigid@ol7: OL07-00-010119
      stigid@ol8: OL08-00-020102,OL08-00-020103,OL08-00-020104
      stigid@rhel7: RHEL-07-010119
 -    stigid@rhel8: RHEL-08-020104
 +    stigid@almalinux8: RHEL-08-020104
-     stigid@rhel9: RHEL-09-611010
      stigid@ubuntu2004: UBTU-20-010057
+     stigid@ubuntu2204: UBTU-22-611045
  
 diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/argument_missing.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/argument_missing.fail.sh
 index 03723cd8c..1df4f1d61 100644
@@ -4428,17 +8589,17 @@ index ea2eb57fe..033bbbceb 100644
  
  source common.sh
 diff --git a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_ucredit/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_ucredit/rule.yml
-index 2fe0e6975..d331f0ead 100644
+index eddf5c022..0cd286985 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_ucredit/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_ucredit/rule.yml
-@@ -49,7 +49,7 @@ references:
+@@ -46,7 +46,7 @@ references:
      stigid@ol7: OL07-00-010120
      stigid@ol8: OL08-00-020110
      stigid@rhel7: RHEL-07-010120
 -    stigid@rhel8: RHEL-08-020110
 +    stigid@almalinux8: RHEL-08-020110
-     stigid@rhel9: RHEL-09-611110
      stigid@ubuntu2004: UBTU-20-010050
+     stigid@ubuntu2204: UBTU-22-611010
  
 diff --git a/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_libuserconf/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_libuserconf/ansible/shared.yml
 index b3e32aa31..547d137b1 100644
@@ -4481,18 +8642,18 @@ index 2712118e5..d4ec2c50c 100644
  {{{ bash_instantiate_variables("var_password_hashing_algorithm") }}}
  {{{ bash_replace_or_append('/etc/login.defs', '^ENCRYPT_METHOD', "$var_password_hashing_algorithm", '%s %s') }}}
 diff --git a/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_logindefs/rule.yml b/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_logindefs/rule.yml
-index e1b055c2d..fbcbb14bb 100644
+index 355df7fb0..f659c2cc3 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_logindefs/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_logindefs/rule.yml
-@@ -50,7 +50,7 @@ references:
+@@ -44,7 +44,7 @@ references:
      stigid@ol7: OL07-00-010210
      stigid@ol8: OL08-00-010110
      stigid@rhel7: RHEL-07-010210
 -    stigid@rhel8: RHEL-08-010110
 +    stigid@almalinux8: RHEL-08-010110
-     stigid@rhel9: RHEL-09-611140
      stigid@sle12: SLES-12-010210
      stigid@sle15: SLES-15-010260
+     stigid@ubuntu2004: UBTU-20-010404
 diff --git a/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_passwordauth/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_passwordauth/ansible/shared.yml
 index 31c14211e..be9f04642 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_passwordauth/ansible/shared.yml
@@ -4513,18 +8674,18 @@ index 55f43ef98..2b993b52b 100644
  
  {{{ bash_ensure_pam_module_configuration('/etc/pam.d/password-auth', 'password', 'sufficient', 'pam_unix.so', 'sha512', '', '') }}}
 diff --git a/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_passwordauth/rule.yml b/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_passwordauth/rule.yml
-index cbaf2717b..ad1f92b4f 100644
+index 902998cf3..aaa8c7861 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_passwordauth/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_passwordauth/rule.yml
-@@ -61,7 +61,7 @@ references:
+@@ -56,7 +56,7 @@ references:
      stigid@ol7: OL07-00-010200
      stigid@ol8: OL08-00-010160
      stigid@rhel7: RHEL-07-010200
 -    stigid@rhel8: RHEL-08-010160
 +    stigid@almalinux8: RHEL-08-010160
-     stigid@rhel9: RHEL-09-671025
  
  ocil_clause: 'it does not'
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_passwordauth/tests/authselect_correct_value.pass.sh b/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_passwordauth/tests/authselect_correct_value.pass.sh
 index 17a57e1e1..69875871e 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_passwordauth/tests/authselect_correct_value.pass.sh
@@ -4574,10 +8735,10 @@ index f72c7bde2..096a6a6a1 100644
  authselect create-profile hardening -b sssd
  CUSTOM_PROFILE="custom/hardening"
 diff --git a/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_systemauth/rule.yml b/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_systemauth/rule.yml
-index 484a256ac..c91a3e72a 100644
+index c7842eda2..c896de97a 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_systemauth/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_systemauth/rule.yml
-@@ -72,7 +72,7 @@ references:
+@@ -68,7 +68,7 @@ references:
      stigid@ol7: OL07-00-010200
      stigid@ol8: OL08-00-010159
      stigid@rhel7: RHEL-07-010200
@@ -4585,7 +8746,7 @@ index 484a256ac..c91a3e72a 100644
 +    stigid@almalinux8: RHEL-08-010159
      stigid@sle12: SLES-12-010230
      stigid@sle15: SLES-15-020170
- 
+     stigid@ubuntu2204: UBTU-22-611055
 diff --git a/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_systemauth/tests/authselect_correct_value.pass.sh b/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_systemauth/tests/authselect_correct_value.pass.sh
 index 74ea0c265..13bf2f931 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_systemauth/tests/authselect_correct_value.pass.sh
@@ -4635,18 +8796,18 @@ index d4b163f24..521579a20 100644
  authselect create-profile hardening -b sssd
  CUSTOM_PROFILE="custom/hardening"
 diff --git a/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_min_rounds_logindefs/rule.yml b/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_min_rounds_logindefs/rule.yml
-index 2fc9a1715..8f46a5ffd 100644
+index 7dc77eef1..e379e6da7 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_min_rounds_logindefs/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_min_rounds_logindefs/rule.yml
-@@ -35,7 +35,7 @@ references:
+@@ -34,7 +34,7 @@ references:
      nist@sle12: IA-5(1)(c),IA-5(1).1(v),IA-7,IA-7.1
      srg: SRG-OS-000073-GPOS-00041,SRG-OS-000120-GPOS-00061
      stigid@ol8: OL08-00-010130
 -    stigid@rhel8: RHEL-08-010130
 +    stigid@almalinux8: RHEL-08-010130
-     stigid@rhel9: RHEL-09-611150
      stigid@sle12: SLES-12-010240
      stigid@sle15: SLES-15-020190
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-physical/disable_ctrlaltdel_burstaction/kubernetes/shared.yml b/linux_os/guide/system/accounts/accounts-physical/disable_ctrlaltdel_burstaction/kubernetes/shared.yml
 index 3045574e5..7ce6bb466 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/disable_ctrlaltdel_burstaction/kubernetes/shared.yml
@@ -4659,7 +8820,7 @@ index 3045574e5..7ce6bb466 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/accounts/accounts-physical/disable_ctrlaltdel_burstaction/rule.yml b/linux_os/guide/system/accounts/accounts-physical/disable_ctrlaltdel_burstaction/rule.yml
-index e5b165ba3..7a3f082b9 100644
+index beb9c695d..18f14aa5f 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/disable_ctrlaltdel_burstaction/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-physical/disable_ctrlaltdel_burstaction/rule.yml
 @@ -71,7 +71,7 @@ references:
@@ -4668,9 +8829,9 @@ index e5b165ba3..7a3f082b9 100644
      stigid@ol8: OL08-00-040172
 -    stigid@rhel8: RHEL-08-040172
 +    stigid@almalinux8: RHEL-08-040172
-     stigid@rhel9: RHEL-09-211045
      stigid@sle15: SLES-15-040062
      stigid@ubuntu2004: UBTU-20-010460
+     stigid@ubuntu2204: UBTU-22-211015
 diff --git a/linux_os/guide/system/accounts/accounts-physical/disable_ctrlaltdel_reboot/kubernetes/shared.yml b/linux_os/guide/system/accounts/accounts-physical/disable_ctrlaltdel_reboot/kubernetes/shared.yml
 index 517c83c6e..041e9a29c 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/disable_ctrlaltdel_reboot/kubernetes/shared.yml
@@ -4683,7 +8844,7 @@ index 517c83c6e..041e9a29c 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/system/accounts/accounts-physical/disable_ctrlaltdel_reboot/rule.yml b/linux_os/guide/system/accounts/accounts-physical/disable_ctrlaltdel_reboot/rule.yml
-index 19920708b..bff43f513 100644
+index 026b64da0..eead35546 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/disable_ctrlaltdel_reboot/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-physical/disable_ctrlaltdel_reboot/rule.yml
 @@ -76,7 +76,7 @@ references:
@@ -4692,9 +8853,9 @@ index 19920708b..bff43f513 100644
      stigid@rhel7: RHEL-07-020230
 -    stigid@rhel8: RHEL-08-040170
 +    stigid@almalinux8: RHEL-08-040170
-     stigid@rhel9: RHEL-09-211050
      stigid@sle12: SLES-12-010610
      stigid@sle15: SLES-15-040060
+     stigid@ubuntu2004: UBTU-20-010460
 diff --git a/linux_os/guide/system/accounts/accounts-physical/disable_ctrlaltdel_reboot/tests/masked.pass.sh b/linux_os/guide/system/accounts/accounts-physical/disable_ctrlaltdel_reboot/tests/masked.pass.sh
 index df962ec25..fd5529e69 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/disable_ctrlaltdel_reboot/tests/masked.pass.sh
@@ -4717,18 +8878,18 @@ index faf4c11dc..ddbab8acb 100644
  
  systemctl unmask ctrl-alt-del.target
 diff --git a/linux_os/guide/system/accounts/accounts-physical/logind_session_timeout/rule.yml b/linux_os/guide/system/accounts/accounts-physical/logind_session_timeout/rule.yml
-index adfa0871c..3af531ad1 100644
+index 35220b4d2..ac55118c2 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/logind_session_timeout/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-physical/logind_session_timeout/rule.yml
-@@ -41,7 +41,7 @@ references:
+@@ -40,7 +40,7 @@ references:
      pcidss: Req-8.1.8
      srg: SRG-OS-000163-GPOS-00072
      stigid@ol8: OL08-00-020035
 -    stigid@rhel8: RHEL-08-020035
 +    stigid@almalinux8: RHEL-08-020035
-     stigid@rhel9: RHEL-09-412080
  
  ocil_clause: "the option is not configured"
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-physical/require_emergency_target_auth/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-physical/require_emergency_target_auth/ansible/shared.yml
 index a3490a60d..b0c3f31d6 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/require_emergency_target_auth/ansible/shared.yml
@@ -4778,19 +8939,19 @@ index 90ef51b2a..cf288e66b 100644
      {{%- else -%}}
      <ind:pattern operation="pattern match">^ExecStart=\-/bin/sh[\s]+-c[\s]+\"(/usr)?/sbin/sulogin;[\s]+/usr/bin/systemctl[\s]+--fail[\s]+--no-block[\s]+default\"</ind:pattern>
 diff --git a/linux_os/guide/system/accounts/accounts-physical/require_emergency_target_auth/rule.yml b/linux_os/guide/system/accounts/accounts-physical/require_emergency_target_auth/rule.yml
-index dfeba9cd9..d7752da13 100644
+index 3366217dd..d67592b6f 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/require_emergency_target_auth/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-physical/require_emergency_target_auth/rule.yml
-@@ -44,7 +44,7 @@ references:
+@@ -43,7 +43,7 @@ references:
      srg: SRG-OS-000080-GPOS-00048
      stigid@ol7: OL07-00-010481
      stigid@ol8: OL08-00-010152
 -    stigid@rhel8: RHEL-08-010152
 +    stigid@almalinux8: RHEL-08-010152
-     stigid@rhel9: RHEL-09-611195
  
  ocil_clause: 'the output is different'
-@@ -53,7 +53,7 @@ ocil: |-
+ 
+@@ -51,7 +51,7 @@ ocil: |-
      To check if authentication is required for emergency mode, run the following command:
      <pre>$ grep sulogin /usr/lib/systemd/system/emergency.service</pre>
      The output should be similar to the following, and the line must begin with
@@ -4799,7 +8960,7 @@ index dfeba9cd9..d7752da13 100644
          ExecStart and /usr/lib/systemd/systemd-sulogin-shell.
          <pre>ExecStart=-/usr/lib/systemd/systemd-sulogin-shell emergency</pre>
      {{%- else -%}}
-@@ -81,7 +81,7 @@ fixtext: |-
+@@ -79,7 +79,7 @@ fixtext: |-
      Configure {{{ full_name }}} to require authentication for system emergency mode.
  
      Add or edit the following line in "/usr/lib/systemd/system/emergency.service":
@@ -4879,19 +9040,19 @@ index 62fd1a76a..bb8a6b6a7 100644
      {{%- else -%}}
      <ind:pattern operation="pattern match">^ExecStart=\-/bin/sh[\s]+-c[\s]+\"(/usr)?/sbin/sulogin;[\s]+/usr/bin/systemctl[\s]+--fail[\s]+--no-block[\s]+default\"</ind:pattern>
 diff --git a/linux_os/guide/system/accounts/accounts-physical/require_singleuser_auth/rule.yml b/linux_os/guide/system/accounts/accounts-physical/require_singleuser_auth/rule.yml
-index b02795a25..88e89d60e 100644
+index 121c8f619..1d441d84e 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/require_singleuser_auth/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-physical/require_singleuser_auth/rule.yml
-@@ -47,7 +47,7 @@ references:
+@@ -46,7 +46,7 @@ references:
      stigid@ol7: OL07-00-010481
      stigid@ol8: OL08-00-010151
      stigid@rhel7: RHEL-07-010481
 -    stigid@rhel8: RHEL-08-010151
 +    stigid@almalinux8: RHEL-08-010151
-     stigid@rhel9: RHEL-09-611200
  
  ocil_clause: 'the output is different'
-@@ -57,7 +57,7 @@ ocil: |-
+ 
+@@ -55,7 +55,7 @@ ocil: |-
      To check if authentication is required for single-user mode, run the following command:
      <pre>$ grep sulogin /usr/lib/systemd/system/rescue.service</pre>
      The output should be similar to the following, and the line must begin with
@@ -4900,7 +9061,7 @@ index b02795a25..88e89d60e 100644
          ExecStart and /usr/lib/systemd/systemd-sulogin-shell.
          <pre>ExecStart=-/usr/lib/systemd/systemd-sulogin-shell rescue</pre>
      {{%- elif product in ["rhel7"] -%}}
-@@ -90,7 +90,7 @@ fixtext: |-
+@@ -88,7 +88,7 @@ fixtext: |-
      Configure {{{ full_name }}} to require authentication in single user mode.
  
      Add or update the following line in "/usr/lib/systemd/system/rescue.service":
@@ -4932,7 +9093,7 @@ index 63b9b08b5..15abe6cec 100644
  service_file="/usr/lib/systemd/system/rescue.service"
  sulogin="/bin/bash"
 diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_bashrc_exec_tmux/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_bashrc_exec_tmux/ansible/shared.yml
-index 5c6dd41e1..c0ce5f53a 100644
+index 75395cf61..1dcee69f3 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_bashrc_exec_tmux/ansible/shared.yml
 +++ b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_bashrc_exec_tmux/ansible/shared.yml
 @@ -1,4 +1,4 @@
@@ -4952,10 +9113,10 @@ index f47326940..42d591752 100644
  # strategy = configure
  # complexity = low
 diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_bashrc_tmux/rule.yml b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_bashrc_tmux/rule.yml
-index 0afa3d155..39eaf19f9 100644
+index 066a8b09a..b4b449e95 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_bashrc_tmux/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_bashrc_tmux/rule.yml
-@@ -26,7 +26,7 @@ references:
+@@ -27,7 +27,7 @@ references:
      disa: CCI-000056,CCI-000058
      srg: SRG-OS-000031-GPOS-00012,SRG-OS-000028-GPOS-00009,SRG-OS-000030-GPOS-00011
      stigid@ol8: OL08-00-020041
@@ -4975,7 +9136,7 @@ index dc63eb653..dc6931307 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_after_time/rule.yml b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_after_time/rule.yml
-index 7dc00349c..8c7766803 100644
+index 64a5fe4fe..be4348fdb 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_after_time/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_after_time/rule.yml
 @@ -24,7 +24,7 @@ references:
@@ -4984,11 +9145,11 @@ index 7dc00349c..8c7766803 100644
      stigid@ol8: OL08-00-020070
 -    stigid@rhel8: RHEL-08-020070
 +    stigid@almalinux8: RHEL-08-020070
-     stigid@rhel9: RHEL-09-412025
  
  platform: package[tmux]
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_command/rule.yml b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_command/rule.yml
-index ca1def0cd..753e7f7ff 100644
+index 18cc6fac5..f97c446df 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_command/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_command/rule.yml
 @@ -29,7 +29,7 @@ references:
@@ -4997,9 +9158,9 @@ index ca1def0cd..753e7f7ff 100644
      stigid@ol8: OL08-00-020040
 -    stigid@rhel8: RHEL-08-020040
 +    stigid@almalinux8: RHEL-08-020040
-     stigid@rhel9: RHEL-09-412020
  
  platform: package[tmux]
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_command/tests/correct.pass.sh b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_command/tests/correct.pass.sh
 index ddfb97fa4..5213cdee6 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_command/tests/correct.pass.sh
@@ -5053,71 +9214,73 @@ index acd297d55..d8dc1cd00 100644
  
  echo 'set -g lock-command locker' >> '/etc/tmux.conf'
 diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/rule.yml b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/rule.yml
-index 60f91e405..7e62e1c3b 100644
+index 57c03c398..d50de527f 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/rule.yml
-@@ -25,7 +25,7 @@ references:
+@@ -26,7 +26,7 @@ references:
      disa: CCI-000056
      srg: SRG-OS-000028-GPOS-00009,SRG-OS-000030-GPOS-00011
      stigid@ol8: OL08-00-020040
 -    stigid@rhel8: RHEL-08-020040
 +    stigid@almalinux8: RHEL-08-020040
-     stigid@rhel9: RHEL-09-412020
  
  platform: package[tmux]
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/tests/alternative_value.pass.sh b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/tests/alternative_value.pass.sh
-index 9977bec01..501e4bd18 100644
+index 0b31379f0..778d63d74 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/tests/alternative_value.pass.sh
 +++ b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/tests/alternative_value.pass.sh
 @@ -1,5 +1,5 @@
  #!/bin/bash
--# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,multi_platform_fedora
-+# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_fedora
+-# platform = Oracle Linux 8,multi_platform_rhel,multi_platform_fedora
++# platform = Oracle Linux 8,multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora
  
  echo 'bind W lock-session' >> '/etc/tmux.conf'
  chmod 0644 "/etc/tmux.conf"
 diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/tests/correct.pass.sh b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/tests/correct.pass.sh
-index 6bfc77c2e..5d4b3f329 100644
+index e38203195..55a8aff57 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/tests/correct.pass.sh
 +++ b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/tests/correct.pass.sh
 @@ -1,5 +1,5 @@
  #!/bin/bash
--# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,multi_platform_fedora
-+# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_fedora
+-# platform = Oracle Linux 8,multi_platform_rhel,multi_platform_fedora
++# platform = Oracle Linux 8,multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora
+ # packages = tmux
  
  echo 'bind X lock-session' >> '/etc/tmux.conf'
- chmod 0644 "/etc/tmux.conf"
 diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/tests/file_empty.fail.sh b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/tests/file_empty.fail.sh
-index 38bf0f874..696a2bba2 100644
+index 45458b6f2..87e6ded51 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/tests/file_empty.fail.sh
 +++ b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/tests/file_empty.fail.sh
-@@ -1,4 +1,4 @@
+@@ -1,5 +1,5 @@
  #!/bin/bash
--# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,multi_platform_fedora
-+# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_fedora
+-# platform = Oracle Linux 8,multi_platform_rhel,multi_platform_fedora
++# platform = Oracle Linux 8,multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora
+ # packages = tmux
  
  echo > '/etc/tmux.conf'
 diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/tests/line_commented.fail.sh b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/tests/line_commented.fail.sh
-index d3836153e..113f74ee0 100644
+index 93ed8cbf4..bff755146 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/tests/line_commented.fail.sh
 +++ b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/tests/line_commented.fail.sh
-@@ -1,4 +1,4 @@
+@@ -1,5 +1,5 @@
  #!/bin/bash
--# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,multi_platform_fedora
-+# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_fedora
+-# platform = Oracle Linux 8,multi_platform_rhel,multi_platform_fedora
++# platform = Oracle Linux 8,multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora
+ # packages = tmux
  
  echo '# bind X lock-session' >> '/etc/tmux.conf'
 diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/tests/wrong_permissions.fail.sh b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/tests/wrong_permissions.fail.sh
-index 32f662e4e..0d4acb21a 100644
+index da006625e..8e02e36e8 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/tests/wrong_permissions.fail.sh
 +++ b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_keybinding/tests/wrong_permissions.fail.sh
 @@ -1,5 +1,5 @@
  #!/bin/bash
--# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,multi_platform_fedora
-+# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_fedora
+-# platform = Oracle Linux 8,multi_platform_rhel,multi_platform_fedora
++# platform = Oracle Linux 8,multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora
+ # packages = tmux
  
  echo 'bind X lock-session' >> '/etc/tmux.conf'
- chmod 0600 "/etc/tmux.conf"
 diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/no_tmux_in_shells/kubernetes/shared.yml b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/no_tmux_in_shells/kubernetes/shared.yml
 index 6b2d6cd5e..c20712c9f 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/no_tmux_in_shells/kubernetes/shared.yml
@@ -5130,7 +9293,7 @@ index 6b2d6cd5e..c20712c9f 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/no_tmux_in_shells/rule.yml b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/no_tmux_in_shells/rule.yml
-index 7273c0e03..c34853fd9 100644
+index 21d0295ba..a85553b8c 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/no_tmux_in_shells/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/no_tmux_in_shells/rule.yml
 @@ -25,7 +25,7 @@ references:
@@ -5139,11 +9302,11 @@ index 7273c0e03..c34853fd9 100644
      stigid@ol8: OL08-00-020042
 -    stigid@rhel8: RHEL-08-020042
 +    stigid@almalinux8: RHEL-08-020042
-     stigid@rhel9: RHEL-09-412030
  
  ocil_clause: 'tmux is listed in /etc/shells'
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/package_tmux_installed/rule.yml b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/package_tmux_installed/rule.yml
-index db6774627..2ad46e676 100644
+index de5155c3d..c6c7406be 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/package_tmux_installed/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/package_tmux_installed/rule.yml
 @@ -42,7 +42,7 @@ references:
@@ -5152,21 +9315,21 @@ index db6774627..2ad46e676 100644
      stigid@ol8: OL08-00-020039
 -    stigid@rhel8: RHEL-08-020039
 +    stigid@almalinux8: RHEL-08-020039
-     stigid@rhel9: RHEL-09-412010
  
  ocil_clause: 'the package is not installed'
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/force_opensc_card_drivers/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/force_opensc_card_drivers/ansible/shared.yml
-index f79727a03..49f74f418 100644
+index 1a9d35f69..9a5753d98 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/force_opensc_card_drivers/ansible/shared.yml
 +++ b/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/force_opensc_card_drivers/ansible/shared.yml
 @@ -1,4 +1,4 @@
--# platform = Red Hat Enterprise Linux 7,Red Hat Enterprise Linux 8,multi_platform_fedora,multi_platform_rhv,multi_platform_ol,multi_platform_sle
-+# platform = Red Hat Enterprise Linux 7,Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_fedora,multi_platform_rhv,multi_platform_ol,multi_platform_sle
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhv,multi_platform_ol,multi_platform_sle
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhv,multi_platform_ol,multi_platform_sle
  # reboot = false
  # strategy = configure
  # complexity = low
 diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/install_smartcard_packages/rule.yml b/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/install_smartcard_packages/rule.yml
-index 036d0faf9..9f5cf165f 100644
+index 751454886..1c98a091b 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/install_smartcard_packages/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/install_smartcard_packages/rule.yml
 @@ -53,7 +53,7 @@ references:
@@ -5175,11 +9338,11 @@ index 036d0faf9..9f5cf165f 100644
      stigid@rhel7: RHEL-07-041001
 -    stigid@rhel8: RHEL-08-010390
 +    stigid@almalinux8: RHEL-08-010390
-     stigid@rhel9: RHEL-09-215075
      stigid@sle12: SLES-12-030500
      stigid@sle15: SLES-15-010460
+     stigid@ubuntu2004: UBTU-20-010063
 diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/package_opensc_installed/rule.yml b/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/package_opensc_installed/rule.yml
-index 4da85dda7..76ae6bcad 100644
+index 2d9860b0d..7f8485d1f 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/package_opensc_installed/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/package_opensc_installed/rule.yml
 @@ -35,7 +35,7 @@ references:
@@ -5188,8 +9351,8 @@ index 4da85dda7..76ae6bcad 100644
      stigid@ol8: OL08-00-010410
 -    stigid@rhel8: RHEL-08-010410
 +    stigid@almalinux8: RHEL-08-010410
-     stigid@rhel9: RHEL-09-611185
      stigid@ubuntu2004: UBTU-20-010064
+     stigid@ubuntu2204: UBTU-22-612015
  
 diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/smartcard_configure_cert_checking/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-physical/screen_locking/smart_card_login/smartcard_configure_cert_checking/ansible/shared.yml
 index 18231e23a..c986f5c73 100644
@@ -5244,19 +9407,8 @@ index c0cc3c94f..6db041b04 100644
  # packages = openssl-pkcs11
  
  if [ ! -f /etc/pam_pkcs11/pam_pkcs11.conf ]; then
-diff --git a/linux_os/guide/system/accounts/accounts-physical/service_debug-shell_disabled/kubernetes/shared.yml b/linux_os/guide/system/accounts/accounts-physical/service_debug-shell_disabled/kubernetes/shared.yml
-index ff493491e..082c8e61a 100644
---- a/linux_os/guide/system/accounts/accounts-physical/service_debug-shell_disabled/kubernetes/shared.yml
-+++ b/linux_os/guide/system/accounts/accounts-physical/service_debug-shell_disabled/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhv,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhv,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
 diff --git a/linux_os/guide/system/accounts/accounts-physical/service_debug-shell_disabled/rule.yml b/linux_os/guide/system/accounts/accounts-physical/service_debug-shell_disabled/rule.yml
-index b2121a966..ae703a302 100644
+index 6fefab28a..0984898f3 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/service_debug-shell_disabled/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-physical/service_debug-shell_disabled/rule.yml
 @@ -37,7 +37,7 @@ references:
@@ -5265,9 +9417,9 @@ index b2121a966..ae703a302 100644
      stigid@ol8: OL08-00-040180
 -    stigid@rhel8: RHEL-08-040180
 +    stigid@almalinux8: RHEL-08-040180
-     stigid@rhel9: RHEL-09-211055
  
  ocil_clause: |-
+     {{{ ocil_clause_service_disabled(service="debug-shell") }}}
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/account_expiration/account_disable_post_pw_expiration/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-restrictions/account_expiration/account_disable_post_pw_expiration/ansible/shared.yml
 index 74598bc7e..680caf4ba 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/account_expiration/account_disable_post_pw_expiration/ansible/shared.yml
@@ -5289,46 +9441,46 @@ index f299285d4..52e841b61 100644
  {{{ bash_instantiate_variables("var_account_disable_post_pw_expiration") }}}
  
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/account_expiration/account_disable_post_pw_expiration/rule.yml b/linux_os/guide/system/accounts/accounts-restrictions/account_expiration/account_disable_post_pw_expiration/rule.yml
-index 36992fe58..03e043c29 100644
+index c59420812..7d10f4513 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/account_expiration/account_disable_post_pw_expiration/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/account_expiration/account_disable_post_pw_expiration/rule.yml
-@@ -56,7 +56,7 @@ references:
+@@ -52,7 +52,7 @@ references:
      stigid@ol7: OL07-00-010310
      stigid@ol8: OL08-00-020260
      stigid@rhel7: RHEL-07-010310
 -    stigid@rhel8: RHEL-08-020260
 +    stigid@almalinux8: RHEL-08-020260
-     stigid@rhel9: RHEL-09-411050
      stigid@sle12: SLES-12-010340
      stigid@sle15: SLES-15-020050
+     stigid@ubuntu2004: UBTU-20-010409
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/account_expiration/account_temp_expire_date/rule.yml b/linux_os/guide/system/accounts/accounts-restrictions/account_expiration/account_temp_expire_date/rule.yml
-index 8391e5031..ea01f09d5 100644
+index 6ff5cfc83..251fe3feb 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/account_expiration/account_temp_expire_date/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/account_expiration/account_temp_expire_date/rule.yml
 @@ -45,7 +45,7 @@ references:
      stigid@ol7: OL07-00-010271
-     stigid@ol8: OL08-00-020000
+     stigid@ol8: OL08-00-020000,OL08-00-020270
      stigid@rhel7: RHEL-07-010271
 -    stigid@rhel8: RHEL-08-020000,RHEL-08-020270
 +    stigid@almalinux8: RHEL-08-020000,RHEL-08-020270
-     stigid@rhel9: RHEL-09-411040
-     stigid@sle12: SLES-12-010360
-     stigid@sle15: SLES-15-020000
+     stigid@sle12: SLES-12-010331
+     stigid@sle15: SLES-15-020061
+     stigid@ubuntu2004: UBTU-20-010000
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/account_unique_id/rule.yml b/linux_os/guide/system/accounts/accounts-restrictions/account_unique_id/rule.yml
-index 4d205d4d1..d5bd37e52 100644
+index c1559b158..837fb837a 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/account_unique_id/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/account_unique_id/rule.yml
-@@ -30,7 +30,7 @@ references:
-     pcidss4: "8.2.1"
-     srg: SRG-OS-000104-GPOS-00051,SRG-OS-000121-GPOS-00062,SRG-OS-000042-GPOS-00020
+@@ -26,7 +26,7 @@ references:
+     pcidss: Req-8.1.1
+     srg: SRG-OS-000104-GPOS-00051,SRG-OS-000121-GPOS-00062
      stigid@ol8: OL08-00-020240
 -    stigid@rhel8: RHEL-08-020240
 +    stigid@almalinux8: RHEL-08-020240
-     stigid@rhel9: RHEL-09-411030
      stigid@sle12: SLES-12-010640
      stigid@sle15: SLES-15-010230
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/accounts_authorized_local_users/rule.yml b/linux_os/guide/system/accounts/accounts-restrictions/accounts_authorized_local_users/rule.yml
-index 6961aae77..21c51a849 100644
+index a33e5f3d4..972503881 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/accounts_authorized_local_users/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/accounts_authorized_local_users/rule.yml
 @@ -38,7 +38,7 @@ references:
@@ -5337,9 +9489,9 @@ index 6961aae77..21c51a849 100644
      stigid@rhel7: RHEL-07-020270
 -    stigid@rhel8: RHEL-08-020320
 +    stigid@almalinux8: RHEL-08-020320
-     stigid@rhel9: RHEL-09-411095
      stigid@sle12: SLES-12-010630
      stigid@sle15: SLES-15-020090
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/accounts_authorized_local_users/tests/default.pass.sh b/linux_os/guide/system/accounts/accounts-restrictions/accounts_authorized_local_users/tests/default.pass.sh
 index aa147fdce..bb8288f5b 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/accounts_authorized_local_users/tests/default.pass.sh
@@ -5362,18 +9514,18 @@ index 1e571bcbf..7901ceae0 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_maximum_age_login_defs/rule.yml b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_maximum_age_login_defs/rule.yml
-index 44c8e8b7f..d853a69a8 100644
+index a3ec2a58d..4d0ed5212 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_maximum_age_login_defs/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_maximum_age_login_defs/rule.yml
-@@ -58,7 +58,7 @@ references:
+@@ -52,7 +52,7 @@ references:
      stigid@ol7: OL07-00-010250
      stigid@ol8: OL08-00-020200
      stigid@rhel7: RHEL-07-010250
 -    stigid@rhel8: RHEL-08-020200
 +    stigid@almalinux8: RHEL-08-020200
-     stigid@rhel9: RHEL-09-411010
      stigid@sle12: SLES-12-010280
      stigid@sle15: SLES-15-020220
+     stigid@ubuntu2004: UBTU-20-010008
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_minimum_age_login_defs/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_minimum_age_login_defs/ansible/shared.yml
 index 0c81c0ee5..29f31c654 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_minimum_age_login_defs/ansible/shared.yml
@@ -5385,18 +9537,18 @@ index 0c81c0ee5..29f31c654 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_minimum_age_login_defs/rule.yml b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_minimum_age_login_defs/rule.yml
-index 82a14340f..77049983f 100644
+index c9d5bd990..8fe8bffd8 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_minimum_age_login_defs/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_minimum_age_login_defs/rule.yml
-@@ -54,7 +54,7 @@ references:
+@@ -51,7 +51,7 @@ references:
      stigid@ol7: OL07-00-010230
      stigid@ol8: OL08-00-020190
      stigid@rhel7: RHEL-07-010230
 -    stigid@rhel8: RHEL-08-020190
 +    stigid@almalinux8: RHEL-08-020190
-     stigid@rhel9: RHEL-09-611075
      stigid@sle12: SLES-12-010260
      stigid@sle15: SLES-15-020200
+     stigid@ubuntu2004: UBTU-20-010007
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/ansible/shared.yml
 index b04d7cdb8..0d5a5831e 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/ansible/shared.yml
@@ -5418,18 +9570,18 @@ index dcc5de3f1..268aafbab 100644
  {{{ bash_instantiate_variables("var_accounts_password_minlen_login_defs") }}}
  {{{ bash_replace_or_append('/etc/login.defs', '^PASS_MIN_LEN', "$var_accounts_password_minlen_login_defs", '%s %s') }}}
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/rule.yml b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/rule.yml
-index 37a247f30..d7fc1f363 100644
+index 10a4ef23c..8dc86c267 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/rule.yml
-@@ -47,7 +47,7 @@ references:
+@@ -46,7 +46,7 @@ references:
      nist-csf: PR.AC-1,PR.AC-6,PR.AC-7
      srg: SRG-OS-000078-GPOS-00046
      stigid@ol8: OL08-00-020231
 -    stigid@rhel8: RHEL-08-020231
 +    stigid@almalinux8: RHEL-08-020231
-     stigid@rhel9: RHEL-09-611095
  
  ocil_clause: 'it is not set to the required value'
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/tests/password_minlen_10.fail.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/tests/password_minlen_10.fail.sh
 index cb388dd9b..58223531f 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/tests/password_minlen_10.fail.sh
@@ -5494,7 +9646,7 @@ index 3772aee13..4dfc4668b 100644
  
  sed -i "/^PASS_MIN_LEN.*/d" /etc/login.defs
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_set_max_life_existing/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_set_max_life_existing/ansible/shared.yml
-index e387ed756..bcf05096d 100644
+index a32ce4ae4..b298b6a66 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_set_max_life_existing/ansible/shared.yml
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_set_max_life_existing/ansible/shared.yml
 @@ -1,4 +1,4 @@
@@ -5514,31 +9666,51 @@ index 8ff7cba19..14ece5d17 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_set_max_life_existing/rule.yml b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_set_max_life_existing/rule.yml
-index e12e98e94..3869754ce 100644
+index 3f23b472a..faeaaa08b 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_set_max_life_existing/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_set_max_life_existing/rule.yml
-@@ -40,7 +40,7 @@ references:
+@@ -35,7 +35,7 @@ references:
      stigid@ol7: OL07-00-010260
      stigid@ol8: OL08-00-020210
      stigid@rhel7: RHEL-07-010260
 -    stigid@rhel8: RHEL-08-020210
 +    stigid@almalinux8: RHEL-08-020210
-     stigid@rhel9: RHEL-09-411015
      stigid@sle12: SLES-12-010290
      stigid@sle15: SLES-15-020230
+ 
+diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_set_max_life_root/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_set_max_life_root/ansible/shared.yml
+index 0960e05ac..d3087c13b 100644
+--- a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_set_max_life_root/ansible/shared.yml
++++ b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_set_max_life_root/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_rhel
++# platform = multi_platform_rhel,multi_platform_almalinux
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_set_max_life_root/bash/shared.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_set_max_life_root/bash/shared.sh
+index 808365173..495477850 100644
+--- a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_set_max_life_root/bash/shared.sh
++++ b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_set_max_life_root/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_rhel
++# platform = multi_platform_rhel,multi_platform_almalinux
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_set_min_life_existing/rule.yml b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_set_min_life_existing/rule.yml
-index 32bb06866..6e9730a10 100644
+index da2beb59e..3db907d0e 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_set_min_life_existing/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_set_min_life_existing/rule.yml
-@@ -39,7 +39,7 @@ references:
+@@ -36,7 +36,7 @@ references:
      stigid@ol7: OL07-00-010240
      stigid@ol8: OL08-00-020180
      stigid@rhel7: RHEL-07-010240
 -    stigid@rhel8: RHEL-08-020180
 +    stigid@almalinux8: RHEL-08-020180
-     stigid@rhel9: RHEL-09-611080
      stigid@sle12: SLES-12-010270
      stigid@sle15: SLES-15-020210
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_warn_age_login_defs/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_warn_age_login_defs/ansible/shared.yml
 index 4994ff315..e8469b8e9 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_warn_age_login_defs/ansible/shared.yml
@@ -5550,7 +9722,7 @@ index 4994ff315..e8469b8e9 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_all_shadowed_sha512/rule.yml b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_all_shadowed_sha512/rule.yml
-index de8560f12..7c5b932c6 100644
+index 0d769323c..efcd485f4 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_all_shadowed_sha512/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_all_shadowed_sha512/rule.yml
 @@ -37,7 +37,7 @@ references:
@@ -5559,9 +9731,9 @@ index de8560f12..7c5b932c6 100644
      stigid@ol8: OL08-00-010120
 -    stigid@rhel8: RHEL-08-010120
 +    stigid@almalinux8: RHEL-08-010120
-     stigid@rhel9: RHEL-09-671015
      stigid@sle12: SLES-12-010220
      stigid@sle15: SLES-15-020180
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_password_auth/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_password_auth/ansible/shared.yml
 index 82110016d..2a73ed386 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_password_auth/ansible/shared.yml
@@ -5606,6 +9778,18 @@ index 39690d88d..f85baccad 100644
  # variables = var_password_pam_unix_rounds=65536
  
  ROUNDS=65536
+diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_password_auth/tests/authselect_default_rounds.fail.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_password_auth/tests/authselect_default_rounds.fail.sh
+index eabb4af89..ea5d0b359 100644
+--- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_password_auth/tests/authselect_default_rounds.fail.sh
++++ b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_password_auth/tests/authselect_default_rounds.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = authselect
+-# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
++# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
+ # variables = var_password_pam_unix_rounds=5000
+ 
+ authselect create-profile hardening -b sssd
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_password_auth/tests/authselect_modified_pam.fail.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_password_auth/tests/authselect_modified_pam.fail.sh
 index 9c99fc307..582d69dd0 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_password_auth/tests/authselect_modified_pam.fail.sh
@@ -5686,6 +9870,18 @@ index 67a052f98..7bcaa94f0 100644
  # variables = var_password_pam_unix_rounds=65536
  
  ROUNDS=65536
+diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_system_auth/tests/authselect_default_rounds.fail.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_system_auth/tests/authselect_default_rounds.fail.sh
+index 1bbd39228..946aaacef 100644
+--- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_system_auth/tests/authselect_default_rounds.fail.sh
++++ b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_system_auth/tests/authselect_default_rounds.fail.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # packages = authselect
+-# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
++# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
+ # variables = var_password_pam_unix_rounds=5000
+ 
+ authselect create-profile hardening -b sssd
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_system_auth/tests/authselect_modified_pam.fail.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_system_auth/tests/authselect_modified_pam.fail.sh
 index 3e62935b5..9c2631a46 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_system_auth/tests/authselect_modified_pam.fail.sh
@@ -5754,18 +9950,18 @@ index ad3133b1f..eac1b843a 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords/rule.yml b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords/rule.yml
-index 33f9a8298..c4dbe8bd3 100644
+index d229eaf54..dacbf9f5e 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords/rule.yml
-@@ -57,7 +57,7 @@ references:
+@@ -53,7 +53,7 @@ references:
      stigid@ol7: OL07-00-010290
      stigid@ol8: OL08-00-020331,OL08-00-020332
      stigid@rhel7: RHEL-07-010290
 -    stigid@rhel8: RHEL-08-020331,RHEL-08-020332
 +    stigid@almalinux8: RHEL-08-020331,RHEL-08-020332
-     stigid@rhel9: RHEL-09-611025
      stigid@sle12: SLES-12-010231
      stigid@sle15: SLES-15-020300
+     stigid@ubuntu2004: UBTU-20-010463
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords/tests/authselect_modified_pam.fail.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords/tests/authselect_modified_pam.fail.sh
 index 1dd45236b..6766ce732 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords/tests/authselect_modified_pam.fail.sh
@@ -5803,31 +9999,31 @@ index 9dc5d7677..a16c83995 100644
  SYSTEM_AUTH_FILE="/etc/pam.d/system-auth"
  
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords_etc_shadow/rule.yml b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords_etc_shadow/rule.yml
-index d1318756d..30714ddf7 100644
+index db95513ea..9533acc29 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords_etc_shadow/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords_etc_shadow/rule.yml
-@@ -43,7 +43,7 @@ references:
+@@ -38,7 +38,7 @@ references:
      stigid@ol7: OL07-00-010291
      stigid@ol8: OL08-00-010121
      stigid@rhel7: RHEL-07-010291
 -    stigid@rhel8: RHEL-08-010121
 +    stigid@almalinux8: RHEL-08-010121
-     stigid@rhel9: RHEL-09-611155
      stigid@sle12: SLES-12-010221
      stigid@sle15: SLES-15-020181
+     stigid@ubuntu2004: UBTU-20-010462
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/root_logins/accounts_no_uid_except_zero/rule.yml b/linux_os/guide/system/accounts/accounts-restrictions/root_logins/accounts_no_uid_except_zero/rule.yml
-index 6ef6e7166..26c9fc739 100644
+index dcc311d46..e3991fc06 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/root_logins/accounts_no_uid_except_zero/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/root_logins/accounts_no_uid_except_zero/rule.yml
-@@ -55,7 +55,7 @@ references:
+@@ -51,7 +51,7 @@ references:
      stigid@ol7: OL07-00-020310
      stigid@ol8: OL08-00-040200
      stigid@rhel7: RHEL-07-020310
 -    stigid@rhel8: RHEL-08-040200
 +    stigid@almalinux8: RHEL-08-040200
-     stigid@rhel9: RHEL-09-411100
      stigid@sle12: SLES-12-010650
      stigid@sle15: SLES-15-020100
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/root_logins/ensure_pam_wheel_group_empty/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-restrictions/root_logins/ensure_pam_wheel_group_empty/ansible/shared.yml
 index 888cc054f..2b7d571ad 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/root_logins/ensure_pam_wheel_group_empty/ansible/shared.yml
@@ -5870,7 +10066,7 @@ index 5f9c92aac..119219eb0 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/root_logins/securetty_root_login_console_only/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-restrictions/root_logins/securetty_root_login_console_only/ansible/shared.yml
-index 945940087..c71e3c698 100644
+index 10a747ef2..5a819abfc 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/root_logins/securetty_root_login_console_only/ansible/shared.yml
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/root_logins/securetty_root_login_console_only/ansible/shared.yml
 @@ -1,4 +1,4 @@
@@ -5920,7 +10116,7 @@ index d16374ffd..1ae066fd9 100644
  
  PAM_CONF=/etc/pam.d/su
 diff --git a/linux_os/guide/system/accounts/accounts-session/accounts_have_homedir_login_defs/rule.yml b/linux_os/guide/system/accounts/accounts-session/accounts_have_homedir_login_defs/rule.yml
-index 05db805a9..e26fc1ed1 100644
+index e2f036e15..a8e313dd6 100644
 --- a/linux_os/guide/system/accounts/accounts-session/accounts_have_homedir_login_defs/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-session/accounts_have_homedir_login_defs/rule.yml
 @@ -30,7 +30,7 @@ references:
@@ -5929,9 +10125,9 @@ index 05db805a9..e26fc1ed1 100644
      stigid@rhel7: RHEL-07-020610
 -    stigid@rhel8: RHEL-08-010760
 +    stigid@almalinux8: RHEL-08-010760
-     stigid@rhel9: RHEL-09-411020
      stigid@sle12: SLES-12-010720
      stigid@sle15: SLES-15-020110
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-session/accounts_logon_fail_delay/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-session/accounts_logon_fail_delay/ansible/shared.yml
 index 53b68079e..2a6b66121 100644
 --- a/linux_os/guide/system/accounts/accounts-session/accounts_logon_fail_delay/ansible/shared.yml
@@ -5953,7 +10149,7 @@ index 23e6f0dd5..6055798dd 100644
  {{{ bash_instantiate_variables("var_accounts_fail_delay") }}}
  
 diff --git a/linux_os/guide/system/accounts/accounts-session/accounts_logon_fail_delay/rule.yml b/linux_os/guide/system/accounts/accounts-session/accounts_logon_fail_delay/rule.yml
-index ff6e6b0e0..6b0015b41 100644
+index d224b894f..9b7fe8783 100644
 --- a/linux_os/guide/system/accounts/accounts-session/accounts_logon_fail_delay/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-session/accounts_logon_fail_delay/rule.yml
 @@ -32,7 +32,7 @@ references:
@@ -5962,9 +10158,9 @@ index ff6e6b0e0..6b0015b41 100644
      stigid@rhel7: RHEL-07-010430
 -    stigid@rhel8: RHEL-08-020310
 +    stigid@almalinux8: RHEL-08-020310
-     stigid@rhel9: RHEL-09-412050
      stigid@sle12: SLES-12-010140
  
+ ocil_clause: 'the value of "FAIL_DELAY" is not set to "{{{ xccdf_value("var_accounts_fail_delay") }}}" or greater, or the line is commented out'
 diff --git a/linux_os/guide/system/accounts/accounts-session/accounts_max_concurrent_login_sessions/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-session/accounts_max_concurrent_login_sessions/ansible/shared.yml
 index 536ac2956..d1bff5ffa 100644
 --- a/linux_os/guide/system/accounts/accounts-session/accounts_max_concurrent_login_sessions/ansible/shared.yml
@@ -5986,7 +10182,7 @@ index 0005b2ccb..0329d6cdf 100644
  {{{ bash_instantiate_variables("var_accounts_max_concurrent_login_sessions") }}}
  
 diff --git a/linux_os/guide/system/accounts/accounts-session/accounts_max_concurrent_login_sessions/rule.yml b/linux_os/guide/system/accounts/accounts-session/accounts_max_concurrent_login_sessions/rule.yml
-index 3242bb77e..f1bc3df6f 100644
+index 81984dbae..3064f3428 100644
 --- a/linux_os/guide/system/accounts/accounts-session/accounts_max_concurrent_login_sessions/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-session/accounts_max_concurrent_login_sessions/rule.yml
 @@ -39,7 +39,7 @@ references:
@@ -5995,44 +10191,44 @@ index 3242bb77e..f1bc3df6f 100644
      stigid@rhel7: RHEL-07-040000
 -    stigid@rhel8: RHEL-08-020024
 +    stigid@almalinux8: RHEL-08-020024
-     stigid@rhel9: RHEL-09-412040
      stigid@sle12: SLES-12-010120
      stigid@sle15: SLES-15-020020
+     stigid@ubuntu2004: UBTU-20-010400
 diff --git a/linux_os/guide/system/accounts/accounts-session/accounts_polyinstantiated_tmp/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-session/accounts_polyinstantiated_tmp/ansible/shared.yml
-index 8f060f47d..099a8f029 100644
+index 3f080376a..6295c853e 100644
 --- a/linux_os/guide/system/accounts/accounts-session/accounts_polyinstantiated_tmp/ansible/shared.yml
 +++ b/linux_os/guide/system/accounts/accounts-session/accounts_polyinstantiated_tmp/ansible/shared.yml
 @@ -1,4 +1,4 @@
--# platform = multi_platform_fedora,Red Hat Enterprise Linux 7,Red Hat Enterprise Linux 8,multi_platform_sle
-+# platform = multi_platform_fedora,Red Hat Enterprise Linux 7,Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_sle
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_sle
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
  # reboot = false
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/system/accounts/accounts-session/accounts_polyinstantiated_var_tmp/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-session/accounts_polyinstantiated_var_tmp/ansible/shared.yml
-index bb4f52f3a..af6adefb0 100644
+index 9ca521640..5c961399e 100644
 --- a/linux_os/guide/system/accounts/accounts-session/accounts_polyinstantiated_var_tmp/ansible/shared.yml
 +++ b/linux_os/guide/system/accounts/accounts-session/accounts_polyinstantiated_var_tmp/ansible/shared.yml
 @@ -1,4 +1,4 @@
--# platform = multi_platform_fedora,Red Hat Enterprise Linux 7,Red Hat Enterprise Linux 8,multi_platform_sle
-+# platform = multi_platform_fedora,Red Hat Enterprise Linux 7,Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_sle
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_sle
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
  # reboot = false
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/system/accounts/accounts-session/accounts_user_dot_no_world_writable_programs/rule.yml b/linux_os/guide/system/accounts/accounts-session/accounts_user_dot_no_world_writable_programs/rule.yml
-index bfc919f82..89b509d0c 100644
+index 5bbf11aad..152521d55 100644
 --- a/linux_os/guide/system/accounts/accounts-session/accounts_user_dot_no_world_writable_programs/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-session/accounts_user_dot_no_world_writable_programs/rule.yml
-@@ -36,7 +36,7 @@ references:
+@@ -33,7 +33,7 @@ references:
      stigid@ol7: OL07-00-020730
      stigid@ol8: OL08-00-010660
      stigid@rhel7: RHEL-07-020730
 -    stigid@rhel8: RHEL-08-010660
 +    stigid@almalinux8: RHEL-08-010660
-     stigid@rhel9: RHEL-09-411115
      stigid@sle12: SLES-12-010780
      stigid@sle15: SLES-15-040130
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-session/accounts_user_home_paths_only/rule.yml b/linux_os/guide/system/accounts/accounts-session/accounts_user_home_paths_only/rule.yml
-index 3cad08ecd..055d4d27d 100644
+index 6afe058cf..4b4053544 100644
 --- a/linux_os/guide/system/accounts/accounts-session/accounts_user_home_paths_only/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-session/accounts_user_home_paths_only/rule.yml
 @@ -34,7 +34,7 @@ references:
@@ -6041,11 +10237,11 @@ index 3cad08ecd..055d4d27d 100644
      stigid@rhel7: RHEL-07-020720
 -    stigid@rhel8: RHEL-08-010690
 +    stigid@almalinux8: RHEL-08-010690
-     stigid@rhel9: RHEL-09-411055
      stigid@sle12: SLES-12-010770
      stigid@sle15: SLES-15-040120
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-session/accounts_user_interactive_home_directory_defined/rule.yml b/linux_os/guide/system/accounts/accounts-session/accounts_user_interactive_home_directory_defined/rule.yml
-index 6c4ebf5a6..014269578 100644
+index a76ca547a..b8dcea183 100644
 --- a/linux_os/guide/system/accounts/accounts-session/accounts_user_interactive_home_directory_defined/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-session/accounts_user_interactive_home_directory_defined/rule.yml
 @@ -30,7 +30,7 @@ references:
@@ -6054,27 +10250,27 @@ index 6c4ebf5a6..014269578 100644
      stigid@rhel7: RHEL-07-020600
 -    stigid@rhel8: RHEL-08-010720
 +    stigid@almalinux8: RHEL-08-010720
-     stigid@rhel9: RHEL-09-411060
      stigid@sle12: SLES-12-010710
      stigid@sle15: SLES-15-040070
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-session/accounts_user_interactive_home_directory_exists/rule.yml b/linux_os/guide/system/accounts/accounts-session/accounts_user_interactive_home_directory_exists/rule.yml
-index 44af82586..65cde347e 100644
+index 997f43257..bda351b7c 100644
 --- a/linux_os/guide/system/accounts/accounts-session/accounts_user_interactive_home_directory_exists/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-session/accounts_user_interactive_home_directory_exists/rule.yml
-@@ -38,7 +38,7 @@ references:
+@@ -35,7 +35,7 @@ references:
      stigid@ol7: OL07-00-020620
      stigid@ol8: OL08-00-010750
      stigid@rhel7: RHEL-07-020620
 -    stigid@rhel8: RHEL-08-010750
 +    stigid@almalinux8: RHEL-08-010750
-     stigid@rhel9: RHEL-09-411065
      stigid@sle12: SLES-12-010730
      stigid@sle15: SLES-15-040080
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-session/accounts_users_home_files_groupownership/rule.yml b/linux_os/guide/system/accounts/accounts-session/accounts_users_home_files_groupownership/rule.yml
-index db0266c42..a23e040dc 100644
+index 1d25373f6..4060a90d8 100644
 --- a/linux_os/guide/system/accounts/accounts-session/accounts_users_home_files_groupownership/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-session/accounts_users_home_files_groupownership/rule.yml
-@@ -32,7 +32,7 @@ references:
+@@ -33,7 +33,7 @@ references:
      stigid@ol7: OL07-00-020670
      stigid@ol8: OL08-00-010741
      stigid@rhel7: RHEL-07-020670
@@ -6084,10 +10280,10 @@ index db0266c42..a23e040dc 100644
  ocil_clause: 'the group ownership is incorrect'
  
 diff --git a/linux_os/guide/system/accounts/accounts-session/accounts_users_home_files_permissions/rule.yml b/linux_os/guide/system/accounts/accounts-session/accounts_users_home_files_permissions/rule.yml
-index 00eaf4d82..f4da31128 100644
+index 7558ca365..ab71a8e35 100644
 --- a/linux_os/guide/system/accounts/accounts-session/accounts_users_home_files_permissions/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-session/accounts_users_home_files_permissions/rule.yml
-@@ -29,7 +29,7 @@ references:
+@@ -30,7 +30,7 @@ references:
      stigid@ol7: OL07-00-020680
      stigid@ol8: OL08-00-010731
      stigid@rhel7: RHEL-07-020680
@@ -6097,44 +10293,44 @@ index 00eaf4d82..f4da31128 100644
  ocil_clause: 'home directory files or folders have incorrect permissions'
  
 diff --git a/linux_os/guide/system/accounts/accounts-session/file_groupownership_home_directories/rule.yml b/linux_os/guide/system/accounts/accounts-session/file_groupownership_home_directories/rule.yml
-index f5207507d..b679c7346 100644
+index 1d0733c97..c13e97483 100644
 --- a/linux_os/guide/system/accounts/accounts-session/file_groupownership_home_directories/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-session/file_groupownership_home_directories/rule.yml
-@@ -41,7 +41,7 @@ references:
+@@ -39,7 +39,7 @@ references:
      stigid@ol7: OL07-00-020650
      stigid@ol8: OL08-00-010740
      stigid@rhel7: RHEL-07-020650
 -    stigid@rhel8: RHEL-08-010740
 +    stigid@almalinux8: RHEL-08-010740
-     stigid@rhel9: RHEL-09-411070
      stigid@sle12: SLES-12-010750
      stigid@sle15: SLES-15-040100
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-session/file_permission_user_init_files/rule.yml b/linux_os/guide/system/accounts/accounts-session/file_permission_user_init_files/rule.yml
-index af9de41bb..de12600de 100644
+index 74f5f0223..b63a4f71c 100644
 --- a/linux_os/guide/system/accounts/accounts-session/file_permission_user_init_files/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-session/file_permission_user_init_files/rule.yml
-@@ -30,7 +30,7 @@ references:
+@@ -28,7 +28,7 @@ references:
      stigid@ol7: OL07-00-020710
      stigid@ol8: OL08-00-010770
      stigid@rhel7: RHEL-07-020710
 -    stigid@rhel8: RHEL-08-010770
 +    stigid@almalinux8: RHEL-08-010770
-     stigid@rhel9: RHEL-09-232045
      stigid@sle12: SLES-12-010760
      stigid@sle15: SLES-15-040110
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-session/file_permissions_home_directories/rule.yml b/linux_os/guide/system/accounts/accounts-session/file_permissions_home_directories/rule.yml
-index 5533ddb54..7467d0fcb 100644
+index 2719dae29..ae5afc291 100644
 --- a/linux_os/guide/system/accounts/accounts-session/file_permissions_home_directories/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-session/file_permissions_home_directories/rule.yml
-@@ -35,7 +35,7 @@ references:
+@@ -32,7 +32,7 @@ references:
      stigid@ol7: OL07-00-020630
      stigid@ol8: OL08-00-010730
      stigid@rhel7: RHEL-07-020630
 -    stigid@rhel8: RHEL-08-010730
 +    stigid@almalinux8: RHEL-08-010730
-     stigid@rhel9: RHEL-09-232050
      stigid@sle12: SLES-12-010740
      stigid@sle15: SLES-15-040090
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-session/root_paths/accounts_root_path_dirs_no_write/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-session/root_paths/accounts_root_path_dirs_no_write/ansible/shared.yml
 index 5bfb963a1..77807dbfb 100644
 --- a/linux_os/guide/system/accounts/accounts-session/root_paths/accounts_root_path_dirs_no_write/ansible/shared.yml
@@ -6146,18 +10342,18 @@ index 5bfb963a1..77807dbfb 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_bashrc/rule.yml b/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_bashrc/rule.yml
-index c1809dbd2..9d33dee0c 100644
+index 37b322c3c..b93061b03 100644
 --- a/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_bashrc/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_bashrc/rule.yml
-@@ -50,7 +50,7 @@ references:
+@@ -45,7 +45,7 @@ references:
      nist-csf: PR.IP-2
      srg: SRG-OS-000480-GPOS-00228,SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-020353
 -    stigid@rhel8: RHEL-08-020353
 +    stigid@almalinux8: RHEL-08-020353
-     stigid@rhel9: RHEL-09-412055
  
  platform: package[bash]
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_bashrc/tests/stig_correct.pass.sh b/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_bashrc/tests/stig_correct.pass.sh
 index 5dac9eec3..e28301101 100644
 --- a/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_bashrc/tests/stig_correct.pass.sh
@@ -6181,7 +10377,7 @@ index 0f681a6db..846b47fee 100644
  {{{ bash_instantiate_variables("var_accounts_user_umask") }}}
  
 diff --git a/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_csh_cshrc/rule.yml b/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_csh_cshrc/rule.yml
-index 66dd2ac52..e78b416c6 100644
+index 23273c855..b5d483ee7 100644
 --- a/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_csh_cshrc/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_csh_cshrc/rule.yml
 @@ -33,7 +33,7 @@ references:
@@ -6190,9 +10386,9 @@ index 66dd2ac52..e78b416c6 100644
      stigid@ol8: OL08-00-020353
 -    stigid@rhel8: RHEL-08-020353
 +    stigid@almalinux8: RHEL-08-020353
-     stigid@rhel9: RHEL-09-412060
  
  ocil_clause: 'the value for the "umask" parameter is not "{{{ xccdf_value("var_accounts_user_umask") }}}", or the "umask" parameter is missing or is commented out'
+ 
 diff --git a/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_csh_cshrc/tests/stig_correct.pass.sh b/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_csh_cshrc/tests/stig_correct.pass.sh
 index 04f6247a8..bd02cb830 100644
 --- a/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_csh_cshrc/tests/stig_correct.pass.sh
@@ -6206,44 +10402,64 @@ index 04f6247a8..bd02cb830 100644
  sed -i '/umask/d' /etc/csh.cshrc
  echo "umask 077" >> /etc/csh.cshrc
 diff --git a/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_login_defs/rule.yml b/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_login_defs/rule.yml
-index 5beaa22dc..e9bd5faac 100644
+index 09d630e53..1873f9ee4 100644
 --- a/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_login_defs/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_login_defs/rule.yml
-@@ -44,7 +44,7 @@ references:
+@@ -39,7 +39,7 @@ references:
      stigid@ol7: OL07-00-020240
      stigid@ol8: OL08-00-020351
      stigid@rhel7: RHEL-07-020240
 -    stigid@rhel8: RHEL-08-020351
 +    stigid@almalinux8: RHEL-08-020351
-     stigid@rhel9: RHEL-09-412065
      stigid@sle12: SLES-12-010620
      stigid@sle15: SLES-15-040420
+     stigid@ubuntu2004: UBTU-20-010016
 diff --git a/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_profile/rule.yml b/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_profile/rule.yml
-index 5584be566..02beb8e8d 100644
+index ef85c30c9..8d244d139 100644
 --- a/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_profile/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_profile/rule.yml
-@@ -46,7 +46,7 @@ references:
+@@ -41,7 +41,7 @@ references:
      nist-csf: PR.IP-2
      srg: SRG-OS-000480-GPOS-00228,SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-020353
 -    stigid@rhel8: RHEL-08-020353
 +    stigid@almalinux8: RHEL-08-020353
-     stigid@rhel9: RHEL-09-412070
  
  ocil_clause: |-
+     the value for the "umask" parameter is not "{{{ xccdf_value("var_accounts_user_umask") }}}",
+diff --git a/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_interactive_users/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_interactive_users/ansible/shared.yml
+index fb91eab05..02b78a6ab 100644
+--- a/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_interactive_users/ansible/shared.yml
++++ b/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_interactive_users/ansible/shared.yml
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_rhel,multi_platform_ol,multi_platform_sle,multi_platform_rhv4
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_ol,multi_platform_sle,multi_platform_rhv4
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
+diff --git a/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_interactive_users/bash/shared.sh b/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_interactive_users/bash/shared.sh
+index ec59ac915..3e5470b1e 100644
+--- a/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_interactive_users/bash/shared.sh
++++ b/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_interactive_users/bash/shared.sh
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_rhel,multi_platform_ol,multi_platform_sle,multi_platform_rhv4
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_ol,multi_platform_sle,multi_platform_rhv4
+ # reboot = false
+ # strategy = restrict
+ # complexity = low
 diff --git a/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_interactive_users/rule.yml b/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_interactive_users/rule.yml
-index a9d6266e4..4d1638c07 100644
+index da7594ebc..5da83cf8d 100644
 --- a/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_interactive_users/rule.yml
 +++ b/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_interactive_users/rule.yml
-@@ -30,7 +30,7 @@ references:
+@@ -28,7 +28,7 @@ references:
      stigid@ol7: OL07-00-021040
      stigid@ol8: OL08-00-020352
      stigid@rhel7: RHEL-07-021040
 -    stigid@rhel8: RHEL-08-020352
 +    stigid@almalinux8: RHEL-08-020352
-     stigid@rhel9: RHEL-09-411025
  
  ocil_clause: 'any local interactive user initialization files are found to have a umask statement that sets a value less restrictive than "077"'
+ 
 diff --git a/linux_os/guide/system/accounts/authconfig_config_files_symlinks/tests/correct_set-up.pass.sh b/linux_os/guide/system/accounts/authconfig_config_files_symlinks/tests/correct_set-up.pass.sh
 index ec75bf6d2..eb2aa2ea1 100644
 --- a/linux_os/guide/system/accounts/authconfig_config_files_symlinks/tests/correct_set-up.pass.sh
@@ -6317,4033 +10533,6 @@ index 3bd07c62e..e328ca74c 100644
  # packages = authselect,pam
  
  rm -f /etc/pam.d/{fingerprint-auth,password-auth,postlogin,smartcard-auth,system-auth}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_chmod/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_chmod/rule.yml
-index ec789a5c1..4e395cb3d 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_chmod/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_chmod/rule.yml
-@@ -66,7 +66,7 @@ references:
-     stigid@ol7: OL07-00-030410
-     stigid@ol8: OL08-00-030490
-     stigid@rhel7: RHEL-07-030410
--    stigid@rhel8: RHEL-08-030490
-+    stigid@almalinux8: RHEL-08-030490
-     stigid@rhel9: RHEL-09-654015
-     stigid@sle12: SLES-12-020460
-     stigid@sle15: SLES-15-030290
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_chown/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_chown/rule.yml
-index 95752040a..6e038b392 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_chown/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_chown/rule.yml
-@@ -66,7 +66,7 @@ references:
-     stigid@ol7: OL07-00-030370
-     stigid@ol8: OL08-00-030480
-     stigid@rhel7: RHEL-07-030370
--    stigid@rhel8: RHEL-08-030480
-+    stigid@almalinux8: RHEL-08-030480
-     stigid@rhel9: RHEL-09-654020
-     stigid@sle12: SLES-12-020420
-     stigid@sle15: SLES-15-030250
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmod/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmod/rule.yml
-index 224bfa25e..6ed40cfb7 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmod/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmod/rule.yml
-@@ -63,7 +63,7 @@ references:
-     stigid@ol7: OL07-00-030410
-     stigid@ol8: OL08-00-030490
-     stigid@rhel7: RHEL-07-030410
--    stigid@rhel8: RHEL-08-030490
-+    stigid@almalinux8: RHEL-08-030490
-     stigid@rhel9: RHEL-09-654015
-     stigid@sle12: SLES-12-020460
-     stigid@sle15: SLES-15-030290
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmodat/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmodat/rule.yml
-index 5bef7b854..25a8d6a97 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmodat/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmodat/rule.yml
-@@ -63,7 +63,7 @@ references:
-     stigid@ol7: OL07-00-030410
-     stigid@ol8: OL08-00-030490
-     stigid@rhel7: RHEL-07-030410
--    stigid@rhel8: RHEL-08-030490
-+    stigid@almalinux8: RHEL-08-030490
-     stigid@rhel9: RHEL-09-654015
-     stigid@sle12: SLES-12-020460
-     stigid@sle15: SLES-15-030290
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchown/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchown/rule.yml
-index 78a1cb522..29701e294 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchown/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchown/rule.yml
-@@ -66,7 +66,7 @@ references:
-     stigid@ol7: OL07-00-030370
-     stigid@ol8: OL08-00-030480
-     stigid@rhel7: RHEL-07-030370
--    stigid@rhel8: RHEL-08-030480
-+    stigid@almalinux8: RHEL-08-030480
-     stigid@rhel9: RHEL-09-654020
-     stigid@sle12: SLES-12-020420
-     stigid@sle15: SLES-15-030250
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchownat/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchownat/rule.yml
-index b007a8a8d..85ff8153e 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchownat/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchownat/rule.yml
-@@ -63,7 +63,7 @@ references:
-     stigid@ol7: OL07-00-030370
-     stigid@ol8: OL08-00-030480
-     stigid@rhel7: RHEL-07-030370
--    stigid@rhel8: RHEL-08-030480
-+    stigid@almalinux8: RHEL-08-030480
-     stigid@rhel9: RHEL-09-654020
-     stigid@sle12: SLES-12-020420
-     stigid@sle15: SLES-15-030250
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fremovexattr/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fremovexattr/rule.yml
-index a27c40600..430845ac6 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fremovexattr/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fremovexattr/rule.yml
-@@ -11,13 +11,13 @@ description: |-
-     startup (the default), add the following line to a file with suffix
-     <tt>.rules</tt> in the directory <tt>/etc/audit/rules.d</tt>:
-     <pre>-a always,exit -F arch=b32 -S fremovexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b32 -S fremovexattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
-     <br /><br />
-     If the system is 64 bit then also add the following line:
-     <pre>-a always,exit -F arch=b64 -S fremovexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b64 -S fremovexattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
-     <br /><br />
-@@ -25,13 +25,13 @@ description: |-
-     utility to read audit rules during daemon startup, add the following line to
-     <tt>/etc/audit/audit.rules</tt> file:
-     <pre>-a always,exit -F arch=b32 -S fremovexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b32 -S fremovexattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
-     <br /><br />
-     If the system is 64 bit then also add the following line:
-     <pre>-a always,exit -F arch=b64 -S fremovexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b64 -S fremovexattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
- 
-@@ -80,7 +80,7 @@ references:
-     stigid@ol7: OL07-00-030440
-     stigid@ol8: OL08-00-030200
-     stigid@rhel7: RHEL-07-030440
--    stigid@rhel8: RHEL-08-030200
-+    stigid@almalinux8: RHEL-08-030200
-     stigid@rhel9: RHEL-09-654025
-     stigid@sle12: SLES-12-020370
-     stigid@sle15: SLES-15-030190
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fsetxattr/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fsetxattr/rule.yml
-index 01286a2ab..a1a7708fc 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fsetxattr/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fsetxattr/rule.yml
-@@ -9,24 +9,24 @@ description: |-
-     startup (the default), add the following line to a file with suffix
-     <tt>.rules</tt> in the directory <tt>/etc/audit/rules.d</tt>:
-     <pre>-a always,exit -F arch=b32 -S fsetxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b32 -S fsetxattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
-     If the system is 64 bit then also add the following line:
-     <pre>-a always,exit -F arch=b64 -S fsetxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b64 -S fsetxattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
-     If the <tt>auditd</tt> daemon is configured to use the <tt>auditctl</tt>
-     utility to read audit rules during daemon startup, add the following line to
-     <tt>/etc/audit/audit.rules</tt> file:
-     <pre>-a always,exit -F arch=b32 -S fsetxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b32 -S fsetxattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
-     If the system is 64 bit then also add the following line:
-     <pre>-a always,exit -F arch=b64 -S fsetxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b64 -S fsetxattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
- 
-@@ -75,7 +75,7 @@ references:
-     stigid@ol7: OL07-00-030440
-     stigid@ol8: OL08-00-030200
-     stigid@rhel7: RHEL-07-030440
--    stigid@rhel8: RHEL-08-030200
-+    stigid@almalinux8: RHEL-08-030200
-     stigid@rhel9: RHEL-09-654025
-     stigid@sle12: SLES-12-020370
-     stigid@sle15: SLES-15-030190
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lchown/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lchown/rule.yml
-index 5d1020b16..28f6e6d6a 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lchown/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lchown/rule.yml
-@@ -66,7 +66,7 @@ references:
-     stigid@ol7: OL07-00-030370
-     stigid@ol8: OL08-00-030480
-     stigid@rhel7: RHEL-07-030370
--    stigid@rhel8: RHEL-08-030480
-+    stigid@almalinux8: RHEL-08-030480
-     stigid@rhel9: RHEL-09-654020
-     stigid@sle12: SLES-12-020420
-     stigid@sle15: SLES-15-030250
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lremovexattr/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lremovexattr/rule.yml
-index d5b4fe1e9..548e45250 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lremovexattr/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lremovexattr/rule.yml
-@@ -11,13 +11,13 @@ description: |-
-     startup (the default), add the following line to a file with suffix
-     <tt>.rules</tt> in the directory <tt>/etc/audit/rules.d</tt>:
-     <pre>-a always,exit -F arch=b32 -S lremovexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b32 -S lremovexattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
-     <br /><br />
-     If the system is 64 bit then also add the following line:
-     <pre>-a always,exit -F arch=b64 -S lremovexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b64 -S lremovexattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
-     <br /><br />
-@@ -25,13 +25,13 @@ description: |-
-     utility to read audit rules during daemon startup, add the following line to
-     <tt>/etc/audit/audit.rules</tt> file:
-     <pre>-a always,exit -F arch=b32 -S lremovexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b32 -S lremovexattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
-     <br /><br />
-     If the system is 64 bit then also add the following line:
-     <pre>-a always,exit -F arch=b64 -S lremovexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b64 -S lremovexattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
- 
-@@ -80,7 +80,7 @@ references:
-     stigid@ol7: OL07-00-030440
-     stigid@ol8: OL08-00-030200
-     stigid@rhel7: RHEL-07-030440
--    stigid@rhel8: RHEL-08-030200
-+    stigid@almalinux8: RHEL-08-030200
-     stigid@rhel9: RHEL-09-654025
-     stigid@sle12: SLES-12-020370
-     stigid@sle15: SLES-15-030190
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lsetxattr/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lsetxattr/rule.yml
-index 9f75c0f81..ab4490051 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lsetxattr/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lsetxattr/rule.yml
-@@ -9,24 +9,24 @@ description: |-
-     startup (the default), add the following line to a file with suffix
-     <tt>.rules</tt> in the directory <tt>/etc/audit/rules.d</tt>:
-     <pre>-a always,exit -F arch=b32 -S lsetxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b32 -S lsetxattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
-     If the system is 64 bit then also add the following line:
-     <pre>-a always,exit -F arch=b64 -S lsetxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b64 -S lsetxattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
-     If the <tt>auditd</tt> daemon is configured to use the <tt>auditctl</tt>
-     utility to read audit rules during daemon startup, add the following line to
-     <tt>/etc/audit/audit.rules</tt> file:
-     <pre>-a always,exit -F arch=b32 -S lsetxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b32 -S lsetxattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
-     If the system is 64 bit then also add the following line:
-     <pre>-a always,exit -F arch=b64 -S lsetxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b64 -S lsetxattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
- 
-@@ -75,7 +75,7 @@ references:
-     stigid@ol7: OL07-00-030440
-     stigid@ol8: OL08-00-030200
-     stigid@rhel7: RHEL-07-030440
--    stigid@rhel8: RHEL-08-030200
-+    stigid@almalinux8: RHEL-08-030200
-     stigid@rhel9: RHEL-09-654025
-     stigid@sle12: SLES-12-020370
-     stigid@sle15: SLES-15-030190
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_removexattr/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_removexattr/rule.yml
-index c61fcfbae..ef632536a 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_removexattr/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_removexattr/rule.yml
-@@ -10,13 +10,13 @@ description: |-
-     program to read audit rules during daemon startup (the default), add the
-     following line to a file with suffix <tt>.rules</tt> in the directory <tt>/etc/audit/rules.d</tt>:
-     <pre>-a always,exit -F arch=b32 -S removexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b32 -S removexattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
-     <br /><br />
-     If the system is 64 bit then also add the following line:
-     <pre>-a always,exit -F arch=b64 -S removexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b64 -S removexattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
-     <br /><br />
-@@ -24,13 +24,13 @@ description: |-
-     utility to read audit rules during daemon startup, add the following line to
-     <tt>/etc/audit/audit.rules</tt> file:
-     <pre>-a always,exit -F arch=b32 -S removexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b32 -S removexattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
-     <br /><br />
-     If the system is 64 bit then also add the following line:
-     <pre>-a always,exit -F arch=b64 -S removexattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b64 -S removexattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
- 
-@@ -79,7 +79,7 @@ references:
-     stigid@ol7: OL07-00-030440
-     stigid@ol8: OL08-00-030200
-     stigid@rhel7: RHEL-07-030440
--    stigid@rhel8: RHEL-08-030200
-+    stigid@almalinux8: RHEL-08-030200
-     stigid@rhel9: RHEL-09-654025
-     stigid@sle12: SLES-12-020370
-     stigid@sle15: SLES-15-030190
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_setxattr/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_setxattr/rule.yml
-index eeb9088ed..5c791ffc2 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_setxattr/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_setxattr/rule.yml
-@@ -9,24 +9,24 @@ description: |-
-     startup (the default), add the following line to a file with suffix
-     <tt>.rules</tt> in the directory <tt>/etc/audit/rules.d</tt>:
-     <pre>-a always,exit -F arch=b32 -S setxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b32 -S setxattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
-     If the system is 64 bit then also add the following line:
-     <pre>-a always,exit -F arch=b64 -S setxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b64 -S setxattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
-     If the <tt>auditd</tt> daemon is configured to use the <tt>auditctl</tt>
-     utility to read audit rules during daemon startup, add the following line to
-     <tt>/etc/audit/audit.rules</tt> file:
-     <pre>-a always,exit -F arch=b32 -S setxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b32 -S setxattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
-     If the system is 64 bit then also add the following line:
-     <pre>-a always,exit -F arch=b64 -S setxattr -F auid&gt;={{{ auid }}} -F auid!=unset -F key=perm_mod</pre>
--{{%- if product in ["ol8", "ol9", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol8", "ol9", "rhel8", "almalinux8", "rhel9"] %}}
-     <pre>-a always,exit -F arch=b64 -S setxattr -F auid=0 -F key=perm_mod</pre>
- {{%- endif %}}
- 
-@@ -75,7 +75,7 @@ references:
-     stigid@ol7: OL07-00-030440
-     stigid@ol8: OL08-00-030200
-     stigid@rhel7: RHEL-07-030440
--    stigid@rhel8: RHEL-08-030200
-+    stigid@almalinux8: RHEL-08-030200
-     stigid@rhel9: RHEL-09-654025
-     stigid@sle12: SLES-12-020370
-     stigid@sle15: SLES-15-030190
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_acl_commands/audit_rules_execution_chacl/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_acl_commands/audit_rules_execution_chacl/rule.yml
-index cd14452f8..2cc1e9fd1 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_acl_commands/audit_rules_execution_chacl/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_acl_commands/audit_rules_execution_chacl/rule.yml
-@@ -41,7 +41,7 @@ references:
-     nist@sle12: AU-3,AU-3.1,AU-12.1(ii),AU-12(a),AU-12.1(iv),AU-12(c),MA-4(1)(a)
-     srg: SRG-OS-000037-GPOS-00015,SRG-OS-000042-GPOS-00020,SRG-OS-000062-GPOS-00031,SRG-OS-000392-GPOS-00172,SRG-OS-000462-GPOS-00206,SRG-OS-000471-GPOS-00215,SRG-OS-000466-GPOS-00210,SRG-APP-000495-CTR-001235,SRG-APP-000499-CTR-001255
-     stigid@ol8: OL08-00-030570
--    stigid@rhel8: RHEL-08-030570
-+    stigid@almalinux8: RHEL-08-030570
-     stigid@rhel9: RHEL-09-654035
-     stigid@sle12: SLES-12-020620
-     stigid@sle15: SLES-15-030440
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_acl_commands/audit_rules_execution_setfacl/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_acl_commands/audit_rules_execution_setfacl/rule.yml
-index 0f0925724..aab35206e 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_acl_commands/audit_rules_execution_setfacl/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_acl_commands/audit_rules_execution_setfacl/rule.yml
-@@ -40,7 +40,7 @@ references:
-     nist@sle12: AU-3,AU-3.1,AU-12.1(ii),AU-12(a),AU-12.1(iv),AU-12(c),MA-4(1)(a)
-     srg: SRG-OS-000037-GPOS-00015,SRG-OS-000042-GPOS-00020,SRG-OS-000062-GPOS-00031,SRG-OS-000392-GPOS-00172,SRG-OS-000462-GPOS-00206,SRG-OS-000471-GPOS-00215,SRG-APP-000495-CTR-001235
-     stigid@ol8: OL08-00-030330
--    stigid@rhel8: RHEL-08-030330
-+    stigid@almalinux8: RHEL-08-030330
-     stigid@rhel9: RHEL-09-654040
-     stigid@sle12: SLES-12-020610
-     stigid@sle15: SLES-15-030430
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_chcon/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_chcon/rule.yml
-index c37003fdb..95bd09eae 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_chcon/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_chcon/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-@@ -63,7 +63,7 @@ references:
-     stigid@ol7: OL07-00-030580
-     stigid@ol8: OL08-00-030260
-     stigid@rhel7: RHEL-07-030580
--    stigid@rhel8: RHEL-08-030260
-+    stigid@almalinux8: RHEL-08-030260
-     stigid@rhel9: RHEL-09-654045
-     stigid@sle12: SLES-12-020630
-     stigid@sle15: SLES-15-030450
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_restorecon/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_restorecon/rule.yml
-index 4431537de..c27a75e11 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_restorecon/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_restorecon/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_semanage/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_semanage/rule.yml
-index 698a94308..ff384761a 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_semanage/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_semanage/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-@@ -57,7 +57,7 @@ references:
-     stigid@ol7: OL07-00-030560
-     stigid@ol8: OL08-00-030313
-     stigid@rhel7: RHEL-07-030560
--    stigid@rhel8: RHEL-08-030313
-+    stigid@almalinux8: RHEL-08-030313
-     stigid@rhel9: RHEL-09-654050
- 
- {{{ ocil_fix_srg_privileged_command("semanage", "/usr/sbin/", "privileged-unix-update") }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_setfiles/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_setfiles/rule.yml
-index b8e7c3502..da5b9539b 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_setfiles/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_setfiles/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-@@ -46,7 +46,7 @@ references:
-     stigid@ol7: OL07-00-030590
-     stigid@ol8: OL08-00-030314
-     stigid@rhel7: RHEL-07-030590
--    stigid@rhel8: RHEL-08-030314
-+    stigid@almalinux8: RHEL-08-030314
-     stigid@rhel9: RHEL-09-654055
- 
- {{{ ocil_fix_srg_privileged_command("setfiles", "/usr/sbin/", "privileged-unix-update") }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_setsebool/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_setsebool/rule.yml
-index 0a9b6c0d1..5df9fc4d8 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_setsebool/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_setsebool/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-@@ -56,7 +56,7 @@ references:
-     stigid@ol7: OL07-00-030570
-     stigid@ol8: OL08-00-030316
-     stigid@rhel7: RHEL-07-030570
--    stigid@rhel8: RHEL-08-030316
-+    stigid@almalinux8: RHEL-08-030316
-     stigid@rhel9: RHEL-09-654060
- 
- {{{ ocil_fix_srg_privileged_command("setsebool", "/usr/sbin/", "privileged") }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_seunshare/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_seunshare/rule.yml
-index 1214ad408..8f2bd4496 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_seunshare/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_seunshare/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events/bash/shared.sh
-index 53e61fb25..e9a0edcde 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_sle
-+# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
- 
- # Perform the remediation for the syscall rule
- # Retrieve hardware architecture of the underlying system
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_rename/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_rename/rule.yml
-index 5b643bdeb..d3261049c 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_rename/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_rename/rule.yml
-@@ -60,7 +60,7 @@ references:
-     stigid@ol7: OL07-00-030910
-     stigid@ol8: OL08-00-030361
-     stigid@rhel7: RHEL-07-030910
--    stigid@rhel8: RHEL-08-030361
-+    stigid@almalinux8: RHEL-08-030361
-     stigid@rhel9: RHEL-09-654065
-     stigid@ubuntu2004: UBTU-20-010267
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_renameat/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_renameat/rule.yml
-index 7bd3799ef..08609a454 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_renameat/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_renameat/rule.yml
-@@ -57,7 +57,7 @@ references:
-     stigid@ol7: OL07-00-030910
-     stigid@ol8: OL08-00-030361
-     stigid@rhel7: RHEL-07-030910
--    stigid@rhel8: RHEL-08-030361
-+    stigid@almalinux8: RHEL-08-030361
-     stigid@rhel9: RHEL-09-654065
-     stigid@ubuntu2004: UBTU-20-010267
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_rmdir/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_rmdir/rule.yml
-index 187764324..c5416af9b 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_rmdir/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_rmdir/rule.yml
-@@ -55,7 +55,7 @@ references:
-     stigid@ol7: OL07-00-030910
-     stigid@ol8: OL08-00-030361
-     stigid@rhel7: RHEL-07-030910
--    stigid@rhel8: RHEL-08-030361
-+    stigid@almalinux8: RHEL-08-030361
-     stigid@rhel9: RHEL-09-654065
-     stigid@ubuntu2004: UBTU-20-010267
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlink/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlink/rule.yml
-index 74a105415..6c31f0695 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlink/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlink/rule.yml
-@@ -60,7 +60,7 @@ references:
-     stigid@ol7: OL07-00-030910
-     stigid@ol8: OL08-00-030361
-     stigid@rhel7: RHEL-07-030910
--    stigid@rhel8: RHEL-08-030361
-+    stigid@almalinux8: RHEL-08-030361
-     stigid@rhel9: RHEL-09-654065
-     stigid@ubuntu2004: UBTU-20-010267
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlinkat/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlinkat/rule.yml
-index d8a1a0a3e..1f9490a82 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlinkat/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_deletion_events/audit_rules_file_deletion_events_unlinkat/rule.yml
-@@ -57,7 +57,7 @@ references:
-     stigid@ol7: OL07-00-030910
-     stigid@ol8: OL08-00-030361
-     stigid@rhel7: RHEL-07-030910
--    stigid@rhel8: RHEL-08-030361
-+    stigid@almalinux8: RHEL-08-030361
-     stigid@rhel9: RHEL-09-654065
-     stigid@ubuntu2004: UBTU-20-010267
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification/bash/shared.sh
-index 8a48783f6..b846f8113 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_sle
-+# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
- 
- # Perform the remediation of the syscall rule
- # Retrieve hardware architecture of the underlying system
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_creat/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_creat/rule.yml
-index b1f98d255..c273eda16 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_creat/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_creat/rule.yml
-@@ -69,7 +69,7 @@ references:
-     stigid@ol7: OL07-00-030510
-     stigid@ol8: OL08-00-030420
-     stigid@rhel7: RHEL-07-030510
--    stigid@rhel8: RHEL-08-030420
-+    stigid@almalinux8: RHEL-08-030420
-     stigid@rhel9: RHEL-09-654070
-     stigid@sle12: SLES-12-020490
-     stigid@sle15: SLES-15-030150
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_ftruncate/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_ftruncate/rule.yml
-index ff8b128f0..9a112268e 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_ftruncate/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_ftruncate/rule.yml
-@@ -69,7 +69,7 @@ references:
-     stigid@ol7: OL07-00-030510
-     stigid@ol8: OL08-00-030420
-     stigid@rhel7: RHEL-07-030510
--    stigid@rhel8: RHEL-08-030420
-+    stigid@almalinux8: RHEL-08-030420
-     stigid@rhel9:  RHEL-09-654070
-     stigid@sle12: SLES-12-020490
-     stigid@sle15: SLES-15-030150
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open/rule.yml
-index 068d40163..7518b9431 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open/rule.yml
-@@ -72,7 +72,7 @@ references:
-     stigid@ol7: OL07-00-030510
-     stigid@ol8: OL08-00-030420
-     stigid@rhel7: RHEL-07-030510
--    stigid@rhel8: RHEL-08-030420
-+    stigid@almalinux8: RHEL-08-030420
-     stigid@rhel9: RHEL-09-654070
-     stigid@sle12: SLES-12-020490
-     stigid@sle15: SLES-15-030150
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at/rule.yml
-index 602e5e328..938ce757d 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at/rule.yml
-@@ -59,7 +59,7 @@ references:
-     stigid@ol7: OL07-00-030510
-     stigid@ol8: OL08-00-030420
-     stigid@rhel7: RHEL-07-030510
--    stigid@rhel8: RHEL-08-030420
-+    stigid@almalinux8: RHEL-08-030420
-     stigid@rhel9: RHEL-09-654070
-     stigid@sle12: SLES-12-020490
-     stigid@sle15: SLES-15-030150
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_o_creat/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_o_creat/bash/shared.sh
-index c1352ae38..31de43746 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_o_creat/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_o_creat/bash/shared.sh
-@@ -1,3 +1,3 @@
--# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel
-+# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- 
- {{{ bash_create_audit_remediation_unsuccessful_file_modification_detailed("/etc/audit/rules.d/30-ospp-v42-remediation.rules") }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_o_trunc_write/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_o_trunc_write/bash/shared.sh
-index c1352ae38..31de43746 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_o_trunc_write/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_o_trunc_write/bash/shared.sh
-@@ -1,3 +1,3 @@
--# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel
-+# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- 
- {{{ bash_create_audit_remediation_unsuccessful_file_modification_detailed("/etc/audit/rules.d/30-ospp-v42-remediation.rules") }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_rule_order/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_rule_order/bash/shared.sh
-index c944fb9e6..b506644af 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_rule_order/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_by_handle_at_rule_order/bash/shared.sh
-@@ -1,3 +1,3 @@
--# platform = multi_platform_rhel,multi_platform_ol
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_ol
- 
- {{{ bash_create_audit_remediation_unsuccessful_file_modification_detailed("/etc/audit/rules.d/30-ospp-v42-remediation.rules") }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_o_creat/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_o_creat/bash/shared.sh
-index c1352ae38..31de43746 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_o_creat/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_o_creat/bash/shared.sh
-@@ -1,3 +1,3 @@
--# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel
-+# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- 
- {{{ bash_create_audit_remediation_unsuccessful_file_modification_detailed("/etc/audit/rules.d/30-ospp-v42-remediation.rules") }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_o_trunc_write/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_o_trunc_write/bash/shared.sh
-index c1352ae38..31de43746 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_o_trunc_write/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_o_trunc_write/bash/shared.sh
-@@ -1,3 +1,3 @@
--# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel
-+# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- 
- {{{ bash_create_audit_remediation_unsuccessful_file_modification_detailed("/etc/audit/rules.d/30-ospp-v42-remediation.rules") }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_rule_order/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_rule_order/bash/shared.sh
-index c944fb9e6..b506644af 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_rule_order/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_rule_order/bash/shared.sh
-@@ -1,3 +1,3 @@
--# platform = multi_platform_rhel,multi_platform_ol
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_ol
- 
- {{{ bash_create_audit_remediation_unsuccessful_file_modification_detailed("/etc/audit/rules.d/30-ospp-v42-remediation.rules") }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat/rule.yml
-index c4eb8f3ac..288b52820 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat/rule.yml
-@@ -69,7 +69,7 @@ references:
-     stigid@ol7: OL07-00-030510
-     stigid@ol8: OL08-00-030420
-     stigid@rhel7: RHEL-07-030510
--    stigid@rhel8: RHEL-08-030420
-+    stigid@almalinux8: RHEL-08-030420
-     stigid@rhel9: RHEL-09-654070
-     stigid@sle12: SLES-12-020490
-     stigid@sle15: SLES-15-030150
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_o_creat/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_o_creat/bash/shared.sh
-index c1352ae38..31de43746 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_o_creat/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_o_creat/bash/shared.sh
-@@ -1,3 +1,3 @@
--# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel
-+# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- 
- {{{ bash_create_audit_remediation_unsuccessful_file_modification_detailed("/etc/audit/rules.d/30-ospp-v42-remediation.rules") }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_o_trunc_write/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_o_trunc_write/bash/shared.sh
-index c1352ae38..31de43746 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_o_trunc_write/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_o_trunc_write/bash/shared.sh
-@@ -1,3 +1,3 @@
--# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel
-+# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- 
- {{{ bash_create_audit_remediation_unsuccessful_file_modification_detailed("/etc/audit/rules.d/30-ospp-v42-remediation.rules") }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_rule_order/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_rule_order/bash/shared.sh
-index c944fb9e6..b506644af 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_rule_order/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_rule_order/bash/shared.sh
-@@ -1,3 +1,3 @@
--# platform = multi_platform_rhel,multi_platform_ol
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_ol
- 
- {{{ bash_create_audit_remediation_unsuccessful_file_modification_detailed("/etc/audit/rules.d/30-ospp-v42-remediation.rules") }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_truncate/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_truncate/rule.yml
-index d89aa0d27..8814a9399 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_truncate/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_truncate/rule.yml
-@@ -68,7 +68,7 @@ references:
-     stigid@ol7: OL07-00-030510
-     stigid@ol8: OL08-00-030420
-     stigid@rhel7: RHEL-07-030510
--    stigid@rhel8: RHEL-08-030420
-+    stigid@almalinux8: RHEL-08-030420
-     stigid@rhel9: RHEL-09-654070
-     stigid@sle12: SLES-12-020490
-     stigid@sle15: SLES-15-030150
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading/ansible/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading/ansible/shared.yml
-index 590a5ff6b..5ceb15d9b 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_create/kubernetes/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_create/kubernetes/shared.yml
-index bdf3015c4..658327033 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_create/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_create/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/ansible/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/ansible/shared.yml
-index 2e008b37e..7e74c94e7 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = multi_platform_rhel,multi_platform_rhv,multi_platform_sle,multi_platform_ol,multi_platform_ubuntu,multi_platform_debian
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_rhv,multi_platform_sle,multi_platform_ol,multi_platform_ubuntu,multi_platform_debian
- # reboot = false
- # complexity = low
- # disruption = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/kubernetes/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/kubernetes/shared.yml
-index 7c8e520c1..e5c1d9d93 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/rule.yml
-index e25e2a8bc..6f6435c8c 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/rule.yml
-@@ -60,7 +60,7 @@ references:
-     stigid@ol7: OL07-00-030830
-     stigid@ol8: OL08-00-030390
-     stigid@rhel7: RHEL-07-030830
--    stigid@rhel8: RHEL-08-030390
-+    stigid@almalinux8: RHEL-08-030390
-     stigid@rhel9: RHEL-09-654075
-     stigid@sle12: SLES-12-020730
-     stigid@sle15: SLES-15-030520
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/tests/missing_auid_filter.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/tests/missing_auid_filter.fail.sh
-index 1bf2449b4..ddf95ef93 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/tests/missing_auid_filter.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_delete/tests/missing_auid_filter.fail.sh
-@@ -1,5 +1,5 @@
- #!/bin/bash
--# platform = Oracle Linux 7,Oracle Linux 8,Red Hat Enterprise Linux 8,multi_platform_ubuntu
-+# platform = Oracle Linux 7,Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_ubuntu
- # packages = audit
- 
- rm -f /etc/audit/rules.d/*
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/ansible/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/ansible/shared.yml
-index 9349085f7..b20604aa7 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = multi_platform_rhel,multi_platform_ol,multi_platform_rhv,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_ol,multi_platform_rhv,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
- # reboot = false
- # complexity = low
- # disruption = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/kubernetes/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/kubernetes/shared.yml
-index 639d76a21..7f4d463d6 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/rule.yml
-index ca1c4f6a8..08a653c50 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/rule.yml
-@@ -59,7 +59,7 @@ references:
-     stigid@ol7: OL07-00-030820
-     stigid@ol8: OL08-00-030360
-     stigid@rhel7: RHEL-07-030820
--    stigid@rhel8: RHEL-08-030360
-+    stigid@almalinux8: RHEL-08-030360
-     stigid@rhel9: RHEL-09-654080
-     stigid@sle12: SLES-12-020740
-     stigid@sle15: SLES-15-030530
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/tests/missing_auid_filter.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/tests/missing_auid_filter.fail.sh
-index 548015d2a..f785aab0c 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/tests/missing_auid_filter.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_finit/tests/missing_auid_filter.fail.sh
-@@ -1,5 +1,5 @@
- #!/bin/bash
--# platform = Oracle Linux 7,Oracle Linux 8,Red Hat Enterprise Linux 8,multi_platform_ubuntu
-+# platform = Oracle Linux 7,Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_ubuntu
- # packages = audit
- 
- rm -f /etc/audit/rules.d/*
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/ansible/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/ansible/shared.yml
-index 73a9f1dff..6daf2c30b 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = multi_platform_rhel,multi_platform_rhv,multi_platform_sle,multi_platform_ol,multi_platform_ubuntu,multi_platform_debian
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_rhv,multi_platform_sle,multi_platform_ol,multi_platform_ubuntu,multi_platform_debian
- # reboot = false
- # complexity = low
- # disruption = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/kubernetes/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/kubernetes/shared.yml
-index 083a612a0..3228b89b7 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/rule.yml
-index b87e5b20d..34bb2eb4a 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/rule.yml
-@@ -60,7 +60,7 @@ references:
-     stigid@ol7: OL07-00-030820
-     stigid@ol8: OL08-00-030360
-     stigid@rhel7: RHEL-07-030820
--    stigid@rhel8: RHEL-08-030360
-+    stigid@almalinux8: RHEL-08-030360
-     stigid@rhel9: RHEL-09-654080
-     stigid@sle12: SLES-12-020740
-     stigid@sle15: SLES-15-030530
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/tests/missing_auid_filter.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/tests/missing_auid_filter.fail.sh
-index 8e282ee3e..d344773fa 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/tests/missing_auid_filter.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_init/tests/missing_auid_filter.fail.sh
-@@ -1,5 +1,5 @@
- #!/bin/bash
--# platform = Oracle Linux 7,Oracle Linux 8,Red Hat Enterprise Linux 8,multi_platform_ubuntu
-+# platform = Oracle Linux 7,Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_ubuntu
- # packages = audit
- 
- rm -f /etc/audit/rules.d/*
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_query/tests/missing_auid_filter.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_query/tests/missing_auid_filter.fail.sh
-index 009564309..0f9a7f6e6 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_query/tests/missing_auid_filter.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_kernel_module_loading/audit_rules_kernel_module_loading_query/tests/missing_auid_filter.fail.sh
-@@ -1,5 +1,5 @@
- #!/bin/bash
--# platform = Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
-+# platform = Red Hat Enterprise Linux 8,AlmaLinux 8,Red Hat Enterprise Linux 9
- # packages = audit
- 
- rm -f /etc/audit/rules.d/*
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events/bash/shared.sh
-index 1ea2bcfa9..06d0f131a 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- 
- # Perform the remediation for both possible tools: 'auditctl' and 'augenrules'
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/rule.yml
-index 4102a3ff9..1fdbc4041 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/rule.yml
-@@ -56,7 +56,7 @@ references:
-     stigid@ol7: OL07-00-030610
-     stigid@ol8: OL08-00-030590
-     stigid@rhel7: RHEL-07-030610
--    stigid@rhel8: RHEL-08-030590
-+    stigid@almalinux8: RHEL-08-030590
-     stigid@rhel9: RHEL-09-654250
- 
- ocil_clause: 'the command does not return a line, or the line is commented out'
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_cis.pass.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_cis.pass.sh
-index 123bfa32f..202a1488f 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_cis.pass.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_cis.pass.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
-+# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
- # profiles = xccdf_org.ssgproject.content_profile_cis
- 
- path="/var/run/faillock"
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_extra_permission_cis.pass.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_extra_permission_cis.pass.sh
-index 2c17afeaa..0ddf37750 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_extra_permission_cis.pass.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_extra_permission_cis.pass.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
-+# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
- # profiles = xccdf_org.ssgproject.content_profile_cis
- 
- path="/var/run/faillock"
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_without_key_cis.pass.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_without_key_cis.pass.sh
-index ea2066f6f..3765d856b 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_without_key_cis.pass.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_without_key_cis.pass.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
-+# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
- # profiles = xccdf_org.ssgproject.content_profile_cis
- 
- path="/var/run/faillock"
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_remove_all_rules_cis.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_remove_all_rules_cis.fail.sh
-index 609e9755d..bca002bc9 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_remove_all_rules_cis.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_remove_all_rules_cis.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
-+# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
- # profiles = xccdf_org.ssgproject.content_profile_cis
- 
- path="/var/run/faillock"
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_wrong_rule_cis.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_wrong_rule_cis.fail.sh
-index caf40c54b..9bb1ab7de 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_wrong_rule_cis.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_wrong_rule_cis.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
-+# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
- # profiles = xccdf_org.ssgproject.content_profile_cis
- 
- path="/var/run/faillock"
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_wrong_rule_without_key_cis.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_wrong_rule_without_key_cis.fail.sh
-index ee1fdc951..08606fcac 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_wrong_rule_without_key_cis.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_wrong_rule_without_key_cis.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
-+# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
- # profiles = xccdf_org.ssgproject.content_profile_cis
- 
- path="/var/run/faillock"
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_cis.pass.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_cis.pass.sh
-index e2750dbee..6a2992c9d 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_cis.pass.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_cis.pass.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
-+# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
- # profiles = xccdf_org.ssgproject.content_profile_cis
- 
- path="/var/run/faillock"
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_extra_permission_cis.pass.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_extra_permission_cis.pass.sh
-index d8379bfe5..3c16dd148 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_extra_permission_cis.pass.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_extra_permission_cis.pass.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
-+# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
- # profiles = xccdf_org.ssgproject.content_profile_cis
- 
- path="/var/run/faillock"
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_without_key_cis.pass.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_without_key_cis.pass.sh
-index cbbcb5f67..76ebb0844 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_without_key_cis.pass.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_without_key_cis.pass.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
-+# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
- # profiles = xccdf_org.ssgproject.content_profile_cis
- 
- path="/var/run/faillock"
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_remove_all_rules_cis.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_remove_all_rules_cis.fail.sh
-index 22b979187..e90519a30 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_remove_all_rules_cis.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_remove_all_rules_cis.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
-+# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
- # profiles = xccdf_org.ssgproject.content_profile_cis
- 
- path="/var/run/faillock"
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_wrong_rule_cis.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_wrong_rule_cis.fail.sh
-index afdeb73d1..95b55eef4 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_wrong_rule_cis.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_wrong_rule_cis.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
-+# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
- # profiles = xccdf_org.ssgproject.content_profile_cis
- 
- path="/var/run/faillock"
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_wrong_rule_without_key_cis.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_wrong_rule_without_key_cis.fail.sh
-index b14bc1951..81934f021 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_wrong_rule_without_key_cis.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/augenrules_wrong_rule_without_key_cis.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
-+# platform = Red Hat Enterprise Linux 8,AlmaLinux 8, Red Hat Enterprise Linux 9
- # profiles = xccdf_org.ssgproject.content_profile_cis
- 
- path="/var/run/faillock"
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_lastlog/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_lastlog/rule.yml
-index d183ff5be..91546b5d0 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_lastlog/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_lastlog/rule.yml
-@@ -58,7 +58,7 @@ references:
-     stigid@ol7: OL07-00-030620
-     stigid@ol8: OL08-00-030600
-     stigid@rhel7: RHEL-07-030620
--    stigid@rhel8: RHEL-08-030600
-+    stigid@almalinux8: RHEL-08-030600
-     stigid@rhel9: RHEL-09-654255
-     stigid@sle12: SLES-12-020660
-     stigid@sle15: SLES-15-030480
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/ansible/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/ansible/shared.yml
-index 1c7f9d26c..0d8ea4220 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle,multi_platform_debian
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle,multi_platform_debian
- # reboot = false
- # strategy = configure
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_default.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_default.fail.sh
-index 8615165ec..002902145 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_default.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_default.fail.sh
-@@ -1,5 +1,5 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
- 
- sed -i "s%^ExecStartPost=.*%ExecStartPost=-/sbin/auditctl%" /usr/lib/systemd/system/auditd.service
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_missing_rule.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_missing_rule.fail.sh
-index bc3f67c9c..a37ccd0bf 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_missing_rule.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_missing_rule.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
- 
- ./generate_privileged_commands_rule.sh {{{ uid_min }}} privileged /etc/audit/audit.rules
- sed -i '/newgrp/d' /etc/audit/audit.rules
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_one_rule.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_one_rule.fail.sh
-index ed2cc6c29..13cbaac12 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_one_rule.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_one_rule.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
- 
- echo "-a always,exit -F path=/usr/bin/sudo -F perm=x -F auid>={{{ uid_min }}} -F auid!=unset -k privileged" >> /etc/audit/audit.rules
- sed -i "s%^ExecStartPost=.*%ExecStartPost=-/sbin/auditctl%" /usr/lib/systemd/system/auditd.service
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_rules_configured.pass.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_rules_configured.pass.sh
-index e1d5d05df..6a758969a 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_rules_configured.pass.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_rules_configured.pass.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
- 
- ./generate_privileged_commands_rule.sh {{{ uid_min }}} privileged /etc/audit/audit.rules
- sed -i "s%^ExecStartPost=.*%ExecStartPost=-/sbin/auditctl%" /usr/lib/systemd/system/auditd.service
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_rules_without_perm_x.pass.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_rules_without_perm_x.pass.sh
-index ec89d9ce8..81e0062b1 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_rules_without_perm_x.pass.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_rules_without_perm_x.pass.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
- 
- ./generate_privileged_commands_rule.sh {{{ uid_min }}} privileged /etc/audit/audit.rules
- sed -i -E 's/^(.*path=[[:graph:]]+) -F perm=x(.*$)/\1\2/' /etc/audit/audit.rules
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_default.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_default.fail.sh
-index ee36da807..bd848737d 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_default.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_default.fail.sh
-@@ -1,5 +1,5 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
- 
- # augenrules is default for rhel7
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_duplicated.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_duplicated.fail.sh
-index b6aabf247..8405f0ba1 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_duplicated.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_duplicated.fail.sh
-@@ -1,7 +1,7 @@
- #!/bin/bash
- # packages = audit
- # remediation = none
--# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
- 
- ./generate_privileged_commands_rule.sh {{{ uid_min }}} privileged /tmp/privileged.rules
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_extra_rules_configured.pass.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_extra_rules_configured.pass.sh
-index 12f1b429a..8dea24479 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_extra_rules_configured.pass.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_extra_rules_configured.pass.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
- 
- ./generate_privileged_commands_rule.sh {{{ uid_min }}} privileged /etc/audit/rules.d/privileged.rules
- echo "-a always,exit -F path=/usr/bin/notrelevant -F perm=x -F auid>={{{ uid_min }}} -F auid!=unset -F key=privileged" >> /etc/audit/rules.d/privileged.rules
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_missing_rule.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_missing_rule.fail.sh
-index 711bae803..617ff1b33 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_missing_rule.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_missing_rule.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
- 
- ./generate_privileged_commands_rule.sh {{{ uid_min }}} privileged /etc/audit/rules.d/privileged.rules
-  sed -i '/newgrp/d' /etc/audit/rules.d/privileged.rules
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_one_rule.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_one_rule.fail.sh
-index d272fd1d5..f7c0fec7d 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_one_rule.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_one_rule.fail.sh
-@@ -1,5 +1,5 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
- 
- echo "-a always,exit -F path=/usr/bin/sudo -F perm=x -F auid>={{{ uid_min }}} -F auid!=unset -F key=privileged" >> /etc/audit/rules.d/privileged.rules
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_configured.pass.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_configured.pass.sh
-index ecda20ef9..115487067 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_configured.pass.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_configured.pass.sh
-@@ -1,5 +1,5 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
- 
- ./generate_privileged_commands_rule.sh {{{ uid_min }}} privileged /etc/audit/rules.d/privileged.rules
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_configured_mixed_keys.pass.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_configured_mixed_keys.pass.sh
-index 51482922f..4ac366ec9 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_configured_mixed_keys.pass.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_configured_mixed_keys.pass.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
- 
- ./generate_privileged_commands_rule.sh {{{ uid_min }}} privileged /etc/audit/rules.d/privileged.rules
- # change key of rules for binaries in /usr/sbin
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_ignore_dracut_tmp.pass.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_ignore_dracut_tmp.pass.sh
-index 6ef31d987..2da0682e0 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_ignore_dracut_tmp.pass.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_ignore_dracut_tmp.pass.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
- 
- ./generate_privileged_commands_rule.sh {{{ uid_min }}} privileged /etc/audit/rules.d/privileged.rules
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_without_perm_x.pass.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_without_perm_x.pass.sh
-index 79c0bb972..2968492ac 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_without_perm_x.pass.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_rules_without_perm_x.pass.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
- 
- ./generate_privileged_commands_rule.sh {{{ uid_min }}} privileged /etc/audit/rules.d/privileged.rules
- sed -i -E 's/^(.*path=[[:graph:]]+) -F perm=x(.*$)/\1\2/' /etc/audit/rules.d/privileged.rules
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_two_rules_mixed_keys.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_two_rules_mixed_keys.fail.sh
-index a8667bbfb..471d2aff2 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_two_rules_mixed_keys.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_two_rules_mixed_keys.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
- 
- echo "-a always,exit -F path=/usr/bin/newgrp -F perm=x -F auid>={{{ uid_min }}} -F auid!=unset -k privileged" >> /etc/audit/rules.d/privileged.rules
- echo "-a always,exit -F path=/usr/bin/passwd -F perm=x -F auid>={{{ uid_min }}} -F auid!=unset -F key=privileged" >> /etc/audit/rules.d/privileged.rules
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_two_rules_sep_files.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_two_rules_sep_files.fail.sh
-index b2e18d1cd..5c56cdb6d 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_two_rules_sep_files.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/augenrules_two_rules_sep_files.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
- 
- echo "-a always,exit -F path=/usr/bin/newgrp -F perm=x -F auid>={{{ uid_min }}} -F auid!=unset -F key=privileged" >> /etc/audit/rules.d/priv.rules
- echo "-a always,exit -F path=/usr/bin/notrelevant -F perm=x -F auid>={{{ uid_min }}} -F auid!=unset -F key=privileged" >> /etc/audit/rules.d/priv.rules
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/rules_with_own_key.pass.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/rules_with_own_key.pass.sh
-index 81fc6dd16..9c3f84ef8 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/rules_with_own_key.pass.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/rules_with_own_key.pass.sh
-@@ -1,5 +1,5 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_fedora,multi_platform_rhel,Oracle Linux 7,Oracle Linux 8
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8
- 
- ./generate_privileged_commands_rule.sh {{{ uid_min }}} own_key /etc/audit/rules.d/privileged.rules
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_at/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_at/rule.yml
-index d5ec19271..456ebfd72 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_at/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_at/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_chage/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_chage/rule.yml
-index b628567bc..4cd1ced70 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_chage/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_chage/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-@@ -59,7 +59,7 @@ references:
-     stigid@ol7: OL07-00-030660
-     stigid@ol8: OL08-00-030250
-     stigid@rhel7: RHEL-07-030660
--    stigid@rhel8: RHEL-08-030250
-+    stigid@almalinux8: RHEL-08-030250
-     stigid@rhel9: RHEL-09-654085
-     stigid@sle12: SLES-12-020690
-     stigid@sle15: SLES-15-030120
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_chsh/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_chsh/rule.yml
-index 7515a6681..0870a3499 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_chsh/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_chsh/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-@@ -59,7 +59,7 @@ references:
-     stigid@ol7: OL07-00-030720
-     stigid@ol8: OL08-00-030410
-     stigid@rhel7: RHEL-07-030720
--    stigid@rhel8: RHEL-08-030410
-+    stigid@almalinux8: RHEL-08-030410
-     stigid@rhel9: RHEL-09-654090
-     stigid@sle12: SLES-12-020580
-     stigid@sle15: SLES-15-030100
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_crontab/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_crontab/rule.yml
-index 8ef1fdf41..237ebe6e7 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_crontab/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_crontab/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-@@ -58,7 +58,7 @@ references:
-     stigid@ol7: OL07-00-030800
-     stigid@ol8: OL08-00-030400
-     stigid@rhel7: RHEL-07-030800
--    stigid@rhel8: RHEL-08-030400
-+    stigid@almalinux8: RHEL-08-030400
-     stigid@rhel9: RHEL-09-654095
-     stigid@sle12: SLES-12-020710
-     stigid@sle15: SLES-15-030130
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_dbus_daemon_launch_helper/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_dbus_daemon_launch_helper/rule.yml
-index b54fefd34..623ee707e 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_dbus_daemon_launch_helper/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_dbus_daemon_launch_helper/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_fusermount/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_fusermount/rule.yml
-index de8adac1e..201b6145f 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_fusermount/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_fusermount/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_fusermount3/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_fusermount3/rule.yml
-index 3b94d7faa..238431055 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_fusermount3/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_fusermount3/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_gpasswd/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_gpasswd/rule.yml
-index 18a97ba77..3ffa6ad25 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_gpasswd/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_gpasswd/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-@@ -60,7 +60,7 @@ references:
-     stigid@ol7: OL07-00-030650
-     stigid@ol8: OL08-00-030370
-     stigid@rhel7: RHEL-07-030650
--    stigid@rhel8: RHEL-08-030370
-+    stigid@almalinux8: RHEL-08-030370
-     stigid@rhel9: RHEL-09-654100
-     stigid@sle12: SLES-12-020560
-     stigid@sle15: SLES-15-030080
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_grub2_set_bootflag/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_grub2_set_bootflag/rule.yml
-index cf58bda23..2be03b588 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_grub2_set_bootflag/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_grub2_set_bootflag/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_insmod/ansible/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_insmod/ansible/shared.yml
-index 5baa999e7..cb49a4d71 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_insmod/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_insmod/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = multi_platform_sle,multi_platform_rhel
-+# platform = multi_platform_sle,multi_platform_rhel,multi_platform_almalinux
- # reboot = false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_insmod/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_insmod/bash/shared.sh
-index 29bfc7be7..d0910b1c6 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_insmod/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_insmod/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
- 
- # Perform the remediation for both possible tools: 'auditctl' and 'augenrules'
- {{{ bash_fix_audit_watch_rule("auditctl", "/sbin/insmod", "x", "modules") }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_kmod/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_kmod/rule.yml
-index de3bf60f3..5112458d4 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_kmod/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_kmod/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["ol7", "rhel7", "rhel8", "rhel9"] %}}
-+{{%- if product in ["ol7", "rhel7", "rhel8", "almalinux8", "rhel9"] %}}
-     {{%- set kmod_audit="-a always,exit -F path=/usr/bin/kmod -F perm=x -F auid>=" ~ uid_min ~ " -F auid!=unset -F key=privileged" %}}
- {{%- else %}}
-     {{%- set kmod_audit="-w /usr/bin/kmod -p x -k modules" %}}
-@@ -50,7 +50,7 @@ references:
-     stigid@ol7: OL07-00-030840
-     stigid@ol8: OL08-00-030580
-     stigid@rhel7: RHEL-07-030840
--    stigid@rhel8: RHEL-08-030580
-+    stigid@almalinux8: RHEL-08-030580
-     stigid@rhel9: RHEL-09-654105
-     stigid@sle12: SLES-12-020360
-     stigid@sle15: SLES-15-030410
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/ansible/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/ansible/shared.yml
-index 8f61ee32a..07ddf4291 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = multi_platform_sle,multi_platform_rhel
-+# platform = multi_platform_sle,multi_platform_rhel,multi_platform_almalinux
- # reboot = false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/bash/shared.sh
-index ed9771d0d..665d2cc0f 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = multi_platform_sle,multi_platform_rhel,multi_platform_ubuntu
-+# platform = multi_platform_sle,multi_platform_rhel,multi_platform_almalinux,multi_platform_ubuntu
- 
- # Perform the remediation for both possible tools: 'auditctl' and 'augenrules'
- {{{ bash_fix_audit_watch_rule("auditctl", "/sbin/modprobe", "x", "modules") }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_mount/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_mount/rule.yml
-index 817ec3f12..2b795cc59 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_mount/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_mount/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-@@ -50,7 +50,7 @@ references:
-     stigid@ol7: OL07-00-030740
-     stigid@ol8: OL08-00-030300
-     stigid@rhel7: RHEL-07-030740
--    stigid@rhel8: RHEL-08-030300
-+    stigid@almalinux8: RHEL-08-030300
-     stigid@rhel9: RHEL-09-654180
-     stigid@sle12: SLES-12-020290
-     stigid@ubuntu2004: UBTU-20-010138
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_mount_nfs/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_mount_nfs/rule.yml
-index 54e0d6227..e4bb98755 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_mount_nfs/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_mount_nfs/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newgidmap/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newgidmap/rule.yml
-index a2014eb70..fb66f51e8 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newgidmap/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newgidmap/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newgrp/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newgrp/rule.yml
-index c1ffea143..43cd01980 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newgrp/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newgrp/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-@@ -60,7 +60,7 @@ references:
-     stigid@ol7: OL07-00-030710
-     stigid@ol8: OL08-00-030350
-     stigid@rhel7: RHEL-07-030710
--    stigid@rhel8: RHEL-08-030350
-+    stigid@almalinux8: RHEL-08-030350
-     stigid@rhel9: RHEL-09-654110
-     stigid@sle12: SLES-12-020570
-     stigid@sle15: SLES-15-030090
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newuidmap/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newuidmap/rule.yml
-index 32f9f451e..7f92479da 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newuidmap/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newuidmap/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pam_timestamp_check/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pam_timestamp_check/rule.yml
-index 1a09558ec..05cb1d14d 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pam_timestamp_check/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pam_timestamp_check/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-@@ -64,7 +64,7 @@ references:
-     stigid@ol7: OL07-00-030810
-     stigid@ol8: OL08-00-030340
-     stigid@rhel7: RHEL-07-030810
--    stigid@rhel8: RHEL-08-030340
-+    stigid@almalinux8: RHEL-08-030340
-     stigid@rhel9: RHEL-09-654115
-     stigid@sle12: SLES-12-020720
-     stigid@sle15: SLES-15-030510
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_passwd/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_passwd/rule.yml
-index 25bfa1d00..7c4339a92 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_passwd/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_passwd/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-@@ -58,7 +58,7 @@ references:
-     stigid@ol7: OL07-00-030630
-     stigid@ol8: OL08-00-030290
-     stigid@rhel7: RHEL-07-030630
--    stigid@rhel8: RHEL-08-030290
-+    stigid@almalinux8: RHEL-08-030290
-     stigid@rhel9: RHEL-09-654120
-     stigid@sle12: SLES-12-020550
-     stigid@sle15: SLES-15-030070
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pkexec/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pkexec/rule.yml
-index 53dc91957..e723f2f3d 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pkexec/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pkexec/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_polkit_helper/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_polkit_helper/rule.yml
-index bc443d98c..1be0a3f02 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_polkit_helper/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_polkit_helper/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_postdrop/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_postdrop/rule.yml
-index ffa07f18f..45cfa1ddf 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_postdrop/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_postdrop/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-@@ -57,7 +57,7 @@ references:
-     stigid@ol7: OL07-00-030760
-     stigid@ol8: OL08-00-030311
-     stigid@rhel7: RHEL-07-030760
--    stigid@rhel8: RHEL-08-030311
-+    stigid@almalinux8: RHEL-08-030311
-     stigid@rhel9: RHEL-09-654125
- 
- {{{ ocil_fix_srg_privileged_command("postdrop") }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_postqueue/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_postqueue/rule.yml
-index 0abec84ef..98988a139 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_postqueue/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_postqueue/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-@@ -57,7 +57,7 @@ references:
-     stigid@ol7: OL07-00-030770
-     stigid@ol8: OL08-00-030312
-     stigid@rhel7: RHEL-07-030770
--    stigid@rhel8: RHEL-08-030312
-+    stigid@almalinux8: RHEL-08-030312
-     stigid@rhel9: RHEL-09-654130
- 
- {{{ ocil_fix_srg_privileged_command("postqueue") }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pt_chown/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pt_chown/rule.yml
-index 35e31c140..266b93695 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pt_chown/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_pt_chown/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_rmmod/ansible/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_rmmod/ansible/shared.yml
-index f3c3324e2..d5545d32c 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_rmmod/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_rmmod/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = multi_platform_sle,multi_platform_rhel
-+# platform = multi_platform_sle,multi_platform_rhel,multi_platform_almalinux
- # reboot = false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_rmmod/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_rmmod/bash/shared.sh
-index bf0a58b43..0b13f7c0d 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_rmmod/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_rmmod/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
- 
- # Perform the remediation for both possible tools: 'auditctl' and 'augenrules'
- {{{ bash_fix_audit_watch_rule("auditctl", "/sbin/rmmod", "x", "modules") }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_ssh_agent/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_ssh_agent/rule.yml
-index c6faead32..e255e3cd2 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_ssh_agent/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_ssh_agent/rule.yml
-@@ -39,7 +39,7 @@ references:
-     nist@sle12: AU-3,AU-3.1,AU-12(a),AU-12(c),AU-12.1(a),AU-12.1(ii),AU-12.1(iv),MA-4(1)(a)
-     srg: SRG-OS-000037-GPOS-00015,SRG-OS-000042-GPOS-00020,SRG-OS-000062-GPOS-00031,SRG-OS-000392-GPOS-00172,SRG-OS-000462-GPOS-00206,SRG-OS-000471-GPOS-00215,SRG-APP-000495-CTR-001235
-     stigid@ol8: OL08-00-030280
--    stigid@rhel8: RHEL-08-030280
-+    stigid@almalinux8: RHEL-08-030280
-     stigid@rhel9: RHEL-09-654135
-     stigid@sle12: SLES-12-020310
-     stigid@sle15: SLES-15-030370
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_ssh_keysign/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_ssh_keysign/rule.yml
-index a62411297..7a50a8704 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_ssh_keysign/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_ssh_keysign/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-@@ -67,7 +67,7 @@ references:
-     stigid@ol7: OL07-00-030780
-     stigid@ol8: OL08-00-030320
-     stigid@rhel7: RHEL-07-030780
--    stigid@rhel8: RHEL-08-030320
-+    stigid@almalinux8: RHEL-08-030320
-     stigid@rhel9: RHEL-09-654140
-     stigid@sle12: SLES-12-020320
-     stigid@sle15: SLES-15-030060
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_krb5_child/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_krb5_child/rule.yml
-index 83273d633..6aec3a8fd 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_krb5_child/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_krb5_child/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_ldap_child/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_ldap_child/rule.yml
-index 0e7b0caf1..ce741d01d 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_ldap_child/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_ldap_child/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_proxy_child/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_proxy_child/rule.yml
-index 88d9a1d49..95492b5fa 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_proxy_child/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_proxy_child/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_selinux_child/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_selinux_child/rule.yml
-index 880059066..eb9f79a41 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_selinux_child/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sssd_selinux_child/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_su/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_su/rule.yml
-index 1b4f74df5..5a4ceb78f 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_su/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_su/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-@@ -59,7 +59,7 @@ references:
-     stigid@ol7: OL07-00-030680
-     stigid@ol8: OL08-00-030190
-     stigid@rhel7: RHEL-07-030680
--    stigid@rhel8: RHEL-08-030190
-+    stigid@almalinux8: RHEL-08-030190
-     stigid@rhel9: RHEL-09-654145
-     stigid@sle12: SLES-12-020250
-     stigid@sle15: SLES-15-030550
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sudo/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sudo/rule.yml
-index a2a9261e9..a667f3c47 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sudo/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sudo/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-@@ -60,7 +60,7 @@ references:
-     stigid@ol7: OL07-00-030690
-     stigid@ol8: OL08-00-030550
-     stigid@rhel7: RHEL-07-030690
--    stigid@rhel8: RHEL-08-030550
-+    stigid@almalinux8: RHEL-08-030550
-     stigid@rhel9: RHEL-09-654150
-     stigid@sle12: SLES-12-020260
-     stigid@sle15: SLES-15-030560
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sudoedit/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sudoedit/rule.yml
-index f9af68594..7a67ffd99 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sudoedit/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sudoedit/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_umount/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_umount/rule.yml
-index 3cc450968..a1fad3d89 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_umount/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_umount/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-@@ -58,7 +58,7 @@ references:
-     stigid@ol7: OL07-00-030750
-     stigid@ol8: OL08-00-030301
-     stigid@rhel7: RHEL-07-030750
--    stigid@rhel8: RHEL-08-030301
-+    stigid@almalinux8: RHEL-08-030301
-     stigid@rhel9: RHEL-09-654030
-     stigid@sle12: SLES-12-020300
-     stigid@ubuntu2004: UBTU-20-010139
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_unix_chkpwd/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_unix_chkpwd/rule.yml
-index 8caef5913..68f4808c4 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_unix_chkpwd/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_unix_chkpwd/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-@@ -60,7 +60,7 @@ references:
-     stigid@ol7: OL07-00-030640
-     stigid@ol8: OL08-00-030317
-     stigid@rhel7: RHEL-07-030640
--    stigid@rhel8: RHEL-08-030317
-+    stigid@almalinux8: RHEL-08-030317
-     stigid@rhel9: RHEL-09-654160
-     stigid@sle12: SLES-12-020680
-     stigid@sle15: SLES-15-030110
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_unix_update/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_unix_update/rule.yml
-index 3b477a26b..6ab8406a2 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_unix_update/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_unix_update/rule.yml
-@@ -37,7 +37,7 @@ references:
-     disa: CCI-000130,CCI-000135,CCI-000169,CCI-000172,CCI-002884
-     srg: SRG-OS-000037-GPOS-00015,SRG-OS-000042-GPOS-00020,SRG-OS-000062-GPOS-00031,SRG-OS-000064-GPOS-00033,SRG-OS-000392-GPOS-00172,SRG-OS-000462-GPOS-00206,SRG-OS-000471-GPOS-00215,SRG-APP-000495-CTR-001235
-     stigid@ol8: OL08-00-030310
--    stigid@rhel8: RHEL-08-030310
-+    stigid@almalinux8: RHEL-08-030310
-     stigid@rhel9: RHEL-09-654165
-     stigid@ubuntu2004: UBTU-20-010173
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_userhelper/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_userhelper/rule.yml
-index f61686df7..53ec6290b 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_userhelper/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_userhelper/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-@@ -56,7 +56,7 @@ references:
-     stigid@ol7: OL07-00-030670
-     stigid@ol8: OL08-00-030315
-     stigid@rhel7: RHEL-07-030670
--    stigid@rhel8: RHEL-08-030315
-+    stigid@almalinux8: RHEL-08-030315
-     stigid@rhel9: RHEL-09-654170
- 
- {{{ ocil_fix_srg_privileged_command("userhelper") }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_usermod/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_usermod/rule.yml
-index cfcaa17da..bd89fa211 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_usermod/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_usermod/rule.yml
-@@ -45,7 +45,7 @@ references:
-     nist@sle12: AU-3,AU-12(a),AU-12(c),MA-4(1)(a)
-     srg: SRG-OS-000037-GPOS-00015,SRG-OS-000042-GPOS-00020,SRG-OS-000062-GPOS-00031,SRG-OS-000392-GPOS-00172,SRG-OS-000462-GPOS-00206,SRG-OS-000471-GPOS-00215,SRG-OS-000466-GPOS-00210,SRG-APP-000495-CTR-001235,SRG-APP-000499-CTR-001255
-     stigid@ol8: OL08-00-030560
--    stigid@rhel8: RHEL-08-030560
-+    stigid@almalinux8: RHEL-08-030560
-     stigid@rhel9: RHEL-09-654175
-     stigid@sle12: SLES-12-020700
-     stigid@sle15: SLES-15-030500
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_usernetctl/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_usernetctl/rule.yml
-index fe6140d32..f1602a878 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_usernetctl/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_usernetctl/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol8", "ol9", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_utempter/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_utempter/rule.yml
-index c14eefeee..0a87e80ec 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_utempter/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_utempter/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_write/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_write/rule.yml
-index c8c5434f0..385ffcd14 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_write/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_write/rule.yml
-@@ -1,4 +1,4 @@
--{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-+{{%- if product in ["fedora", "ol7", "ol8", "ol9", "rhcos4", "rhel7", "rhel8", "almalinux8", "rhel9", "sle12", "sle15", "ubuntu2004", "ubuntu2204"] %}}
-   {{%- set perm_x="-F perm=x " %}}
- {{%- endif %}}
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_immutable/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_immutable/bash/shared.sh
-index b57078075..5d03b92a6 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_immutable/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_immutable/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
- 
- # Traverse all of:
- #
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_immutable/kubernetes/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_immutable/kubernetes/shared.yml
-index 26d02c24e..28daa9106 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_immutable/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_immutable/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_immutable/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_immutable/rule.yml
-index 625f9077a..ba455203e 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_immutable/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_immutable/rule.yml
-@@ -56,7 +56,7 @@ references:
-     pcidss4: "10.3.2"
-     srg: SRG-OS-000057-GPOS-00027,SRG-OS-000058-GPOS-00028,SRG-OS-000059-GPOS-00029,SRG-APP-000119-CTR-000245,SRG-APP-000120-CTR-000250
-     stigid@ol8: OL08-00-030121
--    stigid@rhel8: RHEL-08-030121
-+    stigid@almalinux8: RHEL-08-030121
-     stigid@rhel9: RHEL-09-654275
- 
- ocil_clause: 'the audit system is not set to be immutable by adding the "-e 2" option to the end of "/etc/audit/audit.rules"'
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_immutable_login_uids/ansible/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_immutable_login_uids/ansible/shared.yml
-index 94768073f..6fd009b50 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_immutable_login_uids/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_immutable_login_uids/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle
- # reboot = false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_immutable_login_uids/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_immutable_login_uids/rule.yml
-index 15519eec3..c1630d0f4 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_immutable_login_uids/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_immutable_login_uids/rule.yml
-@@ -31,7 +31,7 @@ identifiers:
- references:
-     disa: CCI-000162,CCI-000163,CCI-000164
-     srg: SRG-OS-000462-GPOS-00206,SRG-OS-000475-GPOS-00220,SRG-OS-000057-GPOS-00027,SRG-OS-000058-GPOS-00028,SRG-OS-000059-GPOS-00029
--    stigid@rhel8: RHEL-08-030122
-+    stigid@almalinux8: RHEL-08-030122
-     stigid@rhel9: RHEL-09-654270
- 
- ocil_clause: 'the system is not configured to make login UIDs immutable'
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_mac_modification/ansible/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_mac_modification/ansible/shared.yml
-index e55119fd1..2e7514b51 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_mac_modification/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_mac_modification/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_mac_modification/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_mac_modification/bash/shared.sh
-index 79440e79b..614a4e09c 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_mac_modification/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_mac_modification/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
- 
- # Perform the remediation for both possible tools: 'auditctl' and 'augenrules'
- {{{ bash_fix_audit_watch_rule("auditctl", "/etc/selinux/", "wa", "MAC-policy") }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_mac_modification/kubernetes/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_mac_modification/kubernetes/shared.yml
-index 889f83178..7896d4cb1 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_mac_modification/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_mac_modification/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_mac_modification_usr_share/ansible/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_mac_modification_usr_share/ansible/shared.yml
-index 496670fad..a9cce0a56 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_mac_modification_usr_share/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_mac_modification_usr_share/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_rhv,multi_platform_sle
-+# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhv,multi_platform_sle
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_mac_modification_usr_share/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_mac_modification_usr_share/bash/shared.sh
-index b61368c0c..eb3bf47f9 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_mac_modification_usr_share/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_mac_modification_usr_share/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_rhv,multi_platform_sle,multi_platform_ubuntu
-+# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhv,multi_platform_sle,multi_platform_ubuntu
- 
- # Perform the remediation for both possible tools: 'auditctl' and 'augenrules'
- {{{ bash_fix_audit_watch_rule("auditctl", "/usr/share/selinux/", "wa", "MAC-policy") }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_media_export/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_media_export/rule.yml
-index 9b81fe727..a2ed7fd50 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_media_export/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_media_export/rule.yml
-@@ -58,7 +58,7 @@ references:
-     stigid@ol7: OL07-00-030740
-     stigid@ol8: OL08-00-030302
-     stigid@rhel7: RHEL-07-030740
--    stigid@rhel8: RHEL-08-030302
-+    stigid@almalinux8: RHEL-08-030302
-     stigid@sle12: SLES-12-020290
-     stigid@sle15: SLES-15-030350
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_networkconfig_modification/ansible/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_networkconfig_modification/ansible/shared.yml
-index 5eaed26cb..7f02f6431 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_networkconfig_modification/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_networkconfig_modification/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle,multi_platform_debian
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle,multi_platform_debian
- # reboot =false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_networkconfig_modification/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_networkconfig_modification/bash/shared.sh
-index 06bbeb9fb..545ad2377 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_networkconfig_modification/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_networkconfig_modification/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
- 
- # First perform the remediation of the syscall rule
- # Retrieve hardware architecture of the underlying system
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_session_events/ansible/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_session_events/ansible/shared.yml
-index 58be87f4b..3adce26dc 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_session_events/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_session_events/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle,multi_platform_debian
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle,multi_platform_debian
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_session_events/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_session_events/bash/shared.sh
-index bd42cc0f1..366b790a4 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_session_events/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_session_events/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
- 
- # Perform the remediation for both possible tools: 'auditctl' and 'augenrules'
- {{{ bash_fix_audit_watch_rule("auditctl", "/var/run/utmp", "wa", "session") }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_session_events/kubernetes/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_session_events/kubernetes/shared.yml
-index 8b2377d44..39c2bba69 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_session_events/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_session_events/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_sudoers/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_sudoers/rule.yml
-index 72245ee79..704574ae6 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_sudoers/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_sudoers/rule.yml
-@@ -32,7 +32,7 @@ references:
-     disa: CCI-000018,CCI-000130,CCI-000135,CCI-000169,CCI-000172,CCI-001403,CCI-001404,CCI-002130,CCI-002132,CCI-002884
-     srg: SRG-OS-000004-GPOS-00004,SRG-OS-000037-GPOS-00015,SRG-OS-000042-GPOS-00020,SRG-OS-000062-GPOS-00031,SRG-OS-000304-GPOS-00121,SRG-OS-000392-GPOS-00172,SRG-OS-000462-GPOS-00206,SRG-OS-000470-GPOS-00214,SRG-OS-000471-GPOS-00215,SRG-OS-000239-GPOS-00089,SRG-OS-000240-GPOS-00090,SRG-OS-000241-GPOS-00091,SRG-OS-000303-GPOS-00120,SRG-OS-000466-GPOS-00210,SRG-OS-000476-GPOS-00221,SRG-APP-000495-CTR-001235,SRG-APP-000499-CTR-001255,SRG-APP-000503-CTR-001275
-     stigid@ol8: OL08-00-030171
--    stigid@rhel8: RHEL-08-030171
-+    stigid@almalinux8: RHEL-08-030171
-     stigid@rhel9: RHEL-09-654215
- 
- ocil_clause: 'the command does not return a line, or the line is commented out'
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_sudoers_d/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_sudoers_d/rule.yml
-index dd9b966dd..ac7c82949 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_sudoers_d/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_sudoers_d/rule.yml
-@@ -32,7 +32,7 @@ references:
-     disa: CCI-000018,CCI-000130,CCI-000135,CCI-000169,CCI-000172,CCI-001403,CCI-001404,CCI-002130,CCI-002132,CCI-002884
-     srg: SRG-OS-000004-GPOS-00004,SRG-OS-000037-GPOS-00015,SRG-OS-000042-GPOS-00020,SRG-OS-000062-GPOS-00031,SRG-OS-000304-GPOS-00121,SRG-OS-000392-GPOS-00172,SRG-OS-000462-GPOS-00206,SRG-OS-000470-GPOS-00214,SRG-OS-000471-GPOS-00215,SRG-OS-000239-GPOS-00089,SRG-OS-000240-GPOS-00090,SRG-OS-000241-GPOS-00091,SRG-OS-000303-GPOS-00120,SRG-OS-000466-GPOS-00210,SRG-OS-000476-GPOS-00221,SRG-APP-000495-CTR-001235,SRG-APP-000499-CTR-001255,SRG-APP-000503-CTR-001275
-     stigid@ol8: OL08-00-030172
--    stigid@rhel8: RHEL-08-030172
-+    stigid@almalinux8: RHEL-08-030172
-     stigid@rhel9: RHEL-09-654220
- 
- ocil_clause: 'the command does not return a line, or the line is commented out'
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_auid_privilege_function/ansible/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_auid_privilege_function/ansible/shared.yml
-index 64e8dde85..3d4f65278 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_auid_privilege_function/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_auid_privilege_function/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = multi_platform_rhel
-+# platform = multi_platform_rhel,multi_platform_almalinux
- # reboot = false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_auid_privilege_function/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_auid_privilege_function/bash/shared.sh
-index 15d6fa4e2..7f98c9915 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_auid_privilege_function/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_auid_privilege_function/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = multi_platform_rhel
-+# platform = multi_platform_rhel,multi_platform_almalinux
- 
- # First perform the remediation of the syscall rule
- # Retrieve hardware architecture of the underlying system
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/ansible/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/ansible/shared.yml
-index 88b06cff6..3f5be4c47 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
-+# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
- # reboot = false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/bash/shared.sh
-index 8fdd7e75a..9c16b41cc 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
-+# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
- 
- # First perform the remediation of the syscall rule
- # Retrieve hardware architecture of the underlying system
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/kubernetes/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/kubernetes/shared.yml
-index 323a798b1..46fad7416 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/rule.yml
-index 9973488bd..b70cd79a9 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_suid_privilege_function/rule.yml
-@@ -57,7 +57,7 @@ references:
-     stigid@ol7: OL07-00-030360
-     stigid@ol8: OL08-00-030000
-     stigid@rhel7: RHEL-07-030360
--    stigid@rhel8: RHEL-08-030000
-+    stigid@almalinux8: RHEL-08-030000
-     stigid@rhel9: RHEL-09-654010
-     stigid@sle12: SLES-12-020240
-     stigid@sle15: SLES-15-030640
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_sysadmin_actions/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_sysadmin_actions/bash/shared.sh
-index 027623091..c1c2c1952 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_sysadmin_actions/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_sysadmin_actions/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_rhv,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
-+# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhv,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
- 
- # Perform the remediation for both possible tools: 'auditctl' and 'augenrules'
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_sysadmin_actions/kubernetes/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_sysadmin_actions/kubernetes/shared.yml
-index 336beb2b7..26c47e462 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_sysadmin_actions/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_sysadmin_actions/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification/bash/shared.sh
-index 07965e2c7..908fa6e54 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_sle
-+# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
- 
- # Perform the remediation for both possible tools: 'auditctl' and 'augenrules'
- {{{ bash_fix_audit_watch_rule("auditctl", "/etc/group", "wa", "audit_rules_usergroup_modification") }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification_group/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification_group/rule.yml
-index 6cfd87a9f..a27f12f90 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification_group/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification_group/rule.yml
-@@ -63,7 +63,7 @@ references:
-     stigid@ol7: OL07-00-030871
-     stigid@ol8: OL08-00-030170
-     stigid@rhel7: RHEL-07-030871
--    stigid@rhel8: RHEL-08-030170
-+    stigid@almalinux8: RHEL-08-030170
-     stigid@rhel9: RHEL-09-654225
-     stigid@sle12: SLES-12-020210
-     stigid@sle15: SLES-15-030010
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification_gshadow/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification_gshadow/rule.yml
-index 9f4c4db6d..53bad69c9 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification_gshadow/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification_gshadow/rule.yml
-@@ -63,7 +63,7 @@ references:
-     stigid@ol7: OL07-00-030872
-     stigid@ol8: OL08-00-030160
-     stigid@rhel7: RHEL-07-030872
--    stigid@rhel8: RHEL-08-030160
-+    stigid@almalinux8: RHEL-08-030160
-     stigid@rhel9: RHEL-09-654230
-     stigid@sle12: SLES-12-020590
-     stigid@sle15: SLES-15-030040
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification_opasswd/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification_opasswd/rule.yml
-index cf9223a9f..d087916ac 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification_opasswd/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification_opasswd/rule.yml
-@@ -64,7 +64,7 @@ references:
-     stigid@ol7: OL07-00-030874
-     stigid@ol8: OL08-00-030140
-     stigid@rhel7: RHEL-07-030874
--    stigid@rhel8: RHEL-08-030140
-+    stigid@almalinux8: RHEL-08-030140
-     stigid@rhel9: RHEL-09-654235
-     stigid@sle12: SLES-12-020230
-     stigid@sle15: SLES-15-030030
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification_passwd/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification_passwd/rule.yml
-index c5feebc9a..94b4ae1a0 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification_passwd/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification_passwd/rule.yml
-@@ -63,7 +63,7 @@ references:
-     stigid@ol7: OL07-00-030870
-     stigid@ol8: OL08-00-030150
-     stigid@rhel7: RHEL-07-030870
--    stigid@rhel8: RHEL-08-030150
-+    stigid@almalinux8: RHEL-08-030150
-     stigid@rhel9: RHEL-09-654240
-     stigid@sle12: SLES-12-020200
-     stigid@sle15: SLES-15-030000
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification_shadow/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification_shadow/rule.yml
-index 67357a164..b7d05b2af 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification_shadow/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_rules_usergroup_modification_shadow/rule.yml
-@@ -63,7 +63,7 @@ references:
-     stigid@ol7: OL07-00-030873
-     stigid@ol8: OL08-00-030130
-     stigid@rhel7: RHEL-07-030873
--    stigid@rhel8: RHEL-08-030130
-+    stigid@almalinux8: RHEL-08-030130
-     stigid@rhel9: RHEL-09-654245
-     stigid@sle12: SLES-12-020220
-     stigid@sle15: SLES-15-030020
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_adjtimex/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_adjtimex/bash/shared.sh
-index 24b4da6b6..1b2b4dd27 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_adjtimex/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_adjtimex/bash/shared.sh
-@@ -1,3 +1,3 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
- 
- {{{ bash_perform_audit_adjtimex_settimeofday_stime_remediation() }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_adjtimex/kubernetes/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_adjtimex/kubernetes/shared.yml
-index 49c97e395..51f48c0f9 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_adjtimex/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_adjtimex/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_clock_settime/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_clock_settime/bash/shared.sh
-index c511ede45..617b679c5 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_clock_settime/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_clock_settime/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
- 
- # First perform the remediation of the syscall rule
- # Retrieve hardware architecture of the underlying system
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_clock_settime/kubernetes/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_clock_settime/kubernetes/shared.yml
-index ec76157d4..0f9e9f7cc 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_clock_settime/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_clock_settime/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_settimeofday/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_settimeofday/bash/shared.sh
-index b7f44ab38..e6b1d1856 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_settimeofday/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_settimeofday/bash/shared.sh
-@@ -1,3 +1,3 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
- 
- {{{ bash_perform_audit_adjtimex_settimeofday_stime_remediation() }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_settimeofday/kubernetes/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_settimeofday/kubernetes/shared.yml
-index 3f43030e9..85e9a47c8 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_settimeofday/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_settimeofday/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_stime/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_stime/bash/shared.sh
-index b7f44ab38..e6b1d1856 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_stime/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_stime/bash/shared.sh
-@@ -1,3 +1,3 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
- 
- {{{ bash_perform_audit_adjtimex_settimeofday_stime_remediation() }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_stime/kubernetes/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_stime/kubernetes/shared.yml
-index 8a58bbc38..1a73014dc 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_stime/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_stime/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_watch_localtime/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_watch_localtime/bash/shared.sh
-index 0899dcded..fa722e21d 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_watch_localtime/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_watch_localtime/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian
- 
- # Perform the remediation for both possible tools: 'auditctl' and 'augenrules'
- {{{ bash_fix_audit_watch_rule("auditctl", "/etc/localtime", "wa", "audit_time_rules") }}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_watch_localtime/kubernetes/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_watch_localtime/kubernetes/shared.yml
-index 140506b60..4290a051f 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_watch_localtime/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/audit_time_rules/audit_rules_time_watch_localtime/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/directory_access_var_log_audit/ansible/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/directory_access_var_log_audit/ansible/shared.yml
-index ec17adf55..0ecb4079c 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/directory_access_var_log_audit/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/directory_access_var_log_audit/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_rhv
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol,multi_platform_rhv
- # reboot = false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/directory_group_ownership_var_log_audit/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/directory_group_ownership_var_log_audit/rule.yml
-index 743a16423..f0a11d0db 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/directory_group_ownership_var_log_audit/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/directory_group_ownership_var_log_audit/rule.yml
-@@ -35,7 +35,7 @@ references:
-     pcidss: Req-10.5.1
-     srg: SRG-OS-000057-GPOS-00027,SRG-OS-000058-GPOS-00028,SRG-OS-000059-GPOS-00029,SRG-OS-000206-GPOS-00084
-     stigid@ol8: OL08-00-030110
--    stigid@rhel8: RHEL-08-030110
-+    stigid@almalinux8: RHEL-08-030110
-     stigid@rhel9: RHEL-09-653080
- 
- ocil: |-
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/directory_group_ownership_var_log_audit/tests/correct_value_non-root_group.pass.sh b/linux_os/guide/system/auditing/auditd_configure_rules/directory_group_ownership_var_log_audit/tests/correct_value_non-root_group.pass.sh
-index 09d4e8ff5..6a8e8bdab 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/directory_group_ownership_var_log_audit/tests/correct_value_non-root_group.pass.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/directory_group_ownership_var_log_audit/tests/correct_value_non-root_group.pass.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_rhel
-+# platform = multi_platform_rhel,multi_platform_almalinux
- 
- groupadd group_test
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/directory_ownership_var_log_audit/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/directory_ownership_var_log_audit/rule.yml
-index 301bd5e57..ecf98a56a 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/directory_ownership_var_log_audit/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/directory_ownership_var_log_audit/rule.yml
-@@ -31,7 +31,7 @@ references:
-     pcidss: Req-10.5.1
-     srg: SRG-OS-000057-GPOS-00027,SRG-OS-000058-GPOS-00028,SRG-OS-000059-GPOS-00029,SRG-OS-000206-GPOS-00084
-     stigid@ol8: OL08-00-030100
--    stigid@rhel8: RHEL-08-030100
-+    stigid@almalinux8: RHEL-08-030100
-     stigid@rhel9: RHEL-09-653085
- 
- ocil_clause: the directory is not owned by root
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/bash/shared.sh
-index 0dad1bfe1..29632f729 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_ubuntu
-+# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_ubuntu
- 
- if LC_ALL=C grep -iw ^log_file /etc/audit/auditd.conf; then
-   DIR=$(awk -F "=" '/^log_file/ {print $2}' /etc/audit/auditd.conf | tr -d ' ' | rev | cut -d"/" -f2- | rev)
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/rule.yml
-index 01955927f..ebead7aa0 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/rule.yml
-@@ -3,7 +3,7 @@ documentation_complete: true
- title: 'System Audit Logs Must Have Mode 0750 or Less Permissive'
- 
- description: |-
--    {{% if product in ["ol8", "rhel8"] %}}
-+    {{% if product in ["ol8", "rhel8", "almalinux8"] %}}
-     Verify the audit log directories have a mode of "0700" or less permissive by first determining
-     where the audit logs are stored with the following command:
-     <pre>$ sudo grep -iw log_file /etc/audit/auditd.conf
-@@ -49,7 +49,7 @@ references:
-     nist-csf: DE.AE-3,DE.AE-5,PR.AC-4,PR.DS-5,PR.PT-1,RS.AN-1,RS.AN-4
-     srg: SRG-OS-000057-GPOS-00027,SRG-OS-000058-GPOS-00028,SRG-OS-000059-GPOS-00029
-     stigid@ol8: OL08-00-030120
--    stigid@rhel8: RHEL-08-030120
-+    stigid@almalinux8: RHEL-08-030120
-     stigid@ubuntu2004: UBTU-20-010128
- 
- ocil_clause: 'audit logs have a more permissive mode'
-@@ -73,7 +73,7 @@ ocil: |-
- 
-     Replace "[audit_log_directory]" to the correct audit log directory path, by default this location is "/var/log/audit".
- 
--    {{% if product in ["ol8", "rhel8"] %}}
-+    {{% if product in ["ol8", "rhel8", "almalinux8"] %}}
-     The correct permissions are 0700
-     {{% else %}}
-     If the log_group is "root" or is not set, the correct permissions are 0700, otherwise they are 0750.
-@@ -86,7 +86,7 @@ fixtext: |-
- 
-     $ sudo grep "^log_file" /etc/audit/auditd.conf
- 
--    {{% if product in ["ol8", "rhel8"] %}}
-+    {{% if product in ["ol8", "rhel8", "almalinux8"] %}}
-     Set the correct permissions mode by the following command:
- 
-     $ sudo chmod 0700 [audit_log_directory]
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/correct_value_0700.pass.sh b/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/correct_value_0700.pass.sh
-index 7e8c49123..999d914cd 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/correct_value_0700.pass.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/correct_value_0700.pass.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_ol,multi_platform_rhel
-+# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- 
- source common_0700.sh
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/correct_value_default_0700.pass.sh b/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/correct_value_default_0700.pass.sh
-index 7cfadc195..3bb0cefbb 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/correct_value_default_0700.pass.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/correct_value_default_0700.pass.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_ol,multi_platform_rhel
-+# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- 
- source common_0700.sh
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/incorrect_value_0700.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/incorrect_value_0700.fail.sh
-index 3654389ed..64e3e8ebc 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/incorrect_value_0700.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/incorrect_value_0700.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_ol,multi_platform_rhel
-+# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- 
- source common_0700.sh
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/incorrect_value_default_file_0700.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/incorrect_value_default_file_0700.fail.sh
-index b93254a4b..c7d66ccbb 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/incorrect_value_default_file_0700.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/directory_permissions_var_log_audit/tests/incorrect_value_default_file_0700.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_ol,multi_platform_rhel
-+# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- 
- source common_0700.sh
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/rule.yml
-index 523930ea9..5038a6320 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/rule.yml
-@@ -45,7 +45,7 @@ references:
-     pcidss4: '10.3.2'
-     srg: SRG-OS-000057-GPOS-00027,SRG-OS-000058-GPOS-00028,SRG-OS-000059-GPOS-00029,SRG-OS-000206-GPOS-00084
-     stigid@ol8: OL08-00-030090
--    stigid@rhel8: RHEL-08-030090
-+    stigid@almalinux8: RHEL-08-030090
-     stigid@ubuntu2004: UBTU-20-010124
- 
- ocil: |-
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/tests/correct_value_non-root_group.pass.sh b/linux_os/guide/system/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/tests/correct_value_non-root_group.pass.sh
-index 6f19e15c6..b1d995c61 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/tests/correct_value_non-root_group.pass.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/tests/correct_value_non-root_group.pass.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_rhel
-+# platform = multi_platform_rhel,multi_platform_almalinux
- 
- if grep -iwq "log_file" /etc/audit/auditd.conf; then
-     FILE=$(awk -F "=" '/^log_file/ {print $2}' /etc/audit/auditd.conf | tr -d ' ')
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/tests/wrong_value_non-root_group.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/tests/wrong_value_non-root_group.fail.sh
-index cf4b02b90..cd69f17c2 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/tests/wrong_value_non-root_group.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/file_group_ownership_var_log_audit/tests/wrong_value_non-root_group.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_rhel
-+# platform = multi_platform_rhel,multi_platform_almalinux
- 
- if grep -iwq "log_file" /etc/audit/auditd.conf; then
-     FILE=$(awk -F "=" '/^log_file/ {print $2}' /etc/audit/auditd.conf | tr -d ' ')
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/oval/shared.xml b/linux_os/guide/system/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/oval/shared.xml
-index 95acf5905..18954ffa1 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/oval/shared.xml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/oval/shared.xml
-@@ -6,7 +6,7 @@
-         <extend_definition comment="log_file not set in auditd.conf" definition_ref="auditd_conf_log_file_not_set" negate="true" />
-         <criterion comment="audit log files are root owned" test_ref="test_user_ownership_audit_log_files" />
-       </criteria>
--      {{% if product in ["ol8", "rhel8"] %}}
-+      {{% if product in ["ol8", "rhel8", "almalinux8"] %}}
-       <criteria operator="AND" comment="log_file not set">
-         <extend_definition comment="log_file not set in auditd.conf"
-           definition_ref="auditd_conf_log_file_not_set"/>
-@@ -28,7 +28,7 @@
-     <filter action="include">state_owner_not_root_var_log_audit</filter>
-   </unix:file_object>
-   
--  {{% if product in ["ol8", "rhel8"] %}}
-+  {{% if product in ["ol8", "rhel8", "almalinux8"] %}}
-   <unix:file_test check="all" check_existence="none_exist"
-       comment="var/log/audit/audit.log file uid root"
-       id="test_user_ownership_audit_default_log_files" version="1">
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/rule.yml
-index 041b8d795..184f43d3e 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/rule.yml
-@@ -38,7 +38,7 @@ references:
-     pcidss: Req-10.5.1
-     srg: SRG-OS-000057-GPOS-00027,SRG-OS-000058-GPOS-00028,SRG-OS-000059-GPOS-00029,SRG-OS-000206-GPOS-00084
-     stigid@ol8: OL08-00-030080
--    stigid@rhel8: RHEL-08-030080
-+    stigid@almalinux8: RHEL-08-030080
-     stigid@ubuntu2004: UBTU-20-010123
- 
- ocil_clause: "the audit log is not owned by root"
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/correct_value_default_file.pass.sh b/linux_os/guide/system/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/correct_value_default_file.pass.sh
-index 3a0d9a4e9..ab43ceb2b 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/correct_value_default_file.pass.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/correct_value_default_file.pass.sh
-@@ -1,4 +1,4 @@
--# platform = multi_platform_ol,multi_platform_rhel
-+# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- #!/bin/bash
- 
- sed -i "/^\s*log_file.*/d" /etc/audit/auditd.conf
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/wrong_value.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/wrong_value.fail.sh
-index d597ca07f..75a41c4fd 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/wrong_value.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/wrong_value.fail.sh
-@@ -15,7 +15,7 @@ useradd testuser_123
- touch "/var/log/audit/audit.log"
- chown root "/var/log/audit/audit.log"
- 
--{{% if product in ["ol8", "rhel8"] %}}
-+{{% if product in ["ol8", "rhel8", "almalinux8"] %}}
- touch $FILE
- chown testuser_123 $FILE
- {{% else %}}
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/wrong_value_default_file.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/wrong_value_default_file.fail.sh
-index 1879113b8..8798ae1ae 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/wrong_value_default_file.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/wrong_value_default_file.fail.sh
-@@ -1,4 +1,4 @@
--# platform = multi_platform_ol,multi_platform_rhel
-+# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- #!/bin/bash
- 
- sed -i "/^\s*log_file.*/d" /etc/audit/auditd.conf
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/ansible/shared.yml b/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/ansible/shared.yml
-index 722f6731a..7f1879db2 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle
- # reboot = false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/bash/shared.sh b/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/bash/shared.sh
-index 0b42da512..013401d8c 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = multi_platform_rhel,multi_platform_ol,multi_platform_fedora,multi_platform_rhv,multi_platform_sle,multi_platform_ubuntu
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_ol,multi_platform_fedora,multi_platform_rhv,multi_platform_sle,multi_platform_ubuntu
- 
- if LC_ALL=C grep -iw ^log_file /etc/audit/auditd.conf; then
-     FILE=$(awk -F "=" '/^log_file/ {print $2}' /etc/audit/auditd.conf | tr -d ' ')
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/rule.yml b/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/rule.yml
-index 26a439145..1910462b1 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/rule.yml
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/rule.yml
-@@ -56,7 +56,7 @@ references:
-     stigid@ol7: OL07-00-910055
-     stigid@ol8: OL08-00-030070
-     stigid@rhel7: RHEL-07-910055
--    stigid@rhel8: RHEL-08-030070
-+    stigid@almalinux8: RHEL-08-030070
-     stigid@rhel9: RHEL-09-653090
-     stigid@ubuntu2004: UBTU-20-010122
- 
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/correct_value_0600.pass.sh b/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/correct_value_0600.pass.sh
-index 15023ca70..488ef3e3f 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/correct_value_0600.pass.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/correct_value_0600.pass.sh
-@@ -1,5 +1,5 @@
- #!/bin/bash
--# platform = multi_platform_ol,multi_platform_rhel
-+# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- # packages = audit
- 
- source common_0600.sh
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/correct_value_default_file_0600.pass.sh b/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/correct_value_default_file_0600.pass.sh
-index 04d76809f..6475f83ae 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/correct_value_default_file_0600.pass.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/correct_value_default_file_0600.pass.sh
-@@ -1,5 +1,5 @@
- #!/bin/bash
--# platform = multi_platform_ol,multi_platform_rhel
-+# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- # packages = audit
- 
- source common_0600.sh
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/incorrect_value_0600.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/incorrect_value_0600.fail.sh
-index aea9d1b10..3f045e4c7 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/incorrect_value_0600.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/incorrect_value_0600.fail.sh
-@@ -1,5 +1,5 @@
- #!/bin/bash
--# platform = multi_platform_ol,multi_platform_rhel
-+# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- # packages = audit
- 
- source common_0600.sh
-diff --git a/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/incorrect_value_default_file_0600.fail.sh b/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/incorrect_value_default_file_0600.fail.sh
-index 003e3330f..368540adc 100644
---- a/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/incorrect_value_default_file_0600.fail.sh
-+++ b/linux_os/guide/system/auditing/auditd_configure_rules/file_permissions_var_log_audit/tests/incorrect_value_default_file_0600.fail.sh
-@@ -1,5 +1,5 @@
- #!/bin/bash
--# platform = multi_platform_ol,multi_platform_rhel
-+# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- # packages = audit
- 
- source common_0600.sh
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/ansible/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/ansible/shared.yml
-index 1e0529f08..9ed9948a4 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
- # reboot = false
- # strategy = configure
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/bash/shared.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/bash/shared.sh
-index 53a56e255..554799735 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
- 
- {{{ bash_instantiate_variables("var_audispd_remote_server") }}}
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/tests/audit_remote_server_hostname.pass.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/tests/audit_remote_server_hostname.pass.sh
-index 44d9a1f74..a466bc72d 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/tests/audit_remote_server_hostname.pass.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/tests/audit_remote_server_hostname.pass.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = Red Hat Enterprise Linux 8,multi_platform_fedora
-+# platform = Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_fedora
- 
- . $SHARED/auditd_utils.sh
- prepare_auditd_test_enviroment
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/tests/audit_remote_server_not_there.fail.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/tests/audit_remote_server_not_there.fail.sh
-index 0bfa82083..93b11eb05 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/tests/audit_remote_server_not_there.fail.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/tests/audit_remote_server_not_there.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = Red Hat Enterprise Linux 8,multi_platform_fedora
-+# platform = Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_fedora
- 
- . $SHARED/auditd_utils.sh
- prepare_auditd_test_enviroment
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_configure_sufficiently_large_partition/rule.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_configure_sufficiently_large_partition/rule.yml
-index f902ce228..0be6013c8 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_configure_sufficiently_large_partition/rule.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_configure_sufficiently_large_partition/rule.yml
-@@ -44,7 +44,7 @@ references:
-     nist@sle15: AU-4
-     srg: SRG-OS-000341-GPOS-00132,SRG-OS-000342-GPOS-00133
-     stigid@ol8: OL08-00-030660
--    stigid@rhel8: RHEL-08-030660
-+    stigid@almalinux8: RHEL-08-030660
-     stigid@rhel9: RHEL-09-653030
-     stigid@sle12: SLES-12-020020
-     stigid@sle15: SLES-15-030660
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_disk_full_action/ansible/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_disk_full_action/ansible/shared.yml
-index 942cd0f5d..a53df57b1 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_disk_full_action/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_disk_full_action/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
- # reboot = false
- # strategy = configure
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_disk_full_action/bash/shared.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_disk_full_action/bash/shared.sh
-index 36e7f8cda..842f3922d 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_disk_full_action/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_disk_full_action/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
- 
- {{{ bash_instantiate_variables("var_audispd_disk_full_action") }}}
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/bash/shared.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/bash/shared.sh
-index be3e74b0b..b6f46f51e 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/bash/shared.sh
-@@ -1,7 +1,7 @@
- # platform = multi_platform_all
- 
- AUDISP_REMOTE_CONFIG="{{{ audisp_conf_path }}}/audisp-remote.conf"
--{{% if product in ["rhel8", "fedora", "ol8", "rhv4"] %}}
-+{{% if product in ["rhel8", "almalinux8", "fedora", "ol8", "rhv4"] %}}
- option="^transport"
- value="KRB5"
- {{% else %}}
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/oval/shared.xml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/oval/shared.xml
-index e8d055f90..467e50704 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/oval/shared.xml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/oval/shared.xml
-@@ -2,7 +2,7 @@
- 
- <def-group>
-   <definition class="compliance" id="auditd_audispd_encrypt_sent_records" version="1">
--    {{% if product in ["rhel8", "fedora", "ol8", "rhv4"] %}}
-+    {{% if product in ["rhel8", "almalinux8", "fedora", "ol8", "rhv4"] %}}
-     {{{ oval_metadata("transport setting in " + audisp_config_file_path + " is set to 'KRB5'") }}}
-     {{% else %}}
-     {{{ oval_metadata("enable_krb5 setting in " + audisp_config_file_path + " is set to 'yes'") }}}
-@@ -22,7 +22,7 @@
-     <ind:filepath>{{{ audisp_config_file_path }}}</ind:filepath>
-     <!-- Allow only space (exactly) as delimiter -->
-     <!-- Require at least one space before and after the equal sign -->
--{{% if product in ["rhel8", "fedora", "ol8", "rhv4"] %}}
-+{{% if product in ["rhel8", "almalinux8", "fedora", "ol8", "rhv4"] %}}
-     <ind:pattern operation="pattern match">^[ ]*transport[ ]+=[ ]+KRB5[ ]*$</ind:pattern>
- {{% else %}}
-     <ind:pattern operation="pattern match">^[ ]*enable_krb5[ ]+=[ ]+yes[ ]*$</ind:pattern>
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/rule.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/rule.yml
-index ad68d3a77..7e94d7ac4 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/rule.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/rule.yml
-@@ -6,7 +6,7 @@ title: 'Encrypt Audit Records Sent With audispd Plugin'
- description: |-
-     Configure the operating system to encrypt the transfer of off-loaded audit
-     records onto a different system or media from the system being audited.
--{{% if product in ["rhel8", "fedora", "ol8", "rhv4"] %}}
-+{{% if product in ["rhel8", "almalinux8", "fedora", "ol8", "rhv4"] %}}
-     Set the <tt>transport</tt> option in <pre>{{{ audisp_conf_path }}}/audisp-remote.conf</pre>
-     to <tt>KRB5</tt>.
- {{% else %}}
-@@ -44,7 +44,7 @@ ocil_clause: 'audispd is not encrypting audit records when sent over the network
- ocil: |-
-     To verify the audispd plugin encrypts audit records off-loaded onto a different
-     system or media from the system being audited, run the following command:
--{{% if product in ["rhel8", "fedora", "ol8", "rhv4"] %}}
-+{{% if product in ["rhel8", "almalinux8", "fedora", "ol8", "rhv4"] %}}
-     <pre>$ sudo grep -i transport {{{ audisp_conf_path }}}/audisp-remote.conf</pre>
-     The output should return the following:
-     <pre>transport = KRB5</pre>
-@@ -56,7 +56,7 @@ ocil: |-
- 
- fixtext: |-
-     Configure {{{ full_name }}} to encrypt audit records sent with audispd plugin.
--{{% if product in ["rhel8", "rhel9", "fedora", "ol8", "rhv4"] %}}
-+{{% if product in ["rhel8", "almalinux8", "rhel9", "fedora", "ol8", "rhv4"] %}}
-     Set the "transport" option in "{{{ audisp_conf_path }}}/audisp-remote.conf" to "KRB5".
- {{% else %}}
-     Uncomment the "enable_krb5" option in "{{{ audisp_conf_path }}}/audisp-remote.conf",
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_bogus_value.fail.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_bogus_value.fail.sh
-index 1ee02140b..711b6593d 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_bogus_value.fail.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_bogus_value.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = Red Hat Enterprise Linux 8,multi_platform_fedora
-+# platform = Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_fedora
- 
- . $SHARED/auditd_utils.sh
- prepare_auditd_test_enviroment
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_correct_value.pass.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_correct_value.pass.sh
-index b6775223d..b7fa1f1f4 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_correct_value.pass.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_correct_value.pass.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = Red Hat Enterprise Linux 8,multi_platform_fedora
-+# platform = Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_fedora
- 
- . $SHARED/auditd_utils.sh
- prepare_auditd_test_enviroment
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_not_there.fail.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_not_there.fail.sh
-index bf1c533c6..fb621cfff 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_not_there.fail.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_not_there.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = Red Hat Enterprise Linux 8,multi_platform_fedora
-+# platform = Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_fedora
- 
- . $SHARED/auditd_utils.sh
- prepare_auditd_test_enviroment
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_wrong_value.fail.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_wrong_value.fail.sh
-index 864e97b31..8c16af8f9 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_wrong_value.fail.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/tests/transport_wrong_value.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = Red Hat Enterprise Linux 8,multi_platform_fedora
-+# platform = Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_fedora
- 
- . $SHARED/auditd_utils.sh
- prepare_auditd_test_enviroment
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/ansible/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/ansible/shared.yml
-index 71fc81683..835402712 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
- # reboot = false
- # strategy = configure
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/bash/shared.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/bash/shared.sh
-index d1a513600..8ca091bea 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
- 
- {{{ bash_instantiate_variables("var_audispd_network_failure_action") }}}
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/tests/audisp_network_failure_action_absent.fail.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/tests/audisp_network_failure_action_absent.fail.sh
-index d244d4bd0..ec516de8a 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/tests/audisp_network_failure_action_absent.fail.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/tests/audisp_network_failure_action_absent.fail.sh
-@@ -1,5 +1,5 @@
- #!/bin/bash
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
- 
- . $SHARED/auditd_utils.sh
- prepare_auditd_test_enviroment
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/tests/audisp_network_failure_action_set.pass.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/tests/audisp_network_failure_action_set.pass.sh
-index af96da871..3bcbba05c 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/tests/audisp_network_failure_action_set.pass.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_network_failure_action/tests/audisp_network_failure_action_set.pass.sh
-@@ -1,5 +1,5 @@
- #!/bin/bash
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
- 
- . $SHARED/auditd_utils.sh
- prepare_auditd_test_enviroment
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_activated.pass.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_activated.pass.sh
-index caf9766f5..8b2142f08 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_activated.pass.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_activated.pass.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
-+# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
- # remediation = bash
- 
- . $SHARED/auditd_utils.sh
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_activated_not_there.fail.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_activated_not_there.fail.sh
-index c87268eae..ffa87d06e 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_activated_not_there.fail.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_activated_not_there.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
-+# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
- # remediation = bash
- 
- . $SHARED/auditd_utils.sh
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_not_activated.fail.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_not_activated.fail.sh
-index 0bb1518ef..c54736340 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_not_activated.fail.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_not_activated.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
-+# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
- # remediation = bash
- 
- . $SHARED/auditd_utils.sh
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/ansible/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/ansible/shared.yml
-index b075778f5..d9baf1b4f 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- # reboot = false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/bash/shared.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/bash/shared.sh
-index d0065b38c..7027992a4 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel
-+# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- 
- {{{ bash_instantiate_variables("var_auditd_disk_error_action") }}}
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/kubernetes/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/kubernetes/shared.yml
-index 55f407e01..b9084af21 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/rule.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/rule.yml
-index 73ce2ef8e..e4436d854 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/rule.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action/rule.yml
-@@ -40,7 +40,7 @@ references:
-     nist-csf: DE.AE-3,DE.AE-5,PR.DS-4,PR.PT-1,RS.AN-1,RS.AN-4
-     srg: SRG-OS-000047-GPOS-00023,SRG-APP-000098-CTR-000185,SRG-APP-000099-CTR-000190,SRG-APP-000100-CTR-000195,SRG-APP-000100-CTR-000200,SRG-APP-000109-CTR-000215,SRG-APP-000290-CTR-000670,SRG-APP-000357-CTR-000800
-     stigid@ol8: OL08-00-030040
--    stigid@rhel8: RHEL-08-030040
-+    stigid@almalinux8: RHEL-08-030040
- 
- ocil_clause: 'there is no evidence of appropriate action'
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/ansible/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/ansible/shared.yml
-index 06f4a10c6..ba788edbf 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- # reboot = false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/bash/shared.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/bash/shared.sh
-index 78726bbc6..0a36846ab 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel
-+# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- 
- {{{ bash_instantiate_variables("var_auditd_disk_error_action") }}}
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/kubernetes/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/kubernetes/shared.yml
-index 55f407e01..b9084af21 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_error_action_stig/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/ansible/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/ansible/shared.yml
-index 0adf2b538..376952524 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
- # reboot = false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/bash/shared.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/bash/shared.sh
-index ce4f4d029..6ab8e06dd 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
-+# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
- 
- {{{ bash_instantiate_variables("var_auditd_disk_full_action") }}}
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/kubernetes/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/kubernetes/shared.yml
-index 55f407e01..b9084af21 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/rule.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/rule.yml
-index a4e554260..4f88b276c 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/rule.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action/rule.yml
-@@ -46,7 +46,7 @@ references:
-     nist@sle12: AU-5(b),AU-5.1(iv)
-     srg: SRG-OS-000047-GPOS-00023
-     stigid@ol8: OL08-00-030060
--    stigid@rhel8: RHEL-08-030060
-+    stigid@almalinux8: RHEL-08-030060
-     stigid@sle12: SLES-12-020060
-     stigid@sle15: SLES-15-030590
-     stigid@ubuntu2004: UBTU-20-010118
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/ansible/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/ansible/shared.yml
-index 61cc4751d..7f66a5c15 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
- # reboot = false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/bash/shared.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/bash/shared.sh
-index 8ab6e16ab..110211558 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
-+# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
- 
- {{{ bash_instantiate_variables("var_auditd_disk_full_action") }}}
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/kubernetes/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/kubernetes/shared.yml
-index 55f407e01..b9084af21 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_disk_full_action_stig/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/ansible/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/ansible/shared.yml
-index b82e6d174..717e52b99 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
- # reboot = false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/bash/shared.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/bash/shared.sh
-index dfb8d3035..28e3fd6c9 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
- 
- {{{ bash_instantiate_variables("var_auditd_action_mail_acct") }}}
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/rule.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/rule.yml
-index 961c3d442..63720ccb1 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/rule.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/rule.yml
-@@ -49,7 +49,7 @@ references:
-     stigid@ol7: OL07-00-030350
-     stigid@ol8: OL08-00-030020
-     stigid@rhel7: RHEL-07-030350
--    stigid@rhel8: RHEL-08-030020
-+    stigid@almalinux8: RHEL-08-030020
-     stigid@rhel9: RHEL-09-653070
-     stigid@sle12: SLES-12-020040
-     stigid@sle15: SLES-15-030570
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/ansible/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/ansible/shared.yml
-index 49efdc918..ab901e892 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
- # reboot = false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/bash/shared.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/bash/shared.sh
-index f377a92dd..44680a119 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
- 
- {{{ bash_instantiate_variables("var_auditd_admin_space_left_action") }}}
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/kubernetes/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/kubernetes/shared.yml
-index 55f407e01..b9084af21 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/ansible/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/ansible/shared.yml
-index 9c8afcfa3..53a6da7e0 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
- # reboot = false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/bash/shared.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/bash/shared.sh
-index 79b916559..40632d099 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_sle
-+# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
- 
- {{{ bash_instantiate_variables("var_auditd_flush") }}}
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/kubernetes/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/kubernetes/shared.yml
-index 55f407e01..b9084af21 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_data.fail.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_data.fail.sh
-index ba44b2bb5..303e1d8f7 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_data.fail.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_data.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel
-+# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- # profiles = xccdf_org.ssgproject.content_profile_ospp
- # remediation = bash
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_incremental.fail.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_incremental.fail.sh
-index a8f68412c..0c0d35e0d 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_incremental.fail.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_incremental.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel
-+# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- # profiles = xccdf_org.ssgproject.content_profile_ospp
- # remediation = bash
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_incremental_async.pass.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_incremental_async.pass.sh
-index f3301e81a..eb39696dd 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_incremental_async.pass.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_incremental_async.pass.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel
-+# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- # profiles = xccdf_org.ssgproject.content_profile_ospp
- # remediation = bash
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_none.fail.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_none.fail.sh
-index 64ebd312f..c43471049 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_none.fail.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_none.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel
-+# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- # profiles = xccdf_org.ssgproject.content_profile_ospp
- # remediation = bash
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_not_there.fail.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_not_there.fail.sh
-index f6e0c1088..a51782746 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_not_there.fail.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_not_there.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel
-+# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- # profiles = xccdf_org.ssgproject.content_profile_ospp
- # remediation = bash
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_sync.fail.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_sync.fail.sh
-index 47f3daf89..5cab1da02 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_sync.fail.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_sync.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- # packages = audit
--# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel
-+# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- # profiles = xccdf_org.ssgproject.content_profile_ospp
- # remediation = bash
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/ansible/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/ansible/shared.yml
-index c70cd104e..c97fbf56e 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
- # reboot = false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/bash/shared.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/bash/shared.sh
-index 8a53bf847..95c5446b6 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
- 
- {{{ bash_instantiate_variables("var_auditd_max_log_file") }}}
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/kubernetes/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/kubernetes/shared.yml
-index 55f407e01..b9084af21 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/ansible/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/ansible/shared.yml
-index 69ae3cb89..f48f36569 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
- # reboot = false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/bash/shared.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/bash/shared.sh
-index 5007f965f..4c06ea831 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
- 
- {{{ bash_instantiate_variables("var_auditd_max_log_file_action") }}}
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/kubernetes/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/kubernetes/shared.yml
-index 55f407e01..b9084af21 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/ansible/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/ansible/shared.yml
-index 69ae3cb89..f48f36569 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
- # reboot = false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/bash/shared.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/bash/shared.sh
-index 4609f8ec9..f4b4664e3 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
- 
- {{{ bash_instantiate_variables("var_auditd_max_log_file_action") }}}
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/kubernetes/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/kubernetes/shared.yml
-index 55f407e01..b9084af21 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file_action_stig/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_num_logs/ansible/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_num_logs/ansible/shared.yml
-index 7deaa0607..748a59d80 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_num_logs/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_num_logs/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
- # reboot = false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_num_logs/kubernetes/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_num_logs/kubernetes/shared.yml
-index 55f407e01..b9084af21 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_num_logs/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_num_logs/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/ansible/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/ansible/shared.yml
-index ab0bea58e..a6158699d 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_rhel,multi_platform_ol,multi_platform_sle
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_ol,multi_platform_sle
- # reboot = false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/bash/shared.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/bash/shared.sh
-index a53f062b5..e0200450d 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_rhel,multi_platform_ol,multi_platform_sle,multi_platform_ubuntu
-+# platform = Red Hat Virtualization 4,multi_platform_rhel,multi_platform_almalinux,multi_platform_ol,multi_platform_sle,multi_platform_ubuntu
- 
- {{{ bash_instantiate_variables("var_auditd_space_left") }}}
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/kubernetes/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/kubernetes/shared.yml
-index 55f407e01..b9084af21 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/ansible/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/ansible/shared.yml
-index ec0ed4850..3c3b130e8 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
- # reboot = false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/bash/shared.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/bash/shared.sh
-index b6e0267bb..990063e2f 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_ubuntu
-+# platform = Red Hat Virtualization 4,multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_ubuntu
- 
- {{{ bash_instantiate_variables("var_auditd_space_left_action") }}}
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/kubernetes/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/kubernetes/shared.yml
-index 55f407e01..b9084af21 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/rule.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/rule.yml
-index 63929bbb8..992e2f39b 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/rule.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/rule.yml
-@@ -61,7 +61,7 @@ references:
-     stigid@ol7: OL07-00-030340
-     stigid@ol8: OL08-00-030731
-     stigid@rhel7: RHEL-07-030340
--    stigid@rhel8: RHEL-08-030731
-+    stigid@almalinux8: RHEL-08-030731
-     stigid@rhel9: RHEL-09-653040
-     stigid@ubuntu2004: UBTU-20-010217
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_percentage/rule.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_percentage/rule.yml
-index 2b6acf034..08652305d 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_percentage/rule.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_percentage/rule.yml
-@@ -37,7 +37,7 @@ references:
-     stigid@ol7: OL07-00-030330
-     stigid@ol8: OL08-00-030730
-     stigid@rhel7: RHEL-07-030330
--    stigid@rhel8: RHEL-08-030730
-+    stigid@almalinux8: RHEL-08-030730
-     stigid@rhel9: RHEL-09-653035
-     stigid@ubuntu2004: UBTU-20-010217
- 
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_freq/kubernetes/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_freq/kubernetes/shared.yml
-index 55f407e01..b9084af21 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_freq/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_freq/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_local_events/kubernetes/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_local_events/kubernetes/shared.yml
-index 55f407e01..b9084af21 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_local_events/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_local_events/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_local_events/rule.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_local_events/rule.yml
-index e3a34e25b..109161da8 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_local_events/rule.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_local_events/rule.yml
-@@ -25,7 +25,7 @@ references:
-     ospp: FAU_GEN.1
-     srg: SRG-OS-000062-GPOS-00031,SRG-OS-000480-GPOS-00227
-     stigid@ol8: OL08-00-030061
--    stigid@rhel8: RHEL-08-030061
-+    stigid@almalinux8: RHEL-08-030061
-     stigid@rhel9: RHEL-09-653075
- 
- ocil_clause: local_events isn't set to yes
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_log_format/kubernetes/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_log_format/kubernetes/shared.yml
-index 55f407e01..b9084af21 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_log_format/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_log_format/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_log_format/rule.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_log_format/rule.yml
-index 9d19776db..8ac220842 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_log_format/rule.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_log_format/rule.yml
-@@ -26,7 +26,7 @@ references:
-     ospp: FAU_GEN.1.2
-     srg: SRG-OS-000255-GPOS-00096,SRG-OS-000480-GPOS-00227,SRG-APP-000096-CTR-000175,SRG-APP-000097-CTR-000180,SRG-APP-000098-CTR-000185,SRG-APP-000099-CTR-000190,SRG-APP-000100-CTR-000195,SRG-APP-000100-CTR-000200,SRG-APP-000109-CTR-000215,SRG-APP-000290-CTR-000670,SRG-APP-000357-CTR-000800
-     stigid@ol8: OL08-00-030063
--    stigid@rhel8: RHEL-08-030063
-+    stigid@almalinux8: RHEL-08-030063
-     stigid@rhel9: RHEL-09-653100
- 
- ocil_clause: log_format isn't set to ENRICHED
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/ansible/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/ansible/shared.yml
-index 015e9d6ef..cb221f19e 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_ol
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_ol
- # reboot = false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/bash/shared.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/bash/shared.sh
-index a08fddc90..1b881f0ff 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_ol
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_ol
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/kubernetes/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/kubernetes/shared.yml
-index 55f407e01..b9084af21 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/rule.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/rule.yml
-index 1806a3c3e..8fb1d714e 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/rule.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_name_format/rule.yml
-@@ -30,7 +30,7 @@ references:
-     stigid@ol7: OL07-00-030211
-     stigid@ol8: OL08-00-030062
-     stigid@rhel7: RHEL-07-030211
--    stigid@rhel8: RHEL-08-030062
-+    stigid@almalinux8: RHEL-08-030062
-     stigid@rhel9: RHEL-09-653060
- 
- ocil_clause: name_format isn't set to {{{ xccdf_value("var_auditd_name_format") }}}
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_overflow_action/ansible/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_overflow_action/ansible/shared.yml
-index 12d8541cb..a3d1c459b 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_overflow_action/ansible/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_overflow_action/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_ol
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_ol
- # reboot = false
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_overflow_action/bash/shared.sh b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_overflow_action/bash/shared.sh
-index f308bd675..e9789ea24 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_overflow_action/bash/shared.sh
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_overflow_action/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_ol
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_ol
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_overflow_action/rule.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_overflow_action/rule.yml
-index bd0205d1f..16893ecff 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_overflow_action/rule.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_overflow_action/rule.yml
-@@ -32,7 +32,7 @@ references:
-     stigid@ol7: OL07-00-030210
-     stigid@ol8: OL08-00-030700
-     stigid@rhel7: RHEL-07-030210
--    stigid@rhel8: RHEL-08-030700
-+    stigid@almalinux8: RHEL-08-030700
-     stigid@rhel9: RHEL-09-653065
- 
- ocil_clause: 'auditd overflow action is not set correctly'
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_write_logs/kubernetes/shared.yml b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_write_logs/kubernetes/shared.yml
-index 55f407e01..b9084af21 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_write_logs/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/auditd_write_logs/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_rhcos
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhcos
- # reboot = true
- # strategy = restrict
- # complexity = low
-diff --git a/linux_os/guide/system/auditing/configure_auditd_data_retention/var_audispd_remote_server.var b/linux_os/guide/system/auditing/configure_auditd_data_retention/var_audispd_remote_server.var
-index bcafc35b8..1579dc90f 100644
---- a/linux_os/guide/system/auditing/configure_auditd_data_retention/var_audispd_remote_server.var
-+++ b/linux_os/guide/system/auditing/configure_auditd_data_retention/var_audispd_remote_server.var
-@@ -3,7 +3,7 @@ documentation_complete: true
- title: 'Remote server for audispd to send audit records'
- 
- description: |-
--{{% if product in ["rhel8", "fedora"] %}}
-+{{% if product in ["rhel8", "almalinux8", "fedora"] %}}
-     The setting for remote_server in /etc/audit/audisp-remote.conf
- {{% else %}}
-     The setting for remote_server in /etc/audisp/audisp-remote.conf
-diff --git a/linux_os/guide/system/auditing/grub2_audit_argument/rule.yml b/linux_os/guide/system/auditing/grub2_audit_argument/rule.yml
-index f77f25a2c..a3a6d73ca 100644
---- a/linux_os/guide/system/auditing/grub2_audit_argument/rule.yml
-+++ b/linux_os/guide/system/auditing/grub2_audit_argument/rule.yml
-@@ -48,7 +48,7 @@ references:
-     pcidss4: '10.7.3'
-     srg: SRG-OS-000037-GPOS-00015,SRG-OS-000042-GPOS-00020,SRG-OS-000062-GPOS-00031,SRG-OS-000392-GPOS-00172,SRG-OS-000462-GPOS-00206,SRG-OS-000471-GPOS-00215,SRG-OS-000473-GPOS-00218,SRG-OS-000254-GPOS-00095
-     stigid@ol8: OL08-00-030601
--    stigid@rhel8: RHEL-08-030601
-+    stigid@almalinux8: RHEL-08-030601
-     stigid@rhel9: RHEL-09-212055
-     stigid@ubuntu2004: UBTU-20-010198
- 
-diff --git a/linux_os/guide/system/auditing/grub2_audit_argument/tests/blank_grubenv_rhel8.fail.sh b/linux_os/guide/system/auditing/grub2_audit_argument/tests/blank_grubenv_rhel8.fail.sh
-index 4a03a2117..365d018a2 100644
---- a/linux_os/guide/system/auditing/grub2_audit_argument/tests/blank_grubenv_rhel8.fail.sh
-+++ b/linux_os/guide/system/auditing/grub2_audit_argument/tests/blank_grubenv_rhel8.fail.sh
-@@ -1,6 +1,6 @@
- #!/bin/bash
- 
--# platform = Oracle Linux 8,Red Hat Enterprise Linux 8
-+# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8
- # remediation = none
- 
- # Removes audit argument from kernel command line in /boot/grub2/grubenv
-diff --git a/linux_os/guide/system/auditing/grub2_audit_argument/tests/double_value_rhel8.fail.sh b/linux_os/guide/system/auditing/grub2_audit_argument/tests/double_value_rhel8.fail.sh
-index 065c1d459..75db9892c 100644
---- a/linux_os/guide/system/auditing/grub2_audit_argument/tests/double_value_rhel8.fail.sh
-+++ b/linux_os/guide/system/auditing/grub2_audit_argument/tests/double_value_rhel8.fail.sh
-@@ -1,5 +1,5 @@
- #!/bin/bash
--# platform = Oracle Linux 8,Red Hat Enterprise Linux 8
-+# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8
- 
- # Break the audit argument in kernel command line in /boot/grub2/grubenv
- file="/boot/grub2/grubenv"
-diff --git a/linux_os/guide/system/auditing/grub2_audit_argument/tests/wrong_value_rhel8.fail.sh b/linux_os/guide/system/auditing/grub2_audit_argument/tests/wrong_value_rhel8.fail.sh
-index 35034f242..3f1e63b11 100644
---- a/linux_os/guide/system/auditing/grub2_audit_argument/tests/wrong_value_rhel8.fail.sh
-+++ b/linux_os/guide/system/auditing/grub2_audit_argument/tests/wrong_value_rhel8.fail.sh
-@@ -1,5 +1,5 @@
- #!/bin/bash
--# platform = Oracle Linux 8,Red Hat Enterprise Linux 8
-+# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8
- 
- # Break the audit argument in kernel command line in /boot/grub2/grubenv
- file="/boot/grub2/grubenv"
-diff --git a/linux_os/guide/system/auditing/grub2_audit_backlog_limit_argument/rule.yml b/linux_os/guide/system/auditing/grub2_audit_backlog_limit_argument/rule.yml
-index f10e01952..9c7be10c9 100644
---- a/linux_os/guide/system/auditing/grub2_audit_backlog_limit_argument/rule.yml
-+++ b/linux_os/guide/system/auditing/grub2_audit_backlog_limit_argument/rule.yml
-@@ -38,7 +38,7 @@ references:
-     pcidss4: '10.7.2'
-     srg: SRG-OS-000037-GPOS-00015,SRG-OS-000042-GPOS-00020,SRG-OS-000062-GPOS-00031,SRG-OS-000254-GPOS-00095,SRG-OS-000341-GPOS-00132,SRG-OS-000392-GPOS-00172,SRG-OS-000462-GPOS-00206,SRG-OS-000471-GPOS-00215
-     stigid@ol8: OL08-00-030602
--    stigid@rhel8: RHEL-08-030602
-+    stigid@almalinux8: RHEL-08-030602
-     stigid@rhel9: RHEL-09-653120
- 
- ocil_clause: 'audit backlog limit is not configured'
-diff --git a/linux_os/guide/system/auditing/grub2_audit_backlog_limit_argument/tests/correct_grubenv.pass.sh b/linux_os/guide/system/auditing/grub2_audit_backlog_limit_argument/tests/correct_grubenv.pass.sh
-index aaffbf476..f3e10ad43 100644
---- a/linux_os/guide/system/auditing/grub2_audit_backlog_limit_argument/tests/correct_grubenv.pass.sh
-+++ b/linux_os/guide/system/auditing/grub2_audit_backlog_limit_argument/tests/correct_grubenv.pass.sh
-@@ -1,4 +1,4 @@
- #!/bin/bash
--# platform = Oracle Linux 8,Red Hat Enterprise Linux 8
-+# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8
- 
- grub2-editenv - set "$(grub2-editenv - list | grep kernelopts) audit_backlog_limit=8192"
-diff --git a/linux_os/guide/system/auditing/grub2_audit_backlog_limit_argument/tests/wrong_value_rhel8.fail.sh b/linux_os/guide/system/auditing/grub2_audit_backlog_limit_argument/tests/wrong_value_rhel8.fail.sh
-index f93dc5644..1fa37409f 100644
---- a/linux_os/guide/system/auditing/grub2_audit_backlog_limit_argument/tests/wrong_value_rhel8.fail.sh
-+++ b/linux_os/guide/system/auditing/grub2_audit_backlog_limit_argument/tests/wrong_value_rhel8.fail.sh
-@@ -1,5 +1,5 @@
- #!/bin/bash
--# platform = Oracle Linux 8,Red Hat Enterprise Linux 8
-+# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux 8
- 
- # Break the audit_backlog_limit argument in kernel command line in /boot/grub2/grubenv
- file="/boot/grub2/grubenv"
-diff --git a/linux_os/guide/system/auditing/package_audit_installed/rule.yml b/linux_os/guide/system/auditing/package_audit_installed/rule.yml
-index e1adfae96..7e61cb8f6 100644
---- a/linux_os/guide/system/auditing/package_audit_installed/rule.yml
-+++ b/linux_os/guide/system/auditing/package_audit_installed/rule.yml
-@@ -34,7 +34,7 @@ references:
-     pcidss4: "10.2.1"
-     srg: SRG-OS-000062-GPOS-00031,SRG-OS-000037-GPOS-00015,SRG-OS-000038-GPOS-00016,SRG-OS-000039-GPOS-00017,SRG-OS-000040-GPOS-00018,SRG-OS-000041-GPOS-00019,SRG-OS-000042-GPOS-00021,SRG-OS-000051-GPOS-00024,SRG-OS-000054-GPOS-00025,SRG-OS-000122-GPOS-00063,SRG-OS-000254-GPOS-00095,SRG-OS-000255-GPOS-00096,SRG-OS-000337-GPOS-00129,SRG-OS-000348-GPOS-00136,SRG-OS-000349-GPOS-00137,SRG-OS-000350-GPOS-00138,SRG-OS-000351-GPOS-00139,SRG-OS-000352-GPOS-00140,SRG-OS-000353-GPOS-00141,SRG-OS-000354-GPOS-00142,SRG-OS-000358-GPOS-00145,SRG-OS-000365-GPOS-00152,SRG-OS-000392-GPOS-00172,SRG-OS-000475-GPOS-00220
-     stigid@ol8: OL08-00-030180
--    stigid@rhel8: RHEL-08-030180
-+    stigid@almalinux8: RHEL-08-030180
-     stigid@rhel9: RHEL-09-653010
-     stigid@sle12: SLES-12-020000
-     stigid@sle15: SLES-15-030650
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_access_failed_aarch64/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_access_failed_aarch64/kubernetes/shared.yml
-index f29a4afc6..26ac0688c 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_access_failed_aarch64/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_access_failed_aarch64/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_access_failed_ppc64le/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_access_failed_ppc64le/kubernetes/shared.yml
-index 412c67f15..ec1467404 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_access_failed_ppc64le/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_access_failed_ppc64le/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_access_success/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_access_success/kubernetes/shared.yml
-index 413293083..3f8c50a39 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_access_success/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_access_success/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_access_success_aarch64/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_access_success_aarch64/kubernetes/shared.yml
-index 1d08bae3a..3e2300448 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_access_success_aarch64/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_access_success_aarch64/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_access_success_ppc64le/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_access_success_ppc64le/kubernetes/shared.yml
-index 372b7c27c..4e2ce77e9 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_access_success_ppc64le/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_access_success_ppc64le/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_basic_configuration/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_basic_configuration/kubernetes/shared.yml
-index f62426900..bd3ddd10a 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_basic_configuration/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_basic_configuration/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_create_failed_aarch64/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_create_failed_aarch64/kubernetes/shared.yml
-index c26dc39be..d32b854fd 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_create_failed_aarch64/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_create_failed_aarch64/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_create_failed_ppc64le/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_create_failed_ppc64le/kubernetes/shared.yml
-index 08c8dc855..e9277f263 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_create_failed_ppc64le/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_create_failed_ppc64le/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_delete_failed/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_delete_failed/kubernetes/shared.yml
-index 023388b66..655883afe 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_delete_failed/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_delete_failed/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_delete_failed_aarch64/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_delete_failed_aarch64/kubernetes/shared.yml
-index 22d3990f0..ed4f8bce8 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_delete_failed_aarch64/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_delete_failed_aarch64/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_delete_failed_ppc64le/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_delete_failed_ppc64le/kubernetes/shared.yml
-index 2fb2c25aa..e182781c4 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_delete_failed_ppc64le/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_delete_failed_ppc64le/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_delete_success/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_delete_success/kubernetes/shared.yml
-index bff04fe4c..a56d7f18f 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_delete_success/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_delete_success/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- 
- {{% set file_contents = """## Successful file delete
- -a always,exit -F arch=b32 -S unlink,unlinkat,rename,renameat -F success=1 -F auid&gt;=" ~ uid_min ~ " -F auid!=unset -F key=successful-delete
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_delete_success_aarch64/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_delete_success_aarch64/kubernetes/shared.yml
-index 37b8b3676..d1be71273 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_delete_success_aarch64/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_delete_success_aarch64/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- 
- {{% set file_contents = """## Successful file delete
- -a always,exit -F arch=b32 -S unlink,unlinkat,rename,renameat -F success=1 -F auid>=" ~ uid_min ~ " -F auid!=unset -F key=successful-delete
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_delete_success_ppc64le/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_delete_success_ppc64le/kubernetes/shared.yml
-index a46066d62..731636c7f 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_delete_success_ppc64le/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_delete_success_ppc64le/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- 
- {{% set file_contents = """## Successful file delete
- -a always,exit -F arch=b64 -S unlink,unlinkat,rename,renameat -F success=1 -F auid>=" ~ uid_min ~ " -F auid!=unset -F key=successful-delete""" -%}}
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_immutable_login_uids/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_immutable_login_uids/kubernetes/shared.yml
-index ff5e61676..f7012bed2 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_immutable_login_uids/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_immutable_login_uids/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_modify_failed/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_modify_failed/kubernetes/shared.yml
-index 2d9279849..ec6477378 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_modify_failed/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_modify_failed/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_modify_failed_aarch64/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_modify_failed_aarch64/kubernetes/shared.yml
-index dae466002..527bc8489 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_modify_failed_aarch64/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_modify_failed_aarch64/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_modify_failed_ppc64le/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_modify_failed_ppc64le/kubernetes/shared.yml
-index f07ff3607..62de7826c 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_modify_failed_ppc64le/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_modify_failed_ppc64le/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_modify_success/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_modify_success/kubernetes/shared.yml
-index c6f796967..7a6e545c4 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_modify_success/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_modify_success/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_modify_success_aarch64/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_modify_success_aarch64/kubernetes/shared.yml
-index 212ec4ba5..62e1ee6de 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_modify_success_aarch64/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_modify_success_aarch64/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_modify_success_ppc64le/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_modify_success_ppc64le/kubernetes/shared.yml
-index 92310b977..e76e314a6 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_modify_success_ppc64le/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_modify_success_ppc64le/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_module_load/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_module_load/kubernetes/shared.yml
-index f8cd8b73d..090554c02 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_module_load/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_module_load/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_module_load_ppc64le/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_module_load_ppc64le/kubernetes/shared.yml
-index 231034a9c..460877cec 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_module_load_ppc64le/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_module_load_ppc64le/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_ospp_general/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_ospp_general/kubernetes/shared.yml
-index 6002067e5..0515753c4 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_ospp_general/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_ospp_general/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_ospp_general_aarch64/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_ospp_general_aarch64/kubernetes/shared.yml
-index c122b209f..d1f676a94 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_ospp_general_aarch64/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_ospp_general_aarch64/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/policy_rules/audit_ospp_general_ppc64le/kubernetes/shared.yml b/linux_os/guide/system/auditing/policy_rules/audit_ospp_general_ppc64le/kubernetes/shared.yml
-index fa81ece03..7a26684d2 100644
---- a/linux_os/guide/system/auditing/policy_rules/audit_ospp_general_ppc64le/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/policy_rules/audit_ospp_general_ppc64le/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/service_auditd_enabled/kubernetes/shared.yml b/linux_os/guide/system/auditing/service_auditd_enabled/kubernetes/shared.yml
-index 89d6152dc..7afbf02b7 100644
---- a/linux_os/guide/system/auditing/service_auditd_enabled/kubernetes/shared.yml
-+++ b/linux_os/guide/system/auditing/service_auditd_enabled/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
-diff --git a/linux_os/guide/system/auditing/service_auditd_enabled/rule.yml b/linux_os/guide/system/auditing/service_auditd_enabled/rule.yml
-index 96317d8d1..b86c22fd5 100644
---- a/linux_os/guide/system/auditing/service_auditd_enabled/rule.yml
-+++ b/linux_os/guide/system/auditing/service_auditd_enabled/rule.yml
-@@ -60,7 +60,7 @@ references:
-     stigid@ol7: OL07-00-030000
-     stigid@ol8: OL08-00-030181
-     stigid@rhel7: RHEL-07-030000
--    stigid@rhel8: RHEL-08-030181
-+    stigid@almalinux8: RHEL-08-030181
-     stigid@rhel9: RHEL-09-653015
-     stigid@sle12: SLES-12-020010
-     stigid@sle15: SLES-15-030050
 diff --git a/linux_os/guide/system/bootloader-grub2/grub2_kernel_trust_cpu_rng/tests/arg_not_there.fail.sh b/linux_os/guide/system/bootloader-grub2/grub2_kernel_trust_cpu_rng/tests/arg_not_there.fail.sh
 index 50abc5732..306ca07b1 100644
 --- a/linux_os/guide/system/bootloader-grub2/grub2_kernel_trust_cpu_rng/tests/arg_not_there.fail.sh
@@ -10380,20 +10569,20 @@ index c4213caf8..c422634f2 100644
  # Break the argument in kernel command line in /boot/grub2/grubenv
  file="/boot/grub2/grubenv"
 diff --git a/linux_os/guide/system/bootloader-grub2/grub2_pti_argument/rule.yml b/linux_os/guide/system/bootloader-grub2/grub2_pti_argument/rule.yml
-index 48b26196a..08c744d38 100644
+index b825403d1..060776b91 100644
 --- a/linux_os/guide/system/bootloader-grub2/grub2_pti_argument/rule.yml
 +++ b/linux_os/guide/system/bootloader-grub2/grub2_pti_argument/rule.yml
-@@ -27,7 +27,7 @@ references:
+@@ -26,7 +26,7 @@ references:
      nist: SI-16
      srg: SRG-OS-000433-GPOS-00193,SRG-OS-000095-GPOS-00049
      stigid@ol8: OL08-00-040004
 -    stigid@rhel8: RHEL-08-040004
 +    stigid@almalinux8: RHEL-08-040004
-     stigid@rhel9: RHEL-09-212050
  
  ocil_clause: 'Kernel page-table isolation is not enabled'
+ 
 diff --git a/linux_os/guide/system/bootloader-grub2/grub2_vsyscall_argument/rule.yml b/linux_os/guide/system/bootloader-grub2/grub2_vsyscall_argument/rule.yml
-index 925e7a74a..9292c956d 100644
+index 4efcbd136..85a6566e6 100644
 --- a/linux_os/guide/system/bootloader-grub2/grub2_vsyscall_argument/rule.yml
 +++ b/linux_os/guide/system/bootloader-grub2/grub2_vsyscall_argument/rule.yml
 @@ -26,7 +26,7 @@ references:
@@ -10402,22 +10591,22 @@ index 925e7a74a..9292c956d 100644
      stigid@ol8: OL08-00-010422
 -    stigid@rhel8: RHEL-08-010422
 +    stigid@almalinux8: RHEL-08-010422
-     stigid@rhel9: RHEL-09-212035
  
  ocil_clause: 'vsyscalls are enabled'
+ 
 diff --git a/linux_os/guide/system/bootloader-grub2/non-uefi/grub2_admin_username/rule.yml b/linux_os/guide/system/bootloader-grub2/non-uefi/grub2_admin_username/rule.yml
-index 94fc58975..b7134083c 100644
+index f88ad2fb7..ccdd09122 100644
 --- a/linux_os/guide/system/bootloader-grub2/non-uefi/grub2_admin_username/rule.yml
 +++ b/linux_os/guide/system/bootloader-grub2/non-uefi/grub2_admin_username/rule.yml
-@@ -49,7 +49,7 @@ references:
+@@ -48,7 +48,7 @@ references:
      stigid@ol7: OL07-00-010483
      stigid@ol8: OL08-00-010149
      stigid@rhel7: RHEL-07-010483
 -    stigid@rhel8: RHEL-08-010149
 +    stigid@almalinux8: RHEL-08-010149
-     stigid@rhel9: RHEL-09-212020
  
  ocil_clause: 'superuser account is not set or is set to root, admin, administrator or any other existing user name'
+ 
 diff --git a/linux_os/guide/system/bootloader-grub2/non-uefi/grub2_password/oval/shared.xml b/linux_os/guide/system/bootloader-grub2/non-uefi/grub2_password/oval/shared.xml
 index f5b957e88..b678a4e70 100644
 --- a/linux_os/guide/system/bootloader-grub2/non-uefi/grub2_password/oval/shared.xml
@@ -10432,23 +10621,23 @@ index f5b957e88..b678a4e70 100644
        {{% else %}}
        <criteria operator="AND">
 diff --git a/linux_os/guide/system/bootloader-grub2/non-uefi/grub2_password/rule.yml b/linux_os/guide/system/bootloader-grub2/non-uefi/grub2_password/rule.yml
-index 43168a7cc..7f62e0944 100644
+index c3531c5ba..429d0e6ab 100644
 --- a/linux_os/guide/system/bootloader-grub2/non-uefi/grub2_password/rule.yml
 +++ b/linux_os/guide/system/bootloader-grub2/non-uefi/grub2_password/rule.yml
-@@ -70,7 +70,7 @@ references:
+@@ -65,7 +65,7 @@ references:
      stigid@ol7: OL07-00-010482
      stigid@ol8: OL08-00-010150
      stigid@rhel7: RHEL-07-010482
 -    stigid@rhel8: RHEL-08-010150
 +    stigid@almalinux8: RHEL-08-010150
-     stigid@rhel9: RHEL-09-212010
      stigid@sle12: SLES-12-010430
      stigid@sle15: SLES-15-010190
+     stigid@ubuntu2004: UBTU-20-010009
 diff --git a/linux_os/guide/system/bootloader-grub2/uefi/grub2_uefi_admin_username/rule.yml b/linux_os/guide/system/bootloader-grub2/uefi/grub2_uefi_admin_username/rule.yml
-index 8dbb9aeca..e27499d26 100644
+index 8acf56d3c..9db72b9b6 100644
 --- a/linux_os/guide/system/bootloader-grub2/uefi/grub2_uefi_admin_username/rule.yml
 +++ b/linux_os/guide/system/bootloader-grub2/uefi/grub2_uefi_admin_username/rule.yml
-@@ -56,7 +56,7 @@ references:
+@@ -55,7 +55,7 @@ references:
      stigid@ol7: OL07-00-010492
      stigid@ol8: OL08-00-010141
      stigid@rhel7: RHEL-07-010492
@@ -10458,10 +10647,10 @@ index 8dbb9aeca..e27499d26 100644
  ocil_clause: 'superuser account is not set or is set to an existing name or to a common name'
  
 diff --git a/linux_os/guide/system/bootloader-grub2/uefi/grub2_uefi_password/rule.yml b/linux_os/guide/system/bootloader-grub2/uefi/grub2_uefi_password/rule.yml
-index c77f9b5e7..c475f2568 100644
+index 743ed9cd6..3242b006d 100644
 --- a/linux_os/guide/system/bootloader-grub2/uefi/grub2_uefi_password/rule.yml
 +++ b/linux_os/guide/system/bootloader-grub2/uefi/grub2_uefi_password/rule.yml
-@@ -70,7 +70,7 @@ references:
+@@ -66,7 +66,7 @@ references:
      stigid@ol7: OL07-00-010491
      stigid@ol8: OL08-00-010140
      stigid@rhel7: RHEL-07-010491
@@ -10525,16 +10714,6 @@ index 47626442f..2a88d2abb 100644
  # remediation = none
  
  # Make sure no image configured in zipl config file
-diff --git a/linux_os/guide/system/bootloader-zipl/zipl_bootmap_is_up_to_date/ansible/shared.yml b/linux_os/guide/system/bootloader-zipl/zipl_bootmap_is_up_to_date/ansible/shared.yml
-index 7f2be3564..80f8b55f3 100644
---- a/linux_os/guide/system/bootloader-zipl/zipl_bootmap_is_up_to_date/ansible/shared.yml
-+++ b/linux_os/guide/system/bootloader-zipl/zipl_bootmap_is_up_to_date/ansible/shared.yml
-@@ -1,4 +1,4 @@
--# platform = Red Hat Enterprise Linux 8
-+# platform = Red Hat Enterprise Linux 8,AlmaLinux 8
- # reboot = false
- # strategy = configure
- # complexity = low
 diff --git a/linux_os/guide/system/bootloader-zipl/zipl_bootmap_is_up_to_date/tests/newer_boot_entry.fail.sh b/linux_os/guide/system/bootloader-zipl/zipl_bootmap_is_up_to_date/tests/newer_boot_entry.fail.sh
 index 728c6b7bd..b06f989e6 100644
 --- a/linux_os/guide/system/bootloader-zipl/zipl_bootmap_is_up_to_date/tests/newer_boot_entry.fail.sh
@@ -10676,7 +10855,7 @@ index 773f88904..6060189e7 100644
  if ! grep -s "^\s*cron\.\*\s*/var/log/cron$" /etc/rsyslog.conf /etc/rsyslog.d/*.conf; then
  	mkdir -p /etc/rsyslog.d
 diff --git a/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_cron_logging/rule.yml b/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_cron_logging/rule.yml
-index 923a9096d..d66f57206 100644
+index 50ddd825a..8897ff8fb 100644
 --- a/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_cron_logging/rule.yml
 +++ b/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_cron_logging/rule.yml
 @@ -37,7 +37,7 @@ references:
@@ -10685,9 +10864,9 @@ index 923a9096d..d66f57206 100644
      stigid@rhel7: RHEL-07-021100
 -    stigid@rhel8: RHEL-08-030010
 +    stigid@almalinux8: RHEL-08-030010
-     stigid@rhel9: RHEL-09-652060
  
  ocil_clause: 'cron is not logging to rsyslog'
+ 
 diff --git a/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_encrypt_offload_actionsendstreamdriverauthmode/ansible/shared.yml b/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_encrypt_offload_actionsendstreamdriverauthmode/ansible/shared.yml
 index 4e321fecb..2818c4ca1 100644
 --- a/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_encrypt_offload_actionsendstreamdriverauthmode/ansible/shared.yml
@@ -10709,7 +10888,7 @@ index 3933f28b4..d71a075f1 100644
  # strategy = configure
  # complexity = low
 diff --git a/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_encrypt_offload_actionsendstreamdriverauthmode/rule.yml b/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_encrypt_offload_actionsendstreamdriverauthmode/rule.yml
-index fe5623311..9b7964316 100644
+index fa127e79c..2e5342ebf 100644
 --- a/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_encrypt_offload_actionsendstreamdriverauthmode/rule.yml
 +++ b/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_encrypt_offload_actionsendstreamdriverauthmode/rule.yml
 @@ -27,7 +27,7 @@ references:
@@ -10718,11 +10897,11 @@ index fe5623311..9b7964316 100644
      stigid@ol8: OL08-00-030720
 -    stigid@rhel8: RHEL-08-030720
 +    stigid@almalinux8: RHEL-08-030720
-     stigid@rhel9: RHEL-09-652040
  
  ocil_clause: '$ActionSendStreamDriverAuthMode in /etc/rsyslog.conf is not set to x509/name'
+ 
 diff --git a/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_encrypt_offload_actionsendstreamdrivermode/rule.yml b/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_encrypt_offload_actionsendstreamdrivermode/rule.yml
-index 7fb97b65f..d66b45c27 100644
+index d15f2d792..65df1ee81 100644
 --- a/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_encrypt_offload_actionsendstreamdrivermode/rule.yml
 +++ b/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_encrypt_offload_actionsendstreamdrivermode/rule.yml
 @@ -27,7 +27,7 @@ references:
@@ -10731,11 +10910,11 @@ index 7fb97b65f..d66b45c27 100644
      stigid@ol8: OL08-00-030710
 -    stigid@rhel8: RHEL-08-030710
 +    stigid@almalinux8: RHEL-08-030710
-     stigid@rhel9: RHEL-09-652045
  
  ocil_clause: 'rsyslogd ActionSendStreamDriverMode is not set to 1'
+ 
 diff --git a/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_encrypt_offload_defaultnetstreamdriver/rule.yml b/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_encrypt_offload_defaultnetstreamdriver/rule.yml
-index 12c43f3db..699f1e725 100644
+index ba1095929..400ae7b76 100644
 --- a/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_encrypt_offload_defaultnetstreamdriver/rule.yml
 +++ b/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_encrypt_offload_defaultnetstreamdriver/rule.yml
 @@ -27,7 +27,7 @@ references:
@@ -10744,11 +10923,11 @@ index 12c43f3db..699f1e725 100644
      stigid@ol8: OL08-00-030710
 -    stigid@rhel8: RHEL-08-030710
 +    stigid@almalinux8: RHEL-08-030710
-     stigid@rhel9: RHEL-09-652050
  
  ocil_clause: 'rsyslogd DefaultNetstreamDriver not set to gtls'
+ 
 diff --git a/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_remote_access_monitoring/rule.yml b/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_remote_access_monitoring/rule.yml
-index 9db602a15..44ad370ae 100644
+index 6eebbdb38..890995d18 100644
 --- a/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_remote_access_monitoring/rule.yml
 +++ b/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_remote_access_monitoring/rule.yml
 @@ -31,7 +31,7 @@ references:
@@ -10757,14 +10936,14 @@ index 9db602a15..44ad370ae 100644
      stigid@ol8: OL08-00-010070
 -    stigid@rhel8: RHEL-08-010070
 +    stigid@almalinux8: RHEL-08-010070
-     stigid@rhel9: RHEL-09-652030
      stigid@ubuntu2004: UBTU-20-010403
+     stigid@ubuntu2204: UBTU-22-652015
  
 diff --git a/linux_os/guide/system/logging/journald/journald_compress/rule.yml b/linux_os/guide/system/logging/journald/journald_compress/rule.yml
-index dcfbf1fa2..d104e71a6 100644
+index 3bc9b6a1b..4e1e9bc7a 100644
 --- a/linux_os/guide/system/logging/journald/journald_compress/rule.yml
 +++ b/linux_os/guide/system/logging/journald/journald_compress/rule.yml
-@@ -35,7 +35,7 @@ ocil: |-
+@@ -32,7 +32,7 @@ ocil: |-
      Storing logs with compression can help avoid filling the system disk.
      Run the following command to verify that journald is compressing logs.
      <pre>
@@ -10773,7 +10952,7 @@ index dcfbf1fa2..d104e71a6 100644
      grep "^\sCompress" /etc/systemd/journald.conf {{{ journald_conf_dir_path }}}/*.conf
  {{% else %}}
      grep "^\sCompress" /etc/systemd/journald.conf
-@@ -46,7 +46,7 @@ ocil: |-
+@@ -43,7 +43,7 @@ ocil: |-
      Compress=yes
      </pre>
  
@@ -10783,10 +10962,10 @@ index dcfbf1fa2..d104e71a6 100644
      name: systemd_dropin_configuration
      vars:
 diff --git a/linux_os/guide/system/logging/journald/journald_forward_to_syslog/rule.yml b/linux_os/guide/system/logging/journald/journald_forward_to_syslog/rule.yml
-index bf0a951ef..ecee756bc 100644
+index b0101d952..3b51986a3 100644
 --- a/linux_os/guide/system/logging/journald/journald_forward_to_syslog/rule.yml
 +++ b/linux_os/guide/system/logging/journald/journald_forward_to_syslog/rule.yml
-@@ -35,7 +35,7 @@ ocil: |-
+@@ -32,7 +32,7 @@ ocil: |-
      Storing logs remotely protects the integrity of the data from local attacks.
      Run the following command to verify that journald is forwarding logs to a remote host.
      <pre>
@@ -10795,7 +10974,7 @@ index bf0a951ef..ecee756bc 100644
      grep "^\sForwardToSyslog" /etc/systemd/journald.conf {{{ journald_conf_dir_path }}}/*.conf
  {{% else %}}
      grep "^\sForwardToSyslog" /etc/systemd/journald.conf
-@@ -46,7 +46,7 @@ ocil: |-
+@@ -43,7 +43,7 @@ ocil: |-
      ForwardToSyslog=yes
      </pre>
  
@@ -10805,10 +10984,10 @@ index bf0a951ef..ecee756bc 100644
      name: systemd_dropin_configuration
      vars:
 diff --git a/linux_os/guide/system/logging/journald/journald_storage/rule.yml b/linux_os/guide/system/logging/journald/journald_storage/rule.yml
-index 2ee5dc216..aef01b335 100644
+index bb838d9b7..f0a069b4f 100644
 --- a/linux_os/guide/system/logging/journald/journald_storage/rule.yml
 +++ b/linux_os/guide/system/logging/journald/journald_storage/rule.yml
-@@ -34,7 +34,7 @@ ocil: |-
+@@ -31,7 +31,7 @@ ocil: |-
      Storing logs with persistent storage ensures they are available after a reboot or system crash.
      Run the command below to verify that logs are being persistently stored to disk.
      <pre>
@@ -10817,7 +10996,7 @@ index 2ee5dc216..aef01b335 100644
      grep "^\sStorage" /etc/systemd/journald.conf {{{ journald_conf_dir_path }}}/*.conf
  {{% else %}}
      grep "^\sStorage" /etc/systemd/journald.conf
-@@ -45,7 +45,7 @@ ocil: |-
+@@ -42,7 +42,7 @@ ocil: |-
      Storage=persistent
      </pre>
  
@@ -10838,10 +11017,10 @@ index 892523fc4..9fbba1ccb 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/system/logging/log_rotation/timer_logrotate_enabled/rule.yml b/linux_os/guide/system/logging/log_rotation/timer_logrotate_enabled/rule.yml
-index 11544323c..c5e78ed75 100644
+index db7d8d12c..0925b116d 100644
 --- a/linux_os/guide/system/logging/log_rotation/timer_logrotate_enabled/rule.yml
 +++ b/linux_os/guide/system/logging/log_rotation/timer_logrotate_enabled/rule.yml
-@@ -54,7 +54,7 @@ template:
+@@ -51,7 +51,7 @@ template:
          timername: logrotate
          packagename: logrotate
  
@@ -10851,31 +11030,31 @@ index 11544323c..c5e78ed75 100644
      - general:
          The Systemd unit <tt>logrotate.timer</tt> does not exist in
 diff --git a/linux_os/guide/system/logging/package_rsyslog-gnutls_installed/rule.yml b/linux_os/guide/system/logging/package_rsyslog-gnutls_installed/rule.yml
-index ed375fc89..46f024c89 100644
+index a4f49a048..a5379e805 100644
 --- a/linux_os/guide/system/logging/package_rsyslog-gnutls_installed/rule.yml
 +++ b/linux_os/guide/system/logging/package_rsyslog-gnutls_installed/rule.yml
-@@ -30,7 +30,7 @@ references:
+@@ -29,7 +29,7 @@ references:
      ospp: FTP_ITC_EXT.1.1
      srg: SRG-OS-000480-GPOS-00227,SRG-OS-000120-GPOS-00061
      stigid@ol8: OL08-00-030680
 -    stigid@rhel8: RHEL-08-030680
 +    stigid@almalinux8: RHEL-08-030680
-     stigid@rhel9: RHEL-09-652015
  
  ocil_clause: 'the package is not installed'
+ 
 diff --git a/linux_os/guide/system/logging/package_rsyslog_installed/rule.yml b/linux_os/guide/system/logging/package_rsyslog_installed/rule.yml
-index 1bd70d3f2..37f319635 100644
+index 8f4b817e8..1893fde4f 100644
 --- a/linux_os/guide/system/logging/package_rsyslog_installed/rule.yml
 +++ b/linux_os/guide/system/logging/package_rsyslog_installed/rule.yml
-@@ -37,7 +37,7 @@ references:
+@@ -34,7 +34,7 @@ references:
      ospp: FTP_ITC_EXT.1.1
      srg: SRG-OS-000479-GPOS-00224,SRG-OS-000051-GPOS-00024,SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-030670
 -    stigid@rhel8: RHEL-08-030670
 +    stigid@almalinux8: RHEL-08-030670
-     stigid@rhel9: RHEL-09-652010
  
  ocil_clause: 'the package is not installed'
+ 
 diff --git a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_loghost/ansible/shared.yml b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_loghost/ansible/shared.yml
 index f42709ef5..8b35da68b 100644
 --- a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_loghost/ansible/shared.yml
@@ -10897,18 +11076,18 @@ index f2019bb9a..a12ceb5c1 100644
  {{{ bash_instantiate_variables("rsyslog_remote_loghost_address") }}}
  
 diff --git a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_loghost/rule.yml b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_loghost/rule.yml
-index 92cf57d08..e0f70bf9d 100644
+index 6a872bb25..2fd6c4777 100644
 --- a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_loghost/rule.yml
 +++ b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_loghost/rule.yml
-@@ -67,7 +67,7 @@ references:
+@@ -63,7 +63,7 @@ references:
      stigid@ol7: OL07-00-031000
      stigid@ol8: OL08-00-030690
      stigid@rhel7: RHEL-07-031000
 -    stigid@rhel8: RHEL-08-030690
 +    stigid@almalinux8: RHEL-08-030690
-     stigid@rhel9: RHEL-09-652055
      stigid@sle12: SLES-12-030340
      stigid@sle15: SLES-15-010580
+ 
 diff --git a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/ansible/shared.yml b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/ansible/shared.yml
 index d6e2b2564..323d3ffaa 100644
 --- a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/ansible/shared.yml
@@ -10930,20 +11109,20 @@ index ee1cbf7ea..eb4e5adc4 100644
  # strategy = configure
  # complexity = low
 diff --git a/linux_os/guide/system/logging/service_rsyslog_enabled/rule.yml b/linux_os/guide/system/logging/service_rsyslog_enabled/rule.yml
-index e423460c5..68f88d27d 100644
+index 210ee27da..9961ec6b2 100644
 --- a/linux_os/guide/system/logging/service_rsyslog_enabled/rule.yml
 +++ b/linux_os/guide/system/logging/service_rsyslog_enabled/rule.yml
-@@ -38,7 +38,7 @@ references:
+@@ -35,7 +35,7 @@ references:
      nist-csf: DE.CM-1,DE.CM-3,DE.CM-7,ID.SC-4,PR.DS-4,PR.PT-1
      srg: SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-010561
 -    stigid@rhel8: RHEL-08-010561
 +    stigid@almalinux8: RHEL-08-010561
-     stigid@rhel9: RHEL-09-652020
      stigid@ubuntu2004: UBTU-20-010432
+     stigid@ubuntu2204: UBTU-22-652010
  
 diff --git a/linux_os/guide/system/network/network-firewalld/firewalld-backend/rule.yml b/linux_os/guide/system/network/network-firewalld/firewalld-backend/rule.yml
-index 23204bae4..749046a97 100644
+index c18b89c9e..88fda59ab 100644
 --- a/linux_os/guide/system/network/network-firewalld/firewalld-backend/rule.yml
 +++ b/linux_os/guide/system/network/network-firewalld/firewalld-backend/rule.yml
 @@ -25,7 +25,7 @@ references:
@@ -10952,48 +11131,48 @@ index 23204bae4..749046a97 100644
      stigid@ol8: OL08-00-040150
 -    stigid@rhel8: RHEL-08-040150
 +    stigid@almalinux8: RHEL-08-040150
-     stigid@rhel9: RHEL-09-251030
  
  ocil_clause: 'the "nftables" is not set as the "firewallbackend"'
+ 
 diff --git a/linux_os/guide/system/network/network-firewalld/firewalld_activation/package_firewalld_installed/rule.yml b/linux_os/guide/system/network/network-firewalld/firewalld_activation/package_firewalld_installed/rule.yml
-index 9ddf98026..39fedc08b 100644
+index 36b27e13c..ca8535d5f 100644
 --- a/linux_os/guide/system/network/network-firewalld/firewalld_activation/package_firewalld_installed/rule.yml
 +++ b/linux_os/guide/system/network/network-firewalld/firewalld_activation/package_firewalld_installed/rule.yml
-@@ -38,7 +38,7 @@ references:
+@@ -35,7 +35,7 @@ references:
      srg: SRG-OS-000096-GPOS-00050,SRG-OS-000297-GPOS-00115,SRG-OS-000298-GPOS-00116,SRG-OS-000480-GPOS-00227,SRG-OS-000480-GPOS-00232
      stigid@ol7: OL07-00-040520
      stigid@ol8: OL08-00-040100
 -    stigid@rhel8: RHEL-08-040100
 +    stigid@almalinux8: RHEL-08-040100
-     stigid@rhel9: RHEL-09-251010
      stigid@sle15: SLES-15-010220
  
+ ocil_clause: 'the package is not installed'
 diff --git a/linux_os/guide/system/network/network-firewalld/firewalld_activation/service_firewalld_enabled/rule.yml b/linux_os/guide/system/network/network-firewalld/firewalld_activation/service_firewalld_enabled/rule.yml
-index 225a7057c..6552cc770 100644
+index f58c612c1..c1711a3cb 100644
 --- a/linux_os/guide/system/network/network-firewalld/firewalld_activation/service_firewalld_enabled/rule.yml
 +++ b/linux_os/guide/system/network/network-firewalld/firewalld_activation/service_firewalld_enabled/rule.yml
-@@ -46,7 +46,7 @@ references:
+@@ -41,7 +41,7 @@ references:
      stigid@ol7: OL07-00-040520
      stigid@ol8: OL08-00-040101
      stigid@rhel7: RHEL-07-040520
 -    stigid@rhel8: RHEL-08-040101
 +    stigid@almalinux8: RHEL-08-040101
-     stigid@rhel9: RHEL-09-251015
      stigid@sle15: SLES-15-010220
  
+ ocil_clause: '{{{ ocil_clause_service_enabled("firewalld") }}}'
 diff --git a/linux_os/guide/system/network/network-firewalld/ruleset_modifications/configure_firewalld_ports/rule.yml b/linux_os/guide/system/network/network-firewalld/ruleset_modifications/configure_firewalld_ports/rule.yml
-index 71a119393..5be80d5bc 100644
+index dd1d523c3..bfb44d9b8 100644
 --- a/linux_os/guide/system/network/network-firewalld/ruleset_modifications/configure_firewalld_ports/rule.yml
 +++ b/linux_os/guide/system/network/network-firewalld/ruleset_modifications/configure_firewalld_ports/rule.yml
-@@ -52,7 +52,7 @@ references:
+@@ -50,7 +50,7 @@ references:
      stigid@ol7: OL07-00-040100
      stigid@ol8: OL08-00-040030
      stigid@rhel7: RHEL-07-040100
 -    stigid@rhel8: RHEL-08-040030
 +    stigid@almalinux8: RHEL-08-040030
-     stigid@rhel9: RHEL-09-251025
  
  ocil_clause: 'there are additional ports, protocols, or services that are not in the PPSM CLSA, or there are ports, protocols, or services that are prohibited by the PPSM Category Assurance List (CAL), or there are no firewall rules configured'
+ 
 diff --git a/linux_os/guide/system/network/network-firewalld/ruleset_modifications/configure_firewalld_rate_limiting/ansible/shared.yml b/linux_os/guide/system/network/network-firewalld/ruleset_modifications/configure_firewalld_rate_limiting/ansible/shared.yml
 index 787eb6976..b507337f8 100644
 --- a/linux_os/guide/system/network/network-firewalld/ruleset_modifications/configure_firewalld_rate_limiting/ansible/shared.yml
@@ -11005,7 +11184,7 @@ index 787eb6976..b507337f8 100644
  # strategy = configure
  # complexity = low
 diff --git a/linux_os/guide/system/network/network-firewalld/ruleset_modifications/configured_firewalld_default_deny/rule.yml b/linux_os/guide/system/network/network-firewalld/ruleset_modifications/configured_firewalld_default_deny/rule.yml
-index 4553964d2..64dc3525c 100644
+index 2e4fa0372..eb1394573 100644
 --- a/linux_os/guide/system/network/network-firewalld/ruleset_modifications/configured_firewalld_default_deny/rule.yml
 +++ b/linux_os/guide/system/network/network-firewalld/ruleset_modifications/configured_firewalld_default_deny/rule.yml
 @@ -23,7 +23,7 @@ references:
@@ -11014,15 +11193,15 @@ index 4553964d2..64dc3525c 100644
      stigid@ol8: OL08-00-040090
 -    stigid@rhel8: RHEL-08-040090
 +    stigid@almalinux8: RHEL-08-040090
-     stigid@rhel9: RHEL-09-251020
  
  ocil_clause: 'no zones are active on the interfaces or if the target is set to a different option other than "DROP"'
+ 
 diff --git a/linux_os/guide/system/network/network-firewalld/ruleset_modifications/set_firewalld_default_zone/rule.yml b/linux_os/guide/system/network/network-firewalld/ruleset_modifications/set_firewalld_default_zone/rule.yml
-index 18907ee31..21fa42eb8 100644
+index 9df0c1208..4fd1a2c6a 100644
 --- a/linux_os/guide/system/network/network-firewalld/ruleset_modifications/set_firewalld_default_zone/rule.yml
 +++ b/linux_os/guide/system/network/network-firewalld/ruleset_modifications/set_firewalld_default_zone/rule.yml
-@@ -47,7 +47,7 @@ references:
-     pcidss4: '1.3.1,1.5.1'
+@@ -44,7 +44,7 @@ references:
+     pcidss: Req-1.4
      srg: SRG-OS-000480-GPOS-00227
      stigid@rhel7: RHEL-07-040810
 -    stigid@rhel8: RHEL-08-040090
@@ -11031,7 +11210,7 @@ index 18907ee31..21fa42eb8 100644
  ocil_clause: 'the default zone is not set to DROP'
  
 diff --git a/linux_os/guide/system/network/network-iptables/iptables_ruleset_modifications/ip6tables_rules_for_open_ports/sce/shared.sh b/linux_os/guide/system/network/network-iptables/iptables_ruleset_modifications/ip6tables_rules_for_open_ports/sce/shared.sh
-index ccfb8db79..e41d9c2d8 100644
+index 51b6c4fb6..679e35435 100644
 --- a/linux_os/guide/system/network/network-iptables/iptables_ruleset_modifications/ip6tables_rules_for_open_ports/sce/shared.sh
 +++ b/linux_os/guide/system/network/network-iptables/iptables_ruleset_modifications/ip6tables_rules_for_open_ports/sce/shared.sh
 @@ -1,5 +1,5 @@
@@ -11074,18 +11253,18 @@ index 87306fedb..88e2884bc 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_all_accept_ra/rule.yml b/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_all_accept_ra/rule.yml
-index 3dcc93b93..8567faf1d 100644
+index 91c89e484..8186b16fe 100644
 --- a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_all_accept_ra/rule.yml
 +++ b/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_all_accept_ra/rule.yml
-@@ -37,7 +37,7 @@ references:
+@@ -33,7 +33,7 @@ references:
      nist-csf: PR.IP-1,PR.PT-3
      srg: SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-040261
 -    stigid@rhel8: RHEL-08-040261
 +    stigid@almalinux8: RHEL-08-040261
-     stigid@rhel9: RHEL-09-254010
  
  {{{ complete_ocil_entry_sysctl_option_value(sysctl="net.ipv6.conf.all.accept_ra", value="0") }}}
+ 
 diff --git a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_all_accept_redirects/kubernetes/shared.yml b/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_all_accept_redirects/kubernetes/shared.yml
 index 8792fc668..2c7c4b025 100644
 --- a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_all_accept_redirects/kubernetes/shared.yml
@@ -11098,18 +11277,18 @@ index 8792fc668..2c7c4b025 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_all_accept_redirects/rule.yml b/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_all_accept_redirects/rule.yml
-index b5f8b62a6..3ba5d0c76 100644
+index ab1b748a3..9f23c7d8a 100644
 --- a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_all_accept_redirects/rule.yml
 +++ b/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_all_accept_redirects/rule.yml
-@@ -38,7 +38,7 @@ references:
+@@ -33,7 +33,7 @@ references:
      nist-csf: PR.IP-1,PR.PT-3
      srg: SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-040280
 -    stigid@rhel8: RHEL-08-040280
 +    stigid@almalinux8: RHEL-08-040280
-     stigid@rhel9: RHEL-09-254015
      stigid@sle12: SLES-12-030363
      stigid@sle15: SLES-15-040341
+ 
 diff --git a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_all_accept_source_route/kubernetes/shared.yml b/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_all_accept_source_route/kubernetes/shared.yml
 index e222b1c88..85b92ce90 100644
 --- a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_all_accept_source_route/kubernetes/shared.yml
@@ -11122,31 +11301,31 @@ index e222b1c88..85b92ce90 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_all_accept_source_route/rule.yml b/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_all_accept_source_route/rule.yml
-index 57ea1cb8f..c6551fef7 100644
+index e72a5746c..e88839b2e 100644
 --- a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_all_accept_source_route/rule.yml
 +++ b/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_all_accept_source_route/rule.yml
-@@ -48,7 +48,7 @@ references:
+@@ -43,7 +43,7 @@ references:
      stigid@ol7: OL07-00-040830
      stigid@ol8: OL08-00-040240
      stigid@rhel7: RHEL-07-040830
 -    stigid@rhel8: RHEL-08-040240
 +    stigid@almalinux8: RHEL-08-040240
-     stigid@rhel9: RHEL-09-254020
      stigid@sle12: SLES-12-030361
      stigid@sle15: SLES-15-040310
+ 
 diff --git a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_all_forwarding/rule.yml b/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_all_forwarding/rule.yml
-index 02e493846..ed401ad45 100644
+index 4e4740d6e..f5ef60296 100644
 --- a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_all_forwarding/rule.yml
 +++ b/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_all_forwarding/rule.yml
-@@ -37,7 +37,7 @@ references:
+@@ -34,7 +34,7 @@ references:
      nist-csf: DE.CM-1,PR.DS-4,PR.IP-1,PR.PT-3
      srg: SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-040260
 -    stigid@rhel8: RHEL-08-040260
 +    stigid@almalinux8: RHEL-08-040260
-     stigid@rhel9: RHEL-09-254025
      stigid@sle12: SLES-12-030364
      stigid@sle15: SLES-15-040381
+ 
 diff --git a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_default_accept_ra/kubernetes/shared.yml b/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_default_accept_ra/kubernetes/shared.yml
 index 4ed2c480c..f59b6d7c3 100644
 --- a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_default_accept_ra/kubernetes/shared.yml
@@ -11159,18 +11338,18 @@ index 4ed2c480c..f59b6d7c3 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_default_accept_ra/rule.yml b/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_default_accept_ra/rule.yml
-index 8f20c4de7..b91a262f0 100644
+index 10322ea8a..2f8fcc4a7 100644
 --- a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_default_accept_ra/rule.yml
 +++ b/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_default_accept_ra/rule.yml
-@@ -37,7 +37,7 @@ references:
+@@ -33,7 +33,7 @@ references:
      nist-csf: PR.IP-1,PR.PT-3
      srg: SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-040262
 -    stigid@rhel8: RHEL-08-040262
 +    stigid@almalinux8: RHEL-08-040262
-     stigid@rhel9: RHEL-09-254030
  
  {{{ complete_ocil_entry_sysctl_option_value(sysctl="net.ipv6.conf.default.accept_ra", value="0") }}}
+ 
 diff --git a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_default_accept_redirects/kubernetes/shared.yml b/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_default_accept_redirects/kubernetes/shared.yml
 index 845b013ed..063776b85 100644
 --- a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_default_accept_redirects/kubernetes/shared.yml
@@ -11183,18 +11362,18 @@ index 845b013ed..063776b85 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_default_accept_redirects/rule.yml b/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_default_accept_redirects/rule.yml
-index 0c832ff4e..33bbb66ae 100644
+index ba7b1168a..c288907eb 100644
 --- a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_default_accept_redirects/rule.yml
 +++ b/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_default_accept_redirects/rule.yml
-@@ -40,7 +40,7 @@ references:
+@@ -35,7 +35,7 @@ references:
      nist@sle15: CM-6(b),CM-6.1(iv)
      srg: SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-040210
 -    stigid@rhel8: RHEL-08-040210
 +    stigid@almalinux8: RHEL-08-040210
-     stigid@rhel9: RHEL-09-254035
      stigid@sle12: SLES-12-030401
      stigid@sle15: SLES-15-040350
+ 
 diff --git a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_default_accept_source_route/kubernetes/shared.yml b/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_default_accept_source_route/kubernetes/shared.yml
 index e2951d845..0335df123 100644
 --- a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_default_accept_source_route/kubernetes/shared.yml
@@ -11207,18 +11386,18 @@ index e2951d845..0335df123 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_default_accept_source_route/rule.yml b/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_default_accept_source_route/rule.yml
-index 0e74c07dc..da640932c 100644
+index 5ead94729..37574ad72 100644
 --- a/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_default_accept_source_route/rule.yml
 +++ b/linux_os/guide/system/network/network-ipv6/configuring_ipv6/sysctl_net_ipv6_conf_default_accept_source_route/rule.yml
-@@ -48,7 +48,7 @@ references:
-     pcidss4: '1.4.2'
+@@ -42,7 +42,7 @@ references:
+     pcidss: Req-1.4.3
      srg: SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-040250
 -    stigid@rhel8: RHEL-08-040250
 +    stigid@almalinux8: RHEL-08-040250
-     stigid@rhel9: RHEL-09-254040
      stigid@sle12: SLES-12-030362
      stigid@sle15: SLES-15-040321
+ 
 diff --git a/linux_os/guide/system/network/network-ipv6/disabling_ipv6/grub2_ipv6_disable_argument/tests/arg_not_there_rhel8.fail.sh b/linux_os/guide/system/network/network-ipv6/disabling_ipv6/grub2_ipv6_disable_argument/tests/arg_not_there_rhel8.fail.sh
 index 5d8daaa6b..604dc02c0 100644
 --- a/linux_os/guide/system/network/network-ipv6/disabling_ipv6/grub2_ipv6_disable_argument/tests/arg_not_there_rhel8.fail.sh
@@ -11273,18 +11452,18 @@ index 6bb6de134..1f0664a02 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_accept_redirects/rule.yml b/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_accept_redirects/rule.yml
-index 82876444a..17e33c67f 100644
+index 9791720a5..4fcc1f1f8 100644
 --- a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_accept_redirects/rule.yml
 +++ b/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_accept_redirects/rule.yml
-@@ -48,7 +48,7 @@ references:
+@@ -43,7 +43,7 @@ references:
      stigid@ol7: OL07-00-040641
      stigid@ol8: OL08-00-040279
      stigid@rhel7: RHEL-07-040641
 -    stigid@rhel8: RHEL-08-040279
 +    stigid@almalinux8: RHEL-08-040279
-     stigid@rhel9: RHEL-09-253015
      stigid@sle12: SLES-12-030390
      stigid@sle15: SLES-15-040330
+ 
 diff --git a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_accept_source_route/kubernetes/shared.yml b/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_accept_source_route/kubernetes/shared.yml
 index b3d72bb4a..b89b8a35a 100644
 --- a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_accept_source_route/kubernetes/shared.yml
@@ -11297,20 +11476,20 @@ index b3d72bb4a..b89b8a35a 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_accept_source_route/rule.yml b/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_accept_source_route/rule.yml
-index 0f0b45802..466d198a1 100644
+index 65aa94003..1453e4cdf 100644
 --- a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_accept_source_route/rule.yml
 +++ b/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_accept_source_route/rule.yml
-@@ -49,7 +49,7 @@ references:
+@@ -44,7 +44,7 @@ references:
      stigid@ol7: OL07-00-040610
      stigid@ol8: OL08-00-040239
      stigid@rhel7: RHEL-07-040610
 -    stigid@rhel8: RHEL-08-040239
 +    stigid@almalinux8: RHEL-08-040239
-     stigid@rhel9: RHEL-09-253020
      stigid@sle12: SLES-12-030360
      stigid@sle15: SLES-15-040300
+ 
 diff --git a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_forwarding/rule.yml b/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_forwarding/rule.yml
-index 5e49b1e1e..266940353 100644
+index 6f852e5e8..405f6ffe0 100644
 --- a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_forwarding/rule.yml
 +++ b/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_forwarding/rule.yml
 @@ -22,7 +22,7 @@ references:
@@ -11319,9 +11498,9 @@ index 5e49b1e1e..266940353 100644
      stigid@ol8: OL08-00-040259
 -    stigid@rhel8: RHEL-08-040259
 +    stigid@almalinux8: RHEL-08-040259
-     stigid@rhel9: RHEL-09-253075
  
  ocil_clause: 'IP forwarding value is "1" and the system is not router'
+ 
 diff --git a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_log_martians/kubernetes/shared.yml b/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_log_martians/kubernetes/shared.yml
 index 70e767cc4..fbe1a27a2 100644
 --- a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_log_martians/kubernetes/shared.yml
@@ -11345,18 +11524,18 @@ index c64da37a3..08535e5a1 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_rp_filter/rule.yml b/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_rp_filter/rule.yml
-index 9039cffc2..54949f4c0 100644
+index ba98de561..bc2aa07e4 100644
 --- a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_rp_filter/rule.yml
 +++ b/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_rp_filter/rule.yml
-@@ -47,7 +47,7 @@ references:
+@@ -41,7 +41,7 @@ references:
      stigid@ol7: OL07-00-040611
      stigid@ol8: OL08-00-040285
      stigid@rhel7: RHEL-07-040611
 -    stigid@rhel8: RHEL-08-040285
 +    stigid@almalinux8: RHEL-08-040285
-     stigid@rhel9: RHEL-09-253035
  
  ocil: |-
+     The runtime status of the <code>net.ipv4.conf.all.rp_filter</code> parameter can be queried
 diff --git a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_rp_filter/tests/value_1.pass.sh b/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_rp_filter/tests/value_1.pass.sh
 index 583b70a3b..d9bca3de6 100644
 --- a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_rp_filter/tests/value_1.pass.sh
@@ -11402,18 +11581,18 @@ index 2bfbd9e46..8ea37100a 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_default_accept_redirects/rule.yml b/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_default_accept_redirects/rule.yml
-index 9693c7912..17c781220 100644
+index 682de458f..08980f859 100644
 --- a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_default_accept_redirects/rule.yml
 +++ b/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_default_accept_redirects/rule.yml
-@@ -49,7 +49,7 @@ references:
+@@ -43,7 +43,7 @@ references:
      stigid@ol7: OL07-00-040640
      stigid@ol8: OL08-00-040209
      stigid@rhel7: RHEL-07-040640
 -    stigid@rhel8: RHEL-08-040209
 +    stigid@almalinux8: RHEL-08-040209
-     stigid@rhel9: RHEL-09-253040
      stigid@sle12: SLES-12-030400
      stigid@sle15: SLES-15-040340
+ 
 diff --git a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_default_accept_source_route/kubernetes/shared.yml b/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_default_accept_source_route/kubernetes/shared.yml
 index aa7d1562b..08668d03c 100644
 --- a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_default_accept_source_route/kubernetes/shared.yml
@@ -11426,18 +11605,18 @@ index aa7d1562b..08668d03c 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_default_accept_source_route/rule.yml b/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_default_accept_source_route/rule.yml
-index 514557228..82c4af364 100644
+index 798295502..6c5572da9 100644
 --- a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_default_accept_source_route/rule.yml
 +++ b/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_default_accept_source_route/rule.yml
-@@ -50,7 +50,7 @@ references:
+@@ -45,7 +45,7 @@ references:
      stigid@ol7: OL07-00-040620
      stigid@ol8: OL08-00-040249
      stigid@rhel7: RHEL-07-040620
 -    stigid@rhel8: RHEL-08-040249
 +    stigid@almalinux8: RHEL-08-040249
-     stigid@rhel9: RHEL-09-253045
      stigid@sle12: SLES-12-030370
      stigid@sle15: SLES-15-040320
+ 
 diff --git a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_default_log_martians/kubernetes/shared.yml b/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_default_log_martians/kubernetes/shared.yml
 index 3a60ab17c..728ddb817 100644
 --- a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_default_log_martians/kubernetes/shared.yml
@@ -11483,18 +11662,18 @@ index 52d74441b..08c8c256d 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_icmp_echo_ignore_broadcasts/rule.yml b/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_icmp_echo_ignore_broadcasts/rule.yml
-index 857186d06..6ede72fc5 100644
+index cff525653..aa5bf8809 100644
 --- a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_icmp_echo_ignore_broadcasts/rule.yml
 +++ b/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_icmp_echo_ignore_broadcasts/rule.yml
-@@ -48,7 +48,7 @@ references:
+@@ -43,7 +43,7 @@ references:
      stigid@ol7: OL07-00-040630
      stigid@ol8: OL08-00-040230
      stigid@rhel7: RHEL-07-040630
 -    stigid@rhel8: RHEL-08-040230
 +    stigid@almalinux8: RHEL-08-040230
-     stigid@rhel9: RHEL-09-253055
      stigid@sle12: SLES-12-030380
  
+ {{{ complete_ocil_entry_sysctl_option_value(sysctl="net.ipv4.icmp_echo_ignore_broadcasts", value="1") }}}
 diff --git a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_icmp_ignore_bogus_error_responses/kubernetes/shared.yml b/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_icmp_ignore_bogus_error_responses/kubernetes/shared.yml
 index 9e3a85af9..d4f4d31cb 100644
 --- a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_icmp_ignore_bogus_error_responses/kubernetes/shared.yml
@@ -11529,18 +11708,18 @@ index ea1db12fe..5d8b19f68 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/network/network-kernel/network_host_parameters/sysctl_net_ipv4_conf_all_send_redirects/rule.yml b/linux_os/guide/system/network/network-kernel/network_host_parameters/sysctl_net_ipv4_conf_all_send_redirects/rule.yml
-index 88531b904..258f726c0 100644
+index a8b11cd1a..c25e8e76c 100644
 --- a/linux_os/guide/system/network/network-kernel/network_host_parameters/sysctl_net_ipv4_conf_all_send_redirects/rule.yml
 +++ b/linux_os/guide/system/network/network-kernel/network_host_parameters/sysctl_net_ipv4_conf_all_send_redirects/rule.yml
-@@ -48,7 +48,7 @@ references:
+@@ -42,7 +42,7 @@ references:
      stigid@ol7: OL07-00-040660
      stigid@ol8: OL08-00-040220
      stigid@rhel7: RHEL-07-040660
 -    stigid@rhel8: RHEL-08-040220
 +    stigid@almalinux8: RHEL-08-040220
-     stigid@rhel9: RHEL-09-253065
      stigid@sle12: SLES-12-030420
      stigid@sle15: SLES-15-040370
+ 
 diff --git a/linux_os/guide/system/network/network-kernel/network_host_parameters/sysctl_net_ipv4_conf_default_send_redirects/kubernetes/shared.yml b/linux_os/guide/system/network/network-kernel/network_host_parameters/sysctl_net_ipv4_conf_default_send_redirects/kubernetes/shared.yml
 index b54e3d12b..125464d7a 100644
 --- a/linux_os/guide/system/network/network-kernel/network_host_parameters/sysctl_net_ipv4_conf_default_send_redirects/kubernetes/shared.yml
@@ -11553,18 +11732,18 @@ index b54e3d12b..125464d7a 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/network/network-kernel/network_host_parameters/sysctl_net_ipv4_conf_default_send_redirects/rule.yml b/linux_os/guide/system/network/network-kernel/network_host_parameters/sysctl_net_ipv4_conf_default_send_redirects/rule.yml
-index 43baaf2f3..c9316d17b 100644
+index 4eb52cc76..cbaabef0f 100644
 --- a/linux_os/guide/system/network/network-kernel/network_host_parameters/sysctl_net_ipv4_conf_default_send_redirects/rule.yml
 +++ b/linux_os/guide/system/network/network-kernel/network_host_parameters/sysctl_net_ipv4_conf_default_send_redirects/rule.yml
-@@ -48,7 +48,7 @@ references:
+@@ -42,7 +42,7 @@ references:
      stigid@ol7: OL07-00-040650
      stigid@ol8: OL08-00-040270
      stigid@rhel7: RHEL-07-040650
 -    stigid@rhel8: RHEL-08-040270
 +    stigid@almalinux8: RHEL-08-040270
-     stigid@rhel9: RHEL-09-253070
      stigid@sle12: SLES-12-030410
      stigid@sle15: SLES-15-040360
+ 
 diff --git a/linux_os/guide/system/network/network-nftables/set_nftables_table/sce/shared.sh b/linux_os/guide/system/network/network-nftables/set_nftables_table/sce/shared.sh
 index 89d344c4f..1a926adaa 100644
 --- a/linux_os/guide/system/network/network-nftables/set_nftables_table/sce/shared.sh
@@ -11577,7 +11756,7 @@ index 89d344c4f..1a926adaa 100644
  
  tbl_output=$(nft list tables | grep inet)
 diff --git a/linux_os/guide/system/network/network-uncommon/kernel_module_atm_disabled/rule.yml b/linux_os/guide/system/network/network-uncommon/kernel_module_atm_disabled/rule.yml
-index 5bf60eb12..602f283c4 100644
+index 9e964b770..3b32a06df 100644
 --- a/linux_os/guide/system/network/network-uncommon/kernel_module_atm_disabled/rule.yml
 +++ b/linux_os/guide/system/network/network-uncommon/kernel_module_atm_disabled/rule.yml
 @@ -27,7 +27,7 @@ references:
@@ -11586,11 +11765,11 @@ index 5bf60eb12..602f283c4 100644
      stigid@ol8: OL08-00-040021
 -    stigid@rhel8: RHEL-08-040021
 +    stigid@almalinux8: RHEL-08-040021
-     stigid@rhel9: RHEL-09-213045
  
  {{{ complete_ocil_entry_module_disable(module="atm") }}}
+ 
 diff --git a/linux_os/guide/system/network/network-uncommon/kernel_module_can_disabled/rule.yml b/linux_os/guide/system/network/network-uncommon/kernel_module_can_disabled/rule.yml
-index 7f951a269..b7f4f9516 100644
+index 9e67a0f52..0201cb56a 100644
 --- a/linux_os/guide/system/network/network-uncommon/kernel_module_can_disabled/rule.yml
 +++ b/linux_os/guide/system/network/network-uncommon/kernel_module_can_disabled/rule.yml
 @@ -27,7 +27,7 @@ references:
@@ -11599,9 +11778,9 @@ index 7f951a269..b7f4f9516 100644
      stigid@ol8: OL08-00-040022
 -    stigid@rhel8: RHEL-08-040022
 +    stigid@almalinux8: RHEL-08-040022
-     stigid@rhel9: RHEL-09-213050
  
  {{{ complete_ocil_entry_module_disable(module="can") }}}
+ 
 diff --git a/linux_os/guide/system/network/network-uncommon/kernel_module_dccp_disabled/tests/missing_blacklist.fail.sh b/linux_os/guide/system/network/network-uncommon/kernel_module_dccp_disabled/tests/missing_blacklist.fail.sh
 index 57cc29270..4b1b2805e 100644
 --- a/linux_os/guide/system/network/network-uncommon/kernel_module_dccp_disabled/tests/missing_blacklist.fail.sh
@@ -11614,7 +11793,7 @@ index 57cc29270..4b1b2805e 100644
  rm -f /etc/modprobe.d/dccp-blacklist.conf
  echo "install {{{ KERNMODULE }}} /bin/true" > /etc/modprobe.d/{{{ KERNMODULE }}}.conf
 diff --git a/linux_os/guide/system/network/network-uncommon/kernel_module_firewire-core_disabled/rule.yml b/linux_os/guide/system/network/network-uncommon/kernel_module_firewire-core_disabled/rule.yml
-index 2af5055af..0a1aa3a30 100644
+index 2d8804831..a40f93e5d 100644
 --- a/linux_os/guide/system/network/network-uncommon/kernel_module_firewire-core_disabled/rule.yml
 +++ b/linux_os/guide/system/network/network-uncommon/kernel_module_firewire-core_disabled/rule.yml
 @@ -26,7 +26,7 @@ references:
@@ -11623,37 +11802,37 @@ index 2af5055af..0a1aa3a30 100644
      stigid@ol8: OL08-00-040026
 -    stigid@rhel8: RHEL-08-040026
 +    stigid@almalinux8: RHEL-08-040026
-     stigid@rhel9: RHEL-09-213055
  
  {{{ complete_ocil_entry_module_disable(module="firewire-core") }}}
+ 
 diff --git a/linux_os/guide/system/network/network-uncommon/kernel_module_sctp_disabled/rule.yml b/linux_os/guide/system/network/network-uncommon/kernel_module_sctp_disabled/rule.yml
-index 4ebec10ec..786273f30 100644
+index 4a07631b4..5793f4aa9 100644
 --- a/linux_os/guide/system/network/network-uncommon/kernel_module_sctp_disabled/rule.yml
 +++ b/linux_os/guide/system/network/network-uncommon/kernel_module_sctp_disabled/rule.yml
-@@ -45,7 +45,7 @@ references:
-     pcidss4: "1.4.2"
+@@ -42,7 +42,7 @@ references:
+     pcidss: Req-1.4.2
      srg: SRG-OS-000095-GPOS-00049,SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-040023
 -    stigid@rhel8: RHEL-08-040023
 +    stigid@almalinux8: RHEL-08-040023
-     stigid@rhel9: RHEL-09-213060
  
  {{{ complete_ocil_entry_module_disable(module="sctp") }}}
+ 
 diff --git a/linux_os/guide/system/network/network-uncommon/kernel_module_tipc_disabled/rule.yml b/linux_os/guide/system/network/network-uncommon/kernel_module_tipc_disabled/rule.yml
-index b1e4d2557..9e83ffa34 100644
+index 8dc3c982f..ebbe9dd06 100644
 --- a/linux_os/guide/system/network/network-uncommon/kernel_module_tipc_disabled/rule.yml
 +++ b/linux_os/guide/system/network/network-uncommon/kernel_module_tipc_disabled/rule.yml
-@@ -44,7 +44,7 @@ references:
+@@ -41,7 +41,7 @@ references:
      ospp: FMT_SMF_EXT.1
      srg: SRG-OS-000095-GPOS-00049
      stigid@ol8: OL08-00-040024
 -    stigid@rhel8: RHEL-08-040024
 +    stigid@almalinux8: RHEL-08-040024
-     stigid@rhel9: RHEL-09-213065
  
  {{{ complete_ocil_entry_module_disable(module="tipc") }}}
+ 
 diff --git a/linux_os/guide/system/network/network-wireless/wireless_software/kernel_module_bluetooth_disabled/rule.yml b/linux_os/guide/system/network/network-wireless/wireless_software/kernel_module_bluetooth_disabled/rule.yml
-index ebeb377a9..ba37f5ec1 100644
+index 18eb627e6..e08774e92 100644
 --- a/linux_os/guide/system/network/network-wireless/wireless_software/kernel_module_bluetooth_disabled/rule.yml
 +++ b/linux_os/guide/system/network/network-wireless/wireless_software/kernel_module_bluetooth_disabled/rule.yml
 @@ -36,7 +36,7 @@ references:
@@ -11662,11 +11841,11 @@ index ebeb377a9..ba37f5ec1 100644
      stigid@ol8: OL08-00-040111
 -    stigid@rhel8: RHEL-08-040111
 +    stigid@almalinux8: RHEL-08-040111
-     stigid@rhel9: RHEL-09-291035
  
  {{{ complete_ocil_entry_module_disable(module="bluetooth") }}}
+ 
 diff --git a/linux_os/guide/system/network/network-wireless/wireless_software/wireless_disable_interfaces/rule.yml b/linux_os/guide/system/network/network-wireless/wireless_software/wireless_disable_interfaces/rule.yml
-index 398948718..afb2d3480 100644
+index bc2af8477..5522d1345 100644
 --- a/linux_os/guide/system/network/network-wireless/wireless_software/wireless_disable_interfaces/rule.yml
 +++ b/linux_os/guide/system/network/network-wireless/wireless_software/wireless_disable_interfaces/rule.yml
 @@ -63,7 +63,7 @@ references:
@@ -11675,11 +11854,11 @@ index 398948718..afb2d3480 100644
      stigid@rhel7: RHEL-07-041010
 -    stigid@rhel8: RHEL-08-040110
 +    stigid@almalinux8: RHEL-08-040110
-     stigid@rhel9: RHEL-09-291040
      stigid@sle12: SLES-12-030450
      stigid@sle15: SLES-15-010380
+     stigid@ubuntu2004: UBTU-20-010455
 diff --git a/linux_os/guide/system/network/network_configure_name_resolution/rule.yml b/linux_os/guide/system/network/network_configure_name_resolution/rule.yml
-index a9dc1b633..ea03598c7 100644
+index 93db24be0..17b84047d 100644
 --- a/linux_os/guide/system/network/network_configure_name_resolution/rule.yml
 +++ b/linux_os/guide/system/network/network_configure_name_resolution/rule.yml
 @@ -53,7 +53,7 @@ references:
@@ -11688,9 +11867,9 @@ index a9dc1b633..ea03598c7 100644
      stigid@rhel7: RHEL-07-040600
 -    stigid@rhel8: RHEL-08-010680
 +    stigid@almalinux8: RHEL-08-010680
-     stigid@rhel9: RHEL-09-252035
  
  ocil_clause: 'less than two lines are returned that are not commented out'
+ 
 diff --git a/linux_os/guide/system/network/network_configure_name_resolution/tests/dns_not_in_nsswitch_and_resolv_is_empty.pass.sh b/linux_os/guide/system/network/network_configure_name_resolution/tests/dns_not_in_nsswitch_and_resolv_is_empty.pass.sh
 index 0f2d15979..27572472b 100644
 --- a/linux_os/guide/system/network/network_configure_name_resolution/tests/dns_not_in_nsswitch_and_resolv_is_empty.pass.sh
@@ -11719,41 +11898,41 @@ index 6f2e6fa20..ea9c566f9 100644
 +# platform = Red Hat Enterprise Linux 7,Red Hat Enterprise Linux 8,AlmaLinux 8
  echo "NOZEROCONF=yes" >> /etc/sysconfig/network
 diff --git a/linux_os/guide/system/network/network_nmcli_permissions/ansible/shared.yml b/linux_os/guide/system/network/network_nmcli_permissions/ansible/shared.yml
-index 3f497dc7b..f85aac045 100644
+index 8f4b370ac..c818440d2 100644
 --- a/linux_os/guide/system/network/network_nmcli_permissions/ansible/shared.yml
 +++ b/linux_os/guide/system/network/network_nmcli_permissions/ansible/shared.yml
 @@ -1,4 +1,4 @@
--# platform = Red Hat Enterprise Linux 7,Red Hat Enterprise Linux 8,multi_platform_rhv,multi_platform_fedora
-+# platform = Red Hat Enterprise Linux 7,Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_rhv,multi_platform_fedora
+-# platform = Red Hat Enterprise Linux 7,Red Hat Enterprise Linux 8,multi_platform_ol,multi_platform_rhv,multi_platform_fedora
++# platform = Red Hat Enterprise Linux 7,Red Hat Enterprise Linux 8,AlmaLinux 8,multi_platform_ol,multi_platform_rhv,multi_platform_fedora
  # reboot = false
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/system/network/network_sniffer_disabled/rule.yml b/linux_os/guide/system/network/network_sniffer_disabled/rule.yml
-index 08e686c80..6c088d51f 100644
+index ff68190cb..9f590cbf9 100644
 --- a/linux_os/guide/system/network/network_sniffer_disabled/rule.yml
 +++ b/linux_os/guide/system/network/network_sniffer_disabled/rule.yml
-@@ -47,7 +47,7 @@ references:
+@@ -46,7 +46,7 @@ references:
      stigid@ol7: OL07-00-040670
      stigid@ol8: OL08-00-040330
      stigid@rhel7: RHEL-07-040670
 -    stigid@rhel8: RHEL-08-040330
 +    stigid@almalinux8: RHEL-08-040330
-     stigid@rhel9: RHEL-09-251040
      stigid@sle12: SLES-12-030440
      stigid@sle15: SLES-15-040390
+ 
 diff --git a/linux_os/guide/system/permissions/files/dir_perms_world_writable_root_owned/rule.yml b/linux_os/guide/system/permissions/files/dir_perms_world_writable_root_owned/rule.yml
-index e4ceeaa8b..30049daa5 100644
+index db3b86f2f..7ae0057ab 100644
 --- a/linux_os/guide/system/permissions/files/dir_perms_world_writable_root_owned/rule.yml
 +++ b/linux_os/guide/system/permissions/files/dir_perms_world_writable_root_owned/rule.yml
-@@ -26,7 +26,7 @@ references:
-     anssi: BP28(R40)
+@@ -25,7 +25,7 @@ identifiers:
+ references:
      disa: CCI-000366
      srg: SRG-OS-000480-GPOS-00227,SRG-OS-000138-GPOS-00069
 -    stigid@rhel8: RHEL-08-010700
 +    stigid@almalinux8: RHEL-08-010700
-     stigid@rhel9: RHEL-09-232240
  
  ocil_clause: 'there are world-writable directories not owned by root'
+ 
 diff --git a/linux_os/guide/system/permissions/files/dir_perms_world_writable_sticky_bits/ansible/shared.yml b/linux_os/guide/system/permissions/files/dir_perms_world_writable_sticky_bits/ansible/shared.yml
 index dcb2b99b7..8dbb02940 100644
 --- a/linux_os/guide/system/permissions/files/dir_perms_world_writable_sticky_bits/ansible/shared.yml
@@ -11775,18 +11954,18 @@ index 91b3495c9..7f3876c49 100644
  | xargs -I '$6' find '$6' -xdev -type d \
  \( -perm -0002 -a ! -perm -1000 \) 2>/dev/null \
 diff --git a/linux_os/guide/system/permissions/files/dir_perms_world_writable_sticky_bits/rule.yml b/linux_os/guide/system/permissions/files/dir_perms_world_writable_sticky_bits/rule.yml
-index e950afe03..401060402 100644
+index 2de82bc0d..305910dde 100644
 --- a/linux_os/guide/system/permissions/files/dir_perms_world_writable_sticky_bits/rule.yml
 +++ b/linux_os/guide/system/permissions/files/dir_perms_world_writable_sticky_bits/rule.yml
-@@ -55,7 +55,7 @@ references:
-     pcidss4: '2.2.6'
+@@ -50,7 +50,7 @@ references:
+     nist-csf: PR.AC-4,PR.DS-5
      srg: SRG-OS-000138-GPOS-00069
      stigid@ol8: OL08-00-010190
 -    stigid@rhel8: RHEL-08-010190
 +    stigid@almalinux8: RHEL-08-010190
-     stigid@rhel9: RHEL-09-232245
      stigid@sle12: SLES-12-010460
      stigid@sle15: SLES-15-010300
+     stigid@ubuntu2004: UBTU-20-010411
 diff --git a/linux_os/guide/system/permissions/files/dir_perms_world_writable_system_owned_group/rule.yml b/linux_os/guide/system/permissions/files/dir_perms_world_writable_system_owned_group/rule.yml
 index fb414f5d7..9bdf10430 100644
 --- a/linux_os/guide/system/permissions/files/dir_perms_world_writable_system_owned_group/rule.yml
@@ -11801,7 +11980,7 @@ index fb414f5d7..9bdf10430 100644
      stigid@sle15: SLES-15-040180
  
 diff --git a/linux_os/guide/system/permissions/files/file_permissions_etc_audit_auditd/rule.yml b/linux_os/guide/system/permissions/files/file_permissions_etc_audit_auditd/rule.yml
-index d692cae80..9ed181e88 100644
+index 3685506de..a2087cd7a 100644
 --- a/linux_os/guide/system/permissions/files/file_permissions_etc_audit_auditd/rule.yml
 +++ b/linux_os/guide/system/permissions/files/file_permissions_etc_audit_auditd/rule.yml
 @@ -27,7 +27,7 @@ references:
@@ -11810,11 +11989,11 @@ index d692cae80..9ed181e88 100644
      stigid@ol8: OL08-00-030610
 -    stigid@rhel8: RHEL-08-030610
 +    stigid@almalinux8: RHEL-08-030610
-     stigid@rhel9: RHEL-09-653115
      stigid@ubuntu2004: UBTU-20-010133
+     stigid@ubuntu2204: UBTU-22-653065
  
 diff --git a/linux_os/guide/system/permissions/files/file_permissions_etc_audit_rulesd/rule.yml b/linux_os/guide/system/permissions/files/file_permissions_etc_audit_rulesd/rule.yml
-index 19606408d..e54d23d4b 100644
+index ebc6f74a4..769ee9a6f 100644
 --- a/linux_os/guide/system/permissions/files/file_permissions_etc_audit_rulesd/rule.yml
 +++ b/linux_os/guide/system/permissions/files/file_permissions_etc_audit_rulesd/rule.yml
 @@ -27,7 +27,7 @@ references:
@@ -11823,37 +12002,37 @@ index 19606408d..e54d23d4b 100644
      stigid@ol8: OL08-00-030610
 -    stigid@rhel8: RHEL-08-030610
 +    stigid@almalinux8: RHEL-08-030610
-     stigid@rhel9: RHEL-09-653110
      stigid@ubuntu2004: UBTU-20-010133
+     stigid@ubuntu2204: UBTU-22-653065
  
 diff --git a/linux_os/guide/system/permissions/files/file_permissions_ungroupowned/rule.yml b/linux_os/guide/system/permissions/files/file_permissions_ungroupowned/rule.yml
-index 71f7d9bb4..e81113895 100644
+index 1e2f7f2b0..7c5015b12 100644
 --- a/linux_os/guide/system/permissions/files/file_permissions_ungroupowned/rule.yml
 +++ b/linux_os/guide/system/permissions/files/file_permissions_ungroupowned/rule.yml
-@@ -53,7 +53,7 @@ references:
+@@ -48,7 +48,7 @@ references:
      stigid@ol7: OL07-00-020330
      stigid@ol8: OL08-00-010790
      stigid@rhel7: RHEL-07-020330
 -    stigid@rhel8: RHEL-08-010790
 +    stigid@almalinux8: RHEL-08-010790
-     stigid@rhel9: RHEL-09-232250
      stigid@sle12: SLES-12-010700
      stigid@sle15: SLES-15-040410
+ 
 diff --git a/linux_os/guide/system/permissions/files/no_files_unowned_by_user/rule.yml b/linux_os/guide/system/permissions/files/no_files_unowned_by_user/rule.yml
-index 62e980833..456f758e0 100644
+index 93ec22b35..b39bf72df 100644
 --- a/linux_os/guide/system/permissions/files/no_files_unowned_by_user/rule.yml
 +++ b/linux_os/guide/system/permissions/files/no_files_unowned_by_user/rule.yml
-@@ -52,7 +52,7 @@ references:
+@@ -47,7 +47,7 @@ references:
      stigid@ol7: OL07-00-020320
      stigid@ol8: OL08-00-010780
      stigid@rhel7: RHEL-07-020320
 -    stigid@rhel8: RHEL-08-010780
 +    stigid@almalinux8: RHEL-08-010780
-     stigid@rhel9: RHEL-09-232255
      stigid@sle12: SLES-12-010690
      stigid@sle15: SLES-15-040400
+ 
 diff --git a/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_groupowner_var_log/rule.yml b/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_groupowner_var_log/rule.yml
-index 8c5204806..e178d9508 100644
+index 8b5becc78..7cacd475a 100644
 --- a/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_groupowner_var_log/rule.yml
 +++ b/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_groupowner_var_log/rule.yml
 @@ -27,7 +27,7 @@ references:
@@ -11862,11 +12041,11 @@ index 8c5204806..e178d9508 100644
      stigid@ol8: OL08-00-010260
 -    stigid@rhel8: RHEL-08-010260
 +    stigid@almalinux8: RHEL-08-010260
-     stigid@rhel9: RHEL-09-232175
      stigid@ubuntu2004: UBTU-20-010417
+     stigid@ubuntu2204: UBTU-22-232125
  
 diff --git a/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_groupowner_var_log_messages/rule.yml b/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_groupowner_var_log_messages/rule.yml
-index 8e4b7d00c..768d99cfa 100644
+index 797bfafc3..9518e6eb6 100644
 --- a/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_groupowner_var_log_messages/rule.yml
 +++ b/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_groupowner_var_log_messages/rule.yml
 @@ -18,7 +18,7 @@ references:
@@ -11875,11 +12054,11 @@ index 8e4b7d00c..768d99cfa 100644
      stigid@ol8: OL08-00-010230
 -    stigid@rhel8: RHEL-08-010230
 +    stigid@almalinux8: RHEL-08-010230
-     stigid@rhel9: RHEL-09-232185
  
  ocil_clause: '{{{ ocil_clause_file_group_owner(file="/var/log/messages", group="root") }}}'
+ 
 diff --git a/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_owner_var_log/rule.yml b/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_owner_var_log/rule.yml
-index 5870e7e27..cb37f1ee4 100644
+index 57b86f1fa..5950d2e9b 100644
 --- a/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_owner_var_log/rule.yml
 +++ b/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_owner_var_log/rule.yml
 @@ -20,7 +20,7 @@ references:
@@ -11888,11 +12067,11 @@ index 5870e7e27..cb37f1ee4 100644
      stigid@ol8: OL08-00-010250
 -    stigid@rhel8: RHEL-08-010250
 +    stigid@almalinux8: RHEL-08-010250
-     stigid@rhel9: RHEL-09-232170
      stigid@ubuntu2004: UBTU-20-010418
+     stigid@ubuntu2204: UBTU-22-232120
  
 diff --git a/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_owner_var_log_messages/rule.yml b/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_owner_var_log_messages/rule.yml
-index a286eff79..79ef6c7fe 100644
+index f0d63e361..21c82f341 100644
 --- a/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_owner_var_log_messages/rule.yml
 +++ b/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_owner_var_log_messages/rule.yml
 @@ -18,7 +18,7 @@ references:
@@ -11901,11 +12080,11 @@ index a286eff79..79ef6c7fe 100644
      stigid@ol8: OL08-00-010220
 -    stigid@rhel8: RHEL-08-010220
 +    stigid@almalinux8: RHEL-08-010220
-     stigid@rhel9: RHEL-09-232180
  
  ocil_clause: '{{{ ocil_clause_file_owner(file="/var/log/messages", owner="root") }}}'
+ 
 diff --git a/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_permissions_var_log/rule.yml b/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_permissions_var_log/rule.yml
-index abf9a202e..baac59007 100644
+index 91c096e7c..6012574ca 100644
 --- a/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_permissions_var_log/rule.yml
 +++ b/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_permissions_var_log/rule.yml
 @@ -21,7 +21,7 @@ references:
@@ -11914,11 +12093,11 @@ index abf9a202e..baac59007 100644
      stigid@ol8: OL08-00-010240
 -    stigid@rhel8: RHEL-08-010240
 +    stigid@almalinux8: RHEL-08-010240
-     stigid@rhel9: RHEL-09-232025
      stigid@ubuntu2004: UBTU-20-010419
+     stigid@ubuntu2204: UBTU-22-232025
  
 diff --git a/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_permissions_var_log_messages/rule.yml b/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_permissions_var_log_messages/rule.yml
-index b92a28282..558a60be1 100644
+index d0cded9af..5125eb59e 100644
 --- a/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_permissions_var_log_messages/rule.yml
 +++ b/linux_os/guide/system/permissions/files/permissions_var_log_dir/file_permissions_var_log_messages/rule.yml
 @@ -19,7 +19,7 @@ references:
@@ -11927,11 +12106,11 @@ index b92a28282..558a60be1 100644
      stigid@ol8: OL08-00-010210
 -    stigid@rhel8: RHEL-08-010210
 +    stigid@almalinux8: RHEL-08-010210
-     stigid@rhel9: RHEL-09-232030
  
  ocil_clause: '{{{ ocil_clause_file_permissions(file="/var/log/messages", perms="-rw-r-----") }}}'
+ 
 diff --git a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/dir_group_ownership_library_dirs/rule.yml b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/dir_group_ownership_library_dirs/rule.yml
-index 6b98f1d51..fff9e1cae 100644
+index 0d125b8f1..28154508f 100644
 --- a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/dir_group_ownership_library_dirs/rule.yml
 +++ b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/dir_group_ownership_library_dirs/rule.yml
 @@ -38,7 +38,7 @@ references:
@@ -11940,11 +12119,11 @@ index 6b98f1d51..fff9e1cae 100644
      stigid@ol8: OL08-00-010351
 -    stigid@rhel8: RHEL-08-010351
 +    stigid@almalinux8: RHEL-08-010351
-     stigid@rhel9: RHEL-09-232215
      stigid@sle12: SLES-12-010876
      stigid@sle15: SLES-15-010356
+     stigid@ubuntu2004: UBTU-20-010431
 diff --git a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/dir_ownership_library_dirs/rule.yml b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/dir_ownership_library_dirs/rule.yml
-index d69dcf07e..d879c084d 100644
+index ce747207d..9184f4f82 100644
 --- a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/dir_ownership_library_dirs/rule.yml
 +++ b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/dir_ownership_library_dirs/rule.yml
 @@ -37,7 +37,7 @@ references:
@@ -11953,9 +12132,9 @@ index d69dcf07e..d879c084d 100644
      stigid@ol8: OL08-00-010341
 -    stigid@rhel8: RHEL-08-010341
 +    stigid@almalinux8: RHEL-08-010341
-     stigid@rhel9: RHEL-09-232210
      stigid@sle12: SLES-12-010874
      stigid@sle15: SLES-15-010354
+     stigid@ubuntu2004: UBTU-20-010429
 diff --git a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/dir_ownership_library_dirs/tests/correct_owner.pass.sh b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/dir_ownership_library_dirs/tests/correct_owner.pass.sh
 index d2b47d989..9f25146b9 100644
 --- a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/dir_ownership_library_dirs/tests/correct_owner.pass.sh
@@ -11977,7 +12156,7 @@ index 542184ae8..9cdfbf737 100644
  DIRS="/lib /lib64"
  for dirPath in $DIRS; do
 diff --git a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/dir_permissions_library_dirs/rule.yml b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/dir_permissions_library_dirs/rule.yml
-index 5e9aeae2b..5fb5bef83 100644
+index 68230eb4b..d9808b10a 100644
 --- a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/dir_permissions_library_dirs/rule.yml
 +++ b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/dir_permissions_library_dirs/rule.yml
 @@ -44,7 +44,7 @@ references:
@@ -11986,9 +12165,9 @@ index 5e9aeae2b..5fb5bef83 100644
      stigid@ol8: OL08-00-010331
 -    stigid@rhel8: RHEL-08-010331
 +    stigid@almalinux8: RHEL-08-010331
-     stigid@rhel9: RHEL-09-232015
      stigid@sle12: SLES-12-010872
      stigid@sle15: SLES-15-010352
+     stigid@ubuntu2004: UBTU-20-010427
 diff --git a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/dir_permissions_library_dirs/tests/all_dirs_ok.pass.sh b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/dir_permissions_library_dirs/tests/all_dirs_ok.pass.sh
 index 5f8dcd2eb..7980d87b5 100644
 --- a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/dir_permissions_library_dirs/tests/all_dirs_ok.pass.sh
@@ -12050,18 +12229,18 @@ index b9bbe4dbe..2652ea041 100644
  for SYSCMDFILES in /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin
  do
 diff --git a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_groupownership_system_commands_dirs/rule.yml b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_groupownership_system_commands_dirs/rule.yml
-index 57435e380..a7b75a27e 100644
+index be0eb09e1..427c8527a 100644
 --- a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_groupownership_system_commands_dirs/rule.yml
 +++ b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_groupownership_system_commands_dirs/rule.yml
-@@ -44,7 +44,7 @@ references:
+@@ -45,7 +45,7 @@ references:
      nist: CM-5(6),CM-5(6).1
      srg: SRG-OS-000259-GPOS-00100
      stigid@ol8: OL08-00-010320
 -    stigid@rhel8: RHEL-08-010320
 +    stigid@almalinux8: RHEL-08-010320
-     stigid@rhel9: RHEL-09-232195
      stigid@sle12: SLES-12-010882
      stigid@sle15: SLES-15-010361
+     stigid@ubuntu2004: UBTU-20-010458
 diff --git a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_ownership_binary_dirs/ansible/shared.yml b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_ownership_binary_dirs/ansible/shared.yml
 index 04178f485..ce116710e 100644
 --- a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_ownership_binary_dirs/ansible/shared.yml
@@ -12083,7 +12262,7 @@ index 5471f360f..1a2c2a9fa 100644
  /usr/bin/ \
  /usr/local/bin/ \
 diff --git a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_ownership_binary_dirs/rule.yml b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_ownership_binary_dirs/rule.yml
-index 735092787..473d6c8af 100644
+index a8a1bab78..52580de96 100644
 --- a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_ownership_binary_dirs/rule.yml
 +++ b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_ownership_binary_dirs/rule.yml
 @@ -43,7 +43,7 @@ references:
@@ -12092,11 +12271,11 @@ index 735092787..473d6c8af 100644
      stigid@ol8: OL08-00-010310
 -    stigid@rhel8: RHEL-08-010310
 +    stigid@almalinux8: RHEL-08-010310
-     stigid@rhel9: RHEL-09-232190
      stigid@sle12: SLES-12-010879
      stigid@sle15: SLES-15-010359
+     stigid@ubuntu2004: UBTU-20-010457
 diff --git a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_ownership_library_dirs/rule.yml b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_ownership_library_dirs/rule.yml
-index c02b4c896..6992f5dfc 100644
+index 104fe66a5..1bf5ec389 100644
 --- a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_ownership_library_dirs/rule.yml
 +++ b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_ownership_library_dirs/rule.yml
 @@ -44,7 +44,7 @@ references:
@@ -12105,9 +12284,9 @@ index c02b4c896..6992f5dfc 100644
      stigid@ol8: OL08-00-010340
 -    stigid@rhel8: RHEL-08-010340
 +    stigid@almalinux8: RHEL-08-010340
-     stigid@rhel9: RHEL-09-232200
      stigid@sle12: SLES-12-010873
      stigid@sle15: SLES-15-010353
+     stigid@ubuntu2004: UBTU-20-010428
 diff --git a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_ownership_library_dirs/tests/correct_owner.pass.sh b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_ownership_library_dirs/tests/correct_owner.pass.sh
 index 9c3fa6fe9..78ab97152 100644
 --- a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_ownership_library_dirs/tests/correct_owner.pass.sh
@@ -12169,7 +12348,7 @@ index ab89b277a..f4a7c33a9 100644
  for dirPath in $DIRS; do
  	find "$dirPath" -perm /022 -exec chmod go-w '{}' \;
 diff --git a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_permissions_binary_dirs/rule.yml b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_permissions_binary_dirs/rule.yml
-index 2a3e521fa..592cffa8b 100644
+index 5744f5ad1..e4359e2cb 100644
 --- a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_permissions_binary_dirs/rule.yml
 +++ b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_permissions_binary_dirs/rule.yml
 @@ -43,7 +43,7 @@ references:
@@ -12178,11 +12357,11 @@ index 2a3e521fa..592cffa8b 100644
      stigid@ol8: OL08-00-010300
 -    stigid@rhel8: RHEL-08-010300
 +    stigid@almalinux8: RHEL-08-010300
-     stigid@rhel9: RHEL-09-232010
      stigid@sle12: SLES-12-010878
      stigid@sle15: SLES-15-010358
+     stigid@ubuntu2004: UBTU-20-010456
 diff --git a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_permissions_library_dirs/rule.yml b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_permissions_library_dirs/rule.yml
-index 12d8448a7..a34484685 100644
+index b74b40f9f..65d370f21 100644
 --- a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_permissions_library_dirs/rule.yml
 +++ b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_permissions_library_dirs/rule.yml
 @@ -44,7 +44,7 @@ references:
@@ -12191,11 +12370,11 @@ index 12d8448a7..a34484685 100644
      stigid@ol8: OL08-00-010330
 -    stigid@rhel8: RHEL-08-010330
 +    stigid@almalinux8: RHEL-08-010330
-     stigid@rhel9: RHEL-09-232020
      stigid@sle12: SLES-12-010871
      stigid@sle15: SLES-15-010351
+     stigid@ubuntu2004: UBTU-20-010426
 diff --git a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/root_permissions_syslibrary_files/rule.yml b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/root_permissions_syslibrary_files/rule.yml
-index db7cf42de..913ce7e4d 100644
+index 27ef1c242..1c04748d8 100644
 --- a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/root_permissions_syslibrary_files/rule.yml
 +++ b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/root_permissions_syslibrary_files/rule.yml
 @@ -42,7 +42,7 @@ references:
@@ -12204,9 +12383,9 @@ index db7cf42de..913ce7e4d 100644
      stigid@ol8: OL08-00-010350
 -    stigid@rhel8: RHEL-08-010350
 +    stigid@almalinux8: RHEL-08-010350
-     stigid@rhel9: RHEL-09-232205
      stigid@sle12: SLES-12-010875
      stigid@sle15: SLES-15-010355
+     stigid@ubuntu2004: UBTU-20-010430
 diff --git a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/root_permissions_syslibrary_files/tests/correct_groupowner.pass.sh b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/root_permissions_syslibrary_files/tests/correct_groupowner.pass.sh
 index 5356d3742..a85c88001 100644
 --- a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/root_permissions_syslibrary_files/tests/correct_groupowner.pass.sh
@@ -12239,18 +12418,18 @@ index b0d594003..4a71eccda 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/permissions/files/sysctl_fs_protected_hardlinks/rule.yml b/linux_os/guide/system/permissions/files/sysctl_fs_protected_hardlinks/rule.yml
-index ccb1b8ea4..cae76a731 100644
+index 700a0395c..5c35f1bb8 100644
 --- a/linux_os/guide/system/permissions/files/sysctl_fs_protected_hardlinks/rule.yml
 +++ b/linux_os/guide/system/permissions/files/sysctl_fs_protected_hardlinks/rule.yml
-@@ -27,7 +27,7 @@ references:
+@@ -26,7 +26,7 @@ references:
      nist: CM-6(a),AC-6(1)
      srg: SRG-OS-000312-GPOS-00122,SRG-OS-000312-GPOS-00123,SRG-OS-000324-GPOS-00125
      stigid@ol8: OL08-00-010374
 -    stigid@rhel8: RHEL-08-010374
 +    stigid@almalinux8: RHEL-08-010374
-     stigid@rhel9: RHEL-09-213030
  
  {{{ complete_ocil_entry_sysctl_option_value(sysctl="fs.protected_hardlinks", value="1") }}}
+ 
 diff --git a/linux_os/guide/system/permissions/files/sysctl_fs_protected_symlinks/kubernetes/shared.yml b/linux_os/guide/system/permissions/files/sysctl_fs_protected_symlinks/kubernetes/shared.yml
 index 5ce0decba..b7a4243e4 100644
 --- a/linux_os/guide/system/permissions/files/sysctl_fs_protected_symlinks/kubernetes/shared.yml
@@ -12263,70 +12442,59 @@ index 5ce0decba..b7a4243e4 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/permissions/files/sysctl_fs_protected_symlinks/rule.yml b/linux_os/guide/system/permissions/files/sysctl_fs_protected_symlinks/rule.yml
-index 34ed37a00..d7a3ae8a7 100644
+index 71e64e91a..0fdd116de 100644
 --- a/linux_os/guide/system/permissions/files/sysctl_fs_protected_symlinks/rule.yml
 +++ b/linux_os/guide/system/permissions/files/sysctl_fs_protected_symlinks/rule.yml
-@@ -29,7 +29,7 @@ references:
+@@ -28,7 +28,7 @@ references:
      nist: CM-6(a),AC-6(1)
      srg: SRG-OS-000312-GPOS-00122,SRG-OS-000312-GPOS-00123,SRG-OS-000324-GPOS-00125
      stigid@ol8: OL08-00-010373
 -    stigid@rhel8: RHEL-08-010373
 +    stigid@almalinux8: RHEL-08-010373
-     stigid@rhel9: RHEL-09-213035
  
  {{{ complete_ocil_entry_sysctl_option_value(sysctl="fs.protected_symlinks", value="1") }}}
+ 
 diff --git a/linux_os/guide/system/permissions/mounting/kernel_module_cramfs_disabled/rule.yml b/linux_os/guide/system/permissions/mounting/kernel_module_cramfs_disabled/rule.yml
-index 6a57bd06a..3c42ed39b 100644
+index bf2db68f4..c7d825a4d 100644
 --- a/linux_os/guide/system/permissions/mounting/kernel_module_cramfs_disabled/rule.yml
 +++ b/linux_os/guide/system/permissions/mounting/kernel_module_cramfs_disabled/rule.yml
-@@ -47,7 +47,7 @@ references:
+@@ -45,7 +45,7 @@ references:
      nist-csf: PR.IP-1,PR.PT-3
      srg: SRG-OS-000095-GPOS-00049
      stigid@ol8: OL08-00-040025
 -    stigid@rhel8: RHEL-08-040025
 +    stigid@almalinux8: RHEL-08-040025
-     stigid@rhel9: RHEL-09-231195
  
  {{{ complete_ocil_entry_module_disable(module="cramfs") }}}
+ 
 diff --git a/linux_os/guide/system/permissions/mounting/kernel_module_usb-storage_disabled/rule.yml b/linux_os/guide/system/permissions/mounting/kernel_module_usb-storage_disabled/rule.yml
-index da4bc6591..18dc7020d 100644
+index 7e00f95e5..1aa540e66 100644
 --- a/linux_os/guide/system/permissions/mounting/kernel_module_usb-storage_disabled/rule.yml
 +++ b/linux_os/guide/system/permissions/mounting/kernel_module_usb-storage_disabled/rule.yml
-@@ -49,7 +49,7 @@ references:
+@@ -44,7 +44,7 @@ references:
      stigid@ol7: OL07-00-020100
      stigid@ol8: OL08-00-040080
      stigid@rhel7: RHEL-07-020100
 -    stigid@rhel8: RHEL-08-040080
 +    stigid@almalinux8: RHEL-08-040080
-     stigid@rhel9: RHEL-09-291010
      stigid@sle12: SLES-12-010580
      stigid@sle15: SLES-15-010480
-diff --git a/linux_os/guide/system/permissions/mounting/service_autofs_disabled/kubernetes/shared.yml b/linux_os/guide/system/permissions/mounting/service_autofs_disabled/kubernetes/shared.yml
-index 41352695f..8b69802ab 100644
---- a/linux_os/guide/system/permissions/mounting/service_autofs_disabled/kubernetes/shared.yml
-+++ b/linux_os/guide/system/permissions/mounting/service_autofs_disabled/kubernetes/shared.yml
-@@ -1,5 +1,5 @@
- ---
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_rhv,multi_platform_rhcos
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_rhv,multi_platform_rhcos
- apiVersion: machineconfiguration.openshift.io/v1
- kind: MachineConfig
- spec:
+     stigid@ubuntu2004: UBTU-20-010461
 diff --git a/linux_os/guide/system/permissions/mounting/service_autofs_disabled/rule.yml b/linux_os/guide/system/permissions/mounting/service_autofs_disabled/rule.yml
-index bb3febec5..4246c3e26 100644
+index 1c010dfcd..8d919aa59 100644
 --- a/linux_os/guide/system/permissions/mounting/service_autofs_disabled/rule.yml
 +++ b/linux_os/guide/system/permissions/mounting/service_autofs_disabled/rule.yml
-@@ -53,7 +53,7 @@ references:
+@@ -51,7 +51,7 @@ references:
      stigid@ol7: OL07-00-020110
      stigid@ol8: OL08-00-040070
      stigid@rhel7: RHEL-07-020110
 -    stigid@rhel8: RHEL-08-040070
 +    stigid@almalinux8: RHEL-08-040070
-     stigid@rhel9: RHEL-09-231040
      stigid@sle12: SLES-12-010590
      stigid@sle15: SLES-15-010240
+ 
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_boot_efi_nosuid/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_boot_efi_nosuid/rule.yml
-index 1142ad726..ab5a6140b 100644
+index d9662e1ea..4bf874668 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_boot_efi_nosuid/rule.yml
 +++ b/linux_os/guide/system/permissions/partitions/mount_option_boot_efi_nosuid/rule.yml
 @@ -26,7 +26,7 @@ references:
@@ -12335,256 +12503,256 @@ index 1142ad726..ab5a6140b 100644
      stigid@ol8: OL08-00-010572
 -    stigid@rhel8: RHEL-08-010572
 +    stigid@almalinux8: RHEL-08-010572
-     stigid@rhel9: RHEL-09-231105
  
  platform: machine and uefi
+ 
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_boot_nosuid/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_boot_nosuid/rule.yml
-index a783272e8..0d12086a6 100644
+index 1bb39096e..2ca6c7e45 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_boot_nosuid/rule.yml
 +++ b/linux_os/guide/system/permissions/partitions/mount_option_boot_nosuid/rule.yml
-@@ -32,7 +32,7 @@ references:
+@@ -31,7 +31,7 @@ references:
      nist-csf: PR.IP-1,PR.PT-2,PR.PT-3
      srg: SRG-OS-000368-GPOS-00154,SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-010571
 -    stigid@rhel8: RHEL-08-010571
 +    stigid@almalinux8: RHEL-08-010571
-     stigid@rhel9: RHEL-09-231100
  
  platform: machine
+ 
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_dev_shm_nodev/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_dev_shm_nodev/rule.yml
-index f82495084..ccb0940c6 100644
+index 8f73d51d7..458ef5169 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_dev_shm_nodev/rule.yml
 +++ b/linux_os/guide/system/permissions/partitions/mount_option_dev_shm_nodev/rule.yml
-@@ -46,7 +46,7 @@ references:
+@@ -43,7 +43,7 @@ references:
      stigid@ol7: OL07-00-021024
      stigid@ol8: OL08-00-040120
      stigid@rhel7: RHEL-07-021024
 -    stigid@rhel8: RHEL-08-040120
 +    stigid@almalinux8: RHEL-08-040120
-     stigid@rhel9: RHEL-09-231110
  
  platform: machine
+ 
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_dev_shm_noexec/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_dev_shm_noexec/rule.yml
-index f95eff16a..ddb39cfde 100644
+index 03bc69317..cd25f4e12 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_dev_shm_noexec/rule.yml
 +++ b/linux_os/guide/system/permissions/partitions/mount_option_dev_shm_noexec/rule.yml
-@@ -48,7 +48,7 @@ references:
+@@ -45,7 +45,7 @@ references:
      stigid@ol7: OL07-00-021024
      stigid@ol8: OL08-00-040122
      stigid@rhel7: RHEL-07-021024
 -    stigid@rhel8: RHEL-08-040122
 +    stigid@almalinux8: RHEL-08-040122
-     stigid@rhel9: RHEL-09-231115
  
  platform: machine
+ 
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_dev_shm_nosuid/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_dev_shm_nosuid/rule.yml
-index 8ceb7d18a..f3ecb97e3 100644
+index c3c461062..fc648f29d 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_dev_shm_nosuid/rule.yml
 +++ b/linux_os/guide/system/permissions/partitions/mount_option_dev_shm_nosuid/rule.yml
-@@ -46,7 +46,7 @@ references:
+@@ -43,7 +43,7 @@ references:
      stigid@ol7: OL07-00-021024
      stigid@ol8: OL08-00-040121
      stigid@rhel7: RHEL-07-021024
 -    stigid@rhel8: RHEL-08-040121
 +    stigid@almalinux8: RHEL-08-040121
-     stigid@rhel9: RHEL-09-231120
  
  platform: machine
+ 
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_home_noexec/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_home_noexec/rule.yml
-index 2b8b3e4f3..413e0da68 100644
+index 1e4983361..6f11e9ff2 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_home_noexec/rule.yml
 +++ b/linux_os/guide/system/permissions/partitions/mount_option_home_noexec/rule.yml
-@@ -28,7 +28,7 @@ references:
+@@ -27,7 +27,7 @@ references:
      nist: CM-6(b)
      srg: SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-010590
 -    stigid@rhel8: RHEL-08-010590
 +    stigid@almalinux8: RHEL-08-010590
-     stigid@rhel9: RHEL-09-231055
  
  platform: machine
+ 
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_home_nosuid/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_home_nosuid/rule.yml
-index 7dd5cc0b4..cfab794e7 100644
+index 459a0e374..b426bce84 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_home_nosuid/rule.yml
 +++ b/linux_os/guide/system/permissions/partitions/mount_option_home_nosuid/rule.yml
-@@ -41,7 +41,7 @@ references:
+@@ -37,7 +37,7 @@ references:
      stigid@ol7: OL07-00-021000
      stigid@ol8: OL08-00-010570
      stigid@rhel7: RHEL-07-021000
 -    stigid@rhel8: RHEL-08-010570
 +    stigid@almalinux8: RHEL-08-010570
-     stigid@rhel9: RHEL-09-231050
      stigid@sle12: SLES-12-010790
      stigid@sle15: SLES-15-040140
+ 
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_nodev_nonroot_local_partitions/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_nodev_nonroot_local_partitions/rule.yml
-index c31eaa313..6187f1360 100644
+index 3726a39ac..a7ef977df 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_nodev_nonroot_local_partitions/rule.yml
 +++ b/linux_os/guide/system/permissions/partitions/mount_option_nodev_nonroot_local_partitions/rule.yml
-@@ -46,7 +46,7 @@ references:
+@@ -45,7 +45,7 @@ references:
      nist-csf: PR.IP-1,PR.PT-3
      srg: SRG-OS-000368-GPOS-00154,SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-010580
 -    stigid@rhel8: RHEL-08-010580
 +    stigid@almalinux8: RHEL-08-010580
-     stigid@rhel9: RHEL-09-231200
  
  platform: machine
+ 
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_nodev_removable_partitions/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_nodev_removable_partitions/rule.yml
-index b6224a603..92f3eb421 100644
+index af40d2c2b..1b17676a8 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_nodev_removable_partitions/rule.yml
 +++ b/linux_os/guide/system/permissions/partitions/mount_option_nodev_removable_partitions/rule.yml
-@@ -44,7 +44,7 @@ references:
+@@ -42,7 +42,7 @@ references:
      nist-csf: PR.AC-3,PR.AC-6,PR.IP-1,PR.PT-2,PR.PT-3
      srg: SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-010600
 -    stigid@rhel8: RHEL-08-010600
 +    stigid@almalinux8: RHEL-08-010600
-     stigid@rhel9: RHEL-09-231085
  
  platform: machine
+ 
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_noexec_removable_partitions/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_noexec_removable_partitions/rule.yml
-index 6ec1b8f8f..f1779a4e1 100644
+index dac1e7d79..63c17f277 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_noexec_removable_partitions/rule.yml
 +++ b/linux_os/guide/system/permissions/partitions/mount_option_noexec_removable_partitions/rule.yml
-@@ -41,7 +41,7 @@ references:
+@@ -39,7 +39,7 @@ references:
      nist-csf: PR.AC-3,PR.AC-6,PR.IP-1,PR.PT-2,PR.PT-3
      srg: SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-010610
 -    stigid@rhel8: RHEL-08-010610
 +    stigid@almalinux8: RHEL-08-010610
-     stigid@rhel9: RHEL-09-231080
  
  ocil_clause: 'removable media partitions are present'
+ 
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_nosuid_removable_partitions/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_nosuid_removable_partitions/rule.yml
-index 8cf194781..51ba46c0f 100644
+index 8b2c88bff..e21aa9a7a 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_nosuid_removable_partitions/rule.yml
 +++ b/linux_os/guide/system/permissions/partitions/mount_option_nosuid_removable_partitions/rule.yml
-@@ -45,7 +45,7 @@ references:
+@@ -43,7 +43,7 @@ references:
      stigid@ol7: OL07-00-021010
      stigid@ol8: OL08-00-010620
      stigid@rhel7: RHEL-07-021010
 -    stigid@rhel8: RHEL-08-010620
 +    stigid@almalinux8: RHEL-08-010620
-     stigid@rhel9: RHEL-09-231090
      stigid@sle12: SLES-12-010800
      stigid@sle15: SLES-15-040150
+ 
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_tmp_nodev/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_tmp_nodev/rule.yml
-index d787e746e..ef92d5824 100644
+index 9338aedd2..08514242a 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_tmp_nodev/rule.yml
 +++ b/linux_os/guide/system/permissions/partitions/mount_option_tmp_nodev/rule.yml
-@@ -45,7 +45,7 @@ references:
+@@ -41,7 +41,7 @@ references:
      nist-csf: PR.IP-1,PR.PT-2,PR.PT-3
      srg: SRG-OS-000368-GPOS-00154
      stigid@ol8: OL08-00-040123
 -    stigid@rhel8: RHEL-08-040123
 +    stigid@almalinux8: RHEL-08-040123
-     stigid@rhel9: RHEL-09-231125
  
  platform: machine and mount[tmp]
+ 
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_tmp_noexec/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_tmp_noexec/rule.yml
-index 59069f5eb..a62157515 100644
+index 56c79354d..d2f56be1d 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_tmp_noexec/rule.yml
 +++ b/linux_os/guide/system/permissions/partitions/mount_option_tmp_noexec/rule.yml
-@@ -44,7 +44,7 @@ references:
+@@ -40,7 +40,7 @@ references:
      nist-csf: PR.IP-1,PR.PT-2,PR.PT-3
      srg: SRG-OS-000368-GPOS-00154
      stigid@ol8: OL08-00-040125
 -    stigid@rhel8: RHEL-08-040125
 +    stigid@almalinux8: RHEL-08-040125
-     stigid@rhel9: RHEL-09-231130
  
  platform: machine and mount[tmp]
+ 
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_tmp_nosuid/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_tmp_nosuid/rule.yml
-index 5fde7f0fc..70e7d39ff 100644
+index 082909291..b88f86021 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_tmp_nosuid/rule.yml
 +++ b/linux_os/guide/system/permissions/partitions/mount_option_tmp_nosuid/rule.yml
-@@ -45,7 +45,7 @@ references:
+@@ -41,7 +41,7 @@ references:
      nist-csf: PR.IP-1,PR.PT-2,PR.PT-3
      srg: SRG-OS-000368-GPOS-00154
      stigid@ol8: OL08-00-040124
 -    stigid@rhel8: RHEL-08-040124
 +    stigid@almalinux8: RHEL-08-040124
-     stigid@rhel9: RHEL-09-231135
  
  platform: machine and mount[tmp]
+ 
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_var_log_audit_nodev/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_var_log_audit_nodev/rule.yml
-index 307393654..5e1234579 100644
+index ea4dd8c74..b2c33afe5 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_var_log_audit_nodev/rule.yml
 +++ b/linux_os/guide/system/permissions/partitions/mount_option_var_log_audit_nodev/rule.yml
-@@ -35,7 +35,7 @@ references:
+@@ -32,7 +32,7 @@ references:
      nist-csf: PR.IP-1,PR.PT-2,PR.PT-3
      srg: SRG-OS-000368-GPOS-00154
      stigid@ol8: OL08-00-040129
 -    stigid@rhel8: RHEL-08-040129
 +    stigid@almalinux8: RHEL-08-040129
-     stigid@rhel9: RHEL-09-231160
  
  platform: machine and mount[var-log-audit]
+ 
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_var_log_audit_noexec/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_var_log_audit_noexec/rule.yml
-index 7946d878f..5e168f7f9 100644
+index fce0aef7c..562e8e1dd 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_var_log_audit_noexec/rule.yml
 +++ b/linux_os/guide/system/permissions/partitions/mount_option_var_log_audit_noexec/rule.yml
-@@ -33,7 +33,7 @@ references:
+@@ -30,7 +30,7 @@ references:
      nist-csf: PR.IP-1,PR.PT-2,PR.PT-3
      srg: SRG-OS-000368-GPOS-00154
      stigid@ol8: OL08-00-040131
 -    stigid@rhel8: RHEL-08-040131
 +    stigid@almalinux8: RHEL-08-040131
-     stigid@rhel9: RHEL-09-231165
  
  platform: machine and mount[var-log-audit]
+ 
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_var_log_audit_nosuid/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_var_log_audit_nosuid/rule.yml
-index a549df2a6..69f51d8ed 100644
+index e891b54f6..31d8e1955 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_var_log_audit_nosuid/rule.yml
 +++ b/linux_os/guide/system/permissions/partitions/mount_option_var_log_audit_nosuid/rule.yml
-@@ -34,7 +34,7 @@ references:
+@@ -31,7 +31,7 @@ references:
      nist-csf: PR.IP-1,PR.PT-2,PR.PT-3
      srg: SRG-OS-000368-GPOS-00154
      stigid@ol8: OL08-00-040130
 -    stigid@rhel8: RHEL-08-040130
 +    stigid@almalinux8: RHEL-08-040130
-     stigid@rhel9: RHEL-09-231170
  
  platform: machine and mount[var-log-audit]
+ 
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_var_log_nodev/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_var_log_nodev/rule.yml
-index 7f79fb5c6..c0cf11cc3 100644
+index ecd4d94eb..69395ce66 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_var_log_nodev/rule.yml
 +++ b/linux_os/guide/system/permissions/partitions/mount_option_var_log_nodev/rule.yml
-@@ -35,7 +35,7 @@ references:
+@@ -32,7 +32,7 @@ references:
      nist-csf: PR.IP-1,PR.PT-2,PR.PT-3
      srg: SRG-OS-000368-GPOS-00154
      stigid@ol8: OL08-00-040126
 -    stigid@rhel8: RHEL-08-040126
 +    stigid@almalinux8: RHEL-08-040126
-     stigid@rhel9: RHEL-09-231145
  
  platform: machine and mount[var-log]
+ 
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_var_log_noexec/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_var_log_noexec/rule.yml
-index 388ed247d..5b0958a2c 100644
+index 6aa87c2ac..01432db0e 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_var_log_noexec/rule.yml
 +++ b/linux_os/guide/system/permissions/partitions/mount_option_var_log_noexec/rule.yml
-@@ -36,7 +36,7 @@ references:
+@@ -32,7 +32,7 @@ references:
      nist-csf: PR.IP-1,PR.PT-2,PR.PT-3
      srg: SRG-OS-000368-GPOS-00154
      stigid@ol8: OL08-00-040128
 -    stigid@rhel8: RHEL-08-040128
 +    stigid@almalinux8: RHEL-08-040128
-     stigid@rhel9: RHEL-09-231150
  
  platform: machine and mount[var-log]
+ 
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_var_log_nosuid/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_var_log_nosuid/rule.yml
-index 6fd03f817..f3a539c5d 100644
+index 488af6a67..3b11382ca 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_var_log_nosuid/rule.yml
 +++ b/linux_os/guide/system/permissions/partitions/mount_option_var_log_nosuid/rule.yml
-@@ -37,7 +37,7 @@ references:
+@@ -33,7 +33,7 @@ references:
      nist-csf: PR.IP-1,PR.PT-2,PR.PT-3
      srg: SRG-OS-000368-GPOS-00154
      stigid@ol8: OL08-00-040127
 -    stigid@rhel8: RHEL-08-040127
 +    stigid@almalinux8: RHEL-08-040127
-     stigid@rhel9: RHEL-09-231155
  
  platform: machine and mount[var-log]
+ 
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_var_tmp_bind/bash/shared.sh b/linux_os/guide/system/permissions/partitions/mount_option_var_tmp_bind/bash/shared.sh
 index 59e39270d..5c154d333 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_var_tmp_bind/bash/shared.sh
@@ -12596,44 +12764,44 @@ index 59e39270d..5c154d333 100644
  # Delete particular /etc/fstab's row if /var/tmp is already configured to
  # represent a mount point (for some device or filesystem other than /tmp)
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_var_tmp_nodev/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_var_tmp_nodev/rule.yml
-index 10ffc6b84..ca2b543dd 100644
+index ea4ee4dec..2e3ca525d 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_var_tmp_nodev/rule.yml
 +++ b/linux_os/guide/system/permissions/partitions/mount_option_var_tmp_nodev/rule.yml
-@@ -38,7 +38,7 @@ references:
+@@ -34,7 +34,7 @@ references:
      disa: CCI-001764
      srg: SRG-OS-000368-GPOS-00154
      stigid@ol8: OL08-00-040132
 -    stigid@rhel8: RHEL-08-040132
 +    stigid@almalinux8: RHEL-08-040132
-     stigid@rhel9: RHEL-09-231175
  
  platforms:
+   - machine and mount[var-tmp]
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_var_tmp_noexec/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_var_tmp_noexec/rule.yml
-index b7ed162e0..68d8bcd66 100644
+index d0bf35fb9..0f993233d 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_var_tmp_noexec/rule.yml
 +++ b/linux_os/guide/system/permissions/partitions/mount_option_var_tmp_noexec/rule.yml
-@@ -38,7 +38,7 @@ references:
+@@ -34,7 +34,7 @@ references:
      disa: CCI-001764
      srg: SRG-OS-000368-GPOS-00154
      stigid@ol8: OL08-00-040134
 -    stigid@rhel8: RHEL-08-040134
 +    stigid@almalinux8: RHEL-08-040134
-     stigid@rhel9: RHEL-09-231180
  
  platform: machine and mount[var-tmp]
+ 
 diff --git a/linux_os/guide/system/permissions/partitions/mount_option_var_tmp_nosuid/rule.yml b/linux_os/guide/system/permissions/partitions/mount_option_var_tmp_nosuid/rule.yml
-index 4517a6efe..c3e33dbff 100644
+index 13f644ccc..3998eadc2 100644
 --- a/linux_os/guide/system/permissions/partitions/mount_option_var_tmp_nosuid/rule.yml
 +++ b/linux_os/guide/system/permissions/partitions/mount_option_var_tmp_nosuid/rule.yml
-@@ -38,7 +38,7 @@ references:
+@@ -34,7 +34,7 @@ references:
      disa: CCI-001764
      srg: SRG-OS-000368-GPOS-00154
      stigid@ol8: OL08-00-040133
 -    stigid@rhel8: RHEL-08-040133
 +    stigid@almalinux8: RHEL-08-040133
-     stigid@rhel9: RHEL-09-231185
  
  platform: machine and mount[var-tmp]
+ 
 diff --git a/linux_os/guide/system/permissions/restrictions/coredumps/coredump_disable_backtraces/kubernetes/shared.yml b/linux_os/guide/system/permissions/restrictions/coredumps/coredump_disable_backtraces/kubernetes/shared.yml
 index d94802273..554e34e00 100644
 --- a/linux_os/guide/system/permissions/restrictions/coredumps/coredump_disable_backtraces/kubernetes/shared.yml
@@ -12646,18 +12814,18 @@ index d94802273..554e34e00 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/permissions/restrictions/coredumps/coredump_disable_backtraces/rule.yml b/linux_os/guide/system/permissions/restrictions/coredumps/coredump_disable_backtraces/rule.yml
-index 984721275..1b5b9b426 100644
+index c1cc421f4..10de03977 100644
 --- a/linux_os/guide/system/permissions/restrictions/coredumps/coredump_disable_backtraces/rule.yml
 +++ b/linux_os/guide/system/permissions/restrictions/coredumps/coredump_disable_backtraces/rule.yml
-@@ -43,7 +43,7 @@ references:
-     pcidss4: '3.3.1'
+@@ -39,7 +39,7 @@ references:
+     pcidss: Req-3.2
      srg: SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-010675
 -    stigid@rhel8: RHEL-08-010675
 +    stigid@almalinux8: RHEL-08-010675
-     stigid@rhel9: RHEL-09-213085
  
  ocil_clause: 'the "ProcessSizeMax" item is missing, commented out, or the value is anything other than "0" and the need for core dumps is not documented with the Information System Security Officer (ISSO) as an operational requirement for all domains that have the "core" item assigned'
+ 
 diff --git a/linux_os/guide/system/permissions/restrictions/coredumps/coredump_disable_storage/kubernetes/shared.yml b/linux_os/guide/system/permissions/restrictions/coredumps/coredump_disable_storage/kubernetes/shared.yml
 index d94802273..554e34e00 100644
 --- a/linux_os/guide/system/permissions/restrictions/coredumps/coredump_disable_storage/kubernetes/shared.yml
@@ -12670,18 +12838,18 @@ index d94802273..554e34e00 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/permissions/restrictions/coredumps/coredump_disable_storage/rule.yml b/linux_os/guide/system/permissions/restrictions/coredumps/coredump_disable_storage/rule.yml
-index 5eb907d0c..a4d77bd7d 100644
+index c025dcf1f..32c8d3390 100644
 --- a/linux_os/guide/system/permissions/restrictions/coredumps/coredump_disable_storage/rule.yml
 +++ b/linux_os/guide/system/permissions/restrictions/coredumps/coredump_disable_storage/rule.yml
-@@ -43,7 +43,7 @@ references:
-     pcidss4: '3.3.1'
+@@ -39,7 +39,7 @@ references:
+     pcidss: Req-3.2
      srg: SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-010674
 -    stigid@rhel8: RHEL-08-010674
 +    stigid@almalinux8: RHEL-08-010674
-     stigid@rhel9: RHEL-09-213090
  
  ocil_clause: Storage is not set to none or is commented out and the need for core dumps is not documented with the Information System Security Officer (ISSO) as an operational requirement for all domains that have the "core" item assigned
+ 
 diff --git a/linux_os/guide/system/permissions/restrictions/coredumps/disable_users_coredumps/bash/shared.sh b/linux_os/guide/system/permissions/restrictions/coredumps/disable_users_coredumps/bash/shared.sh
 index 32651fa92..b68ea1c66 100644
 --- a/linux_os/guide/system/permissions/restrictions/coredumps/disable_users_coredumps/bash/shared.sh
@@ -12704,20 +12872,20 @@ index 41cbd1197..481afa583 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/permissions/restrictions/coredumps/disable_users_coredumps/rule.yml b/linux_os/guide/system/permissions/restrictions/coredumps/disable_users_coredumps/rule.yml
-index 9b1c0c36f..c5e2b96c0 100644
+index 92b9cc004..bcf0c62e6 100644
 --- a/linux_os/guide/system/permissions/restrictions/coredumps/disable_users_coredumps/rule.yml
 +++ b/linux_os/guide/system/permissions/restrictions/coredumps/disable_users_coredumps/rule.yml
-@@ -41,7 +41,7 @@ references:
-     pcidss4: '3.3.1'
+@@ -38,7 +38,7 @@ references:
+     nist-csf: DE.CM-1,PR.DS-4
      srg: SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-010673
 -    stigid@rhel8: RHEL-08-010673
 +    stigid@almalinux8: RHEL-08-010673
-     stigid@rhel9: RHEL-09-213095
  
  ocil_clause: 'the "core" item is missing, commented out, or the value is anything other than "0" and the need for core dumps is not documented with the Information System Security Officer (ISSO) as an operational requirement for all domains that have the "core"'
+ 
 diff --git a/linux_os/guide/system/permissions/restrictions/coredumps/service_systemd-coredump_disabled/rule.yml b/linux_os/guide/system/permissions/restrictions/coredumps/service_systemd-coredump_disabled/rule.yml
-index 5f34c7ff9..548dafcf4 100644
+index ce94d2c8f..d52427ab2 100644
 --- a/linux_os/guide/system/permissions/restrictions/coredumps/service_systemd-coredump_disabled/rule.yml
 +++ b/linux_os/guide/system/permissions/restrictions/coredumps/service_systemd-coredump_disabled/rule.yml
 @@ -28,7 +28,7 @@ references:
@@ -12726,10 +12894,10 @@ index 5f34c7ff9..548dafcf4 100644
      stigid@ol8: OL08-00-010672
 -    stigid@rhel8: RHEL-08-010672
 +    stigid@almalinux8: RHEL-08-010672
-     stigid@rhel9: RHEL-09-213100
  
  ocil_clause: unit systemd-coredump.socket is not masked or running
-@@ -51,7 +51,7 @@ template:
+ 
+@@ -50,7 +50,7 @@ template:
      name: socket_disabled
      vars:
          socketname: systemd-coredump
@@ -12760,18 +12928,18 @@ index 415b0486d..02b1e991a 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/permissions/restrictions/enable_execshield_settings/sysctl_kernel_kptr_restrict/rule.yml b/linux_os/guide/system/permissions/restrictions/enable_execshield_settings/sysctl_kernel_kptr_restrict/rule.yml
-index 8f7a99d5e..e7f107fcc 100644
+index 5c72d139f..0d79dd87e 100644
 --- a/linux_os/guide/system/permissions/restrictions/enable_execshield_settings/sysctl_kernel_kptr_restrict/rule.yml
 +++ b/linux_os/guide/system/permissions/restrictions/enable_execshield_settings/sysctl_kernel_kptr_restrict/rule.yml
-@@ -28,7 +28,7 @@ references:
+@@ -27,7 +27,7 @@ references:
      nist: SC-30,SC-30(2),SC-30(5),CM-6(a)
      srg: SRG-OS-000132-GPOS-00067,SRG-OS-000433-GPOS-00192,SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-040283
 -    stigid@rhel8: RHEL-08-040283
 +    stigid@almalinux8: RHEL-08-040283
-     stigid@rhel9: RHEL-09-213025
      stigid@sle12: SLES-12-030320
      stigid@sle15: SLES-15-010540
+ 
 diff --git a/linux_os/guide/system/permissions/restrictions/enable_execshield_settings/sysctl_kernel_kptr_restrict/tests/value_1.pass.sh b/linux_os/guide/system/permissions/restrictions/enable_execshield_settings/sysctl_kernel_kptr_restrict/tests/value_1.pass.sh
 index 70189666c..22f9e966b 100644
 --- a/linux_os/guide/system/permissions/restrictions/enable_execshield_settings/sysctl_kernel_kptr_restrict/tests/value_1.pass.sh
@@ -12806,31 +12974,31 @@ index 7a4c107b2..22e209120 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/permissions/restrictions/enable_execshield_settings/sysctl_kernel_randomize_va_space/rule.yml b/linux_os/guide/system/permissions/restrictions/enable_execshield_settings/sysctl_kernel_randomize_va_space/rule.yml
-index 549f3ac85..7d8007bfc 100644
+index 8b7cf7774..066825810 100644
 --- a/linux_os/guide/system/permissions/restrictions/enable_execshield_settings/sysctl_kernel_randomize_va_space/rule.yml
 +++ b/linux_os/guide/system/permissions/restrictions/enable_execshield_settings/sysctl_kernel_randomize_va_space/rule.yml
-@@ -42,7 +42,7 @@ references:
+@@ -37,7 +37,7 @@ references:
      stigid@ol7: OL07-00-040201
      stigid@ol8: OL08-00-010430
      stigid@rhel7: RHEL-07-040201
 -    stigid@rhel8: RHEL-08-010430
 +    stigid@almalinux8: RHEL-08-010430
-     stigid@rhel9: RHEL-09-213070
      stigid@sle12: SLES-12-030330
      stigid@sle15: SLES-15-010550
+     stigid@ubuntu2004: UBTU-20-010448
 diff --git a/linux_os/guide/system/permissions/restrictions/enable_nx/bios_enable_execution_restrictions/rule.yml b/linux_os/guide/system/permissions/restrictions/enable_nx/bios_enable_execution_restrictions/rule.yml
-index 0c078dd88..b1575c670 100644
+index 289d09acb..2c1e44b8f 100644
 --- a/linux_os/guide/system/permissions/restrictions/enable_nx/bios_enable_execution_restrictions/rule.yml
 +++ b/linux_os/guide/system/permissions/restrictions/enable_nx/bios_enable_execution_restrictions/rule.yml
-@@ -38,7 +38,7 @@ references:
-     pcidss4: "2.2.1"
+@@ -37,7 +37,7 @@ references:
+     nist-csf: PR.IP-1
      srg: SRG-OS-000433-GPOS-00192,SRG-APP-000450-CTR-001105
      stigid@ol8: OL08-00-010420
 -    stigid@rhel8: RHEL-08-010420
 +    stigid@almalinux8: RHEL-08-010420
      stigid@ubuntu2004: UBTU-20-010447
+     stigid@ubuntu2204: UBTU-22-213025
  
- # In aarch64 cpus the bit is XN and it is not disableable
 diff --git a/linux_os/guide/system/permissions/restrictions/enable_nx/bios_enable_execution_restrictions/tests/correct_value.pass.sh b/linux_os/guide/system/permissions/restrictions/enable_nx/bios_enable_execution_restrictions/tests/correct_value.pass.sh
 index 6d87da5f2..021acd31f 100755
 --- a/linux_os/guide/system/permissions/restrictions/enable_nx/bios_enable_execution_restrictions/tests/correct_value.pass.sh
@@ -12867,31 +13035,31 @@ index 4fcb716d1..ddc46922a 100644
  platform: machine
  
 diff --git a/linux_os/guide/system/permissions/restrictions/poisoning/grub2_page_poison_argument/rule.yml b/linux_os/guide/system/permissions/restrictions/poisoning/grub2_page_poison_argument/rule.yml
-index 53ce18c0d..405988116 100644
+index 19d939209..31645fd40 100644
 --- a/linux_os/guide/system/permissions/restrictions/poisoning/grub2_page_poison_argument/rule.yml
 +++ b/linux_os/guide/system/permissions/restrictions/poisoning/grub2_page_poison_argument/rule.yml
-@@ -29,7 +29,7 @@ references:
+@@ -28,7 +28,7 @@ references:
      nist: CM-6(a)
      srg: SRG-OS-000480-GPOS-00227,SRG-OS-000134-GPOS-00068
      stigid@ol8: OL08-00-010421
 -    stigid@rhel8: RHEL-08-010421
 +    stigid@almalinux8: RHEL-08-010421
-     stigid@rhel9: RHEL-09-212040
  
  ocil_clause: 'page allocator poisoning is not enabled'
+ 
 diff --git a/linux_os/guide/system/permissions/restrictions/poisoning/grub2_slub_debug_argument/rule.yml b/linux_os/guide/system/permissions/restrictions/poisoning/grub2_slub_debug_argument/rule.yml
-index 334d29f55..db2c32ba6 100644
+index 2908f9212..a316c982f 100644
 --- a/linux_os/guide/system/permissions/restrictions/poisoning/grub2_slub_debug_argument/rule.yml
 +++ b/linux_os/guide/system/permissions/restrictions/poisoning/grub2_slub_debug_argument/rule.yml
-@@ -29,7 +29,7 @@ references:
+@@ -28,7 +28,7 @@ references:
      nist: CM-6(a)
      srg: SRG-OS-000433-GPOS-00192,SRG-OS-000134-GPOS-00068
      stigid@ol8: OL08-00-010423
 -    stigid@rhel8: RHEL-08-010423
 +    stigid@almalinux8: RHEL-08-010423
-     stigid@rhel9: RHEL-09-212045
  
  ocil_clause: 'SLUB/SLAB poisoning is not enabled'
+ 
 diff --git a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_core_pattern/kubernetes/shared.yml b/linux_os/guide/system/permissions/restrictions/sysctl_kernel_core_pattern/kubernetes/shared.yml
 index 88c683445..fa9b2020d 100644
 --- a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_core_pattern/kubernetes/shared.yml
@@ -12904,18 +13072,18 @@ index 88c683445..fa9b2020d 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_core_pattern/rule.yml b/linux_os/guide/system/permissions/restrictions/sysctl_kernel_core_pattern/rule.yml
-index abcf132fd..dc8a7fe22 100644
+index ebebdebb1..87dc6c1a1 100644
 --- a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_core_pattern/rule.yml
 +++ b/linux_os/guide/system/permissions/restrictions/sysctl_kernel_core_pattern/rule.yml
-@@ -29,7 +29,7 @@ references:
-     pcidss4: '3.3.1'
+@@ -28,7 +28,7 @@ references:
+     ospp: FMT_SMF_EXT.1
      srg: SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-010671
 -    stigid@rhel8: RHEL-08-010671
 +    stigid@almalinux8: RHEL-08-010671
-     stigid@rhel9: RHEL-09-213040
  
  ocil_clause:  |-
+     the returned line does not have a value of "|/bin/false", or a line is not
 diff --git a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_dmesg_restrict/kubernetes/shared.yml b/linux_os/guide/system/permissions/restrictions/sysctl_kernel_dmesg_restrict/kubernetes/shared.yml
 index 36e025cc3..e97acde11 100644
 --- a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_dmesg_restrict/kubernetes/shared.yml
@@ -12928,18 +13096,18 @@ index 36e025cc3..e97acde11 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_dmesg_restrict/rule.yml b/linux_os/guide/system/permissions/restrictions/sysctl_kernel_dmesg_restrict/rule.yml
-index de07abef6..a8483ce26 100644
+index e8a1368cb..7f33a0ad4 100644
 --- a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_dmesg_restrict/rule.yml
 +++ b/linux_os/guide/system/permissions/restrictions/sysctl_kernel_dmesg_restrict/rule.yml
-@@ -29,7 +29,7 @@ references:
+@@ -28,7 +28,7 @@ references:
      stigid@ol7: OL07-00-010375
      stigid@ol8: OL08-00-010375
      stigid@rhel7: RHEL-07-010375
 -    stigid@rhel8: RHEL-08-010375
 +    stigid@almalinux8: RHEL-08-010375
-     stigid@rhel9: RHEL-09-213010
      stigid@sle12: SLES-12-010375
      stigid@sle15: SLES-15-010375
+     stigid@ubuntu2004: UBTU-20-010401
 diff --git a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_kexec_load_disabled/kubernetes/shared.yml b/linux_os/guide/system/permissions/restrictions/sysctl_kernel_kexec_load_disabled/kubernetes/shared.yml
 index 505b3c12b..cdf18e6dd 100644
 --- a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_kexec_load_disabled/kubernetes/shared.yml
@@ -12952,7 +13120,7 @@ index 505b3c12b..cdf18e6dd 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_kexec_load_disabled/rule.yml b/linux_os/guide/system/permissions/restrictions/sysctl_kernel_kexec_load_disabled/rule.yml
-index d666f6ad1..0dd38a3f0 100644
+index 7950162d8..8802303f6 100644
 --- a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_kexec_load_disabled/rule.yml
 +++ b/linux_os/guide/system/permissions/restrictions/sysctl_kernel_kexec_load_disabled/rule.yml
 @@ -22,7 +22,7 @@ references:
@@ -12961,9 +13129,9 @@ index d666f6ad1..0dd38a3f0 100644
      stigid@ol8: OL08-00-010372
 -    stigid@rhel8: RHEL-08-010372
 +    stigid@almalinux8: RHEL-08-010372
-     stigid@rhel9: RHEL-09-213020
  
  {{{ complete_ocil_entry_sysctl_option_value(sysctl="kernel.kexec_load_disabled", value="1") }}}
+ 
 diff --git a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_perf_event_paranoid/kubernetes/shared.yml b/linux_os/guide/system/permissions/restrictions/sysctl_kernel_perf_event_paranoid/kubernetes/shared.yml
 index 0541e59a7..50020c28c 100644
 --- a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_perf_event_paranoid/kubernetes/shared.yml
@@ -12976,18 +13144,18 @@ index 0541e59a7..50020c28c 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_perf_event_paranoid/rule.yml b/linux_os/guide/system/permissions/restrictions/sysctl_kernel_perf_event_paranoid/rule.yml
-index 066bcd9d1..02465e4dc 100644
+index a35a76356..93b4df958 100644
 --- a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_perf_event_paranoid/rule.yml
 +++ b/linux_os/guide/system/permissions/restrictions/sysctl_kernel_perf_event_paranoid/rule.yml
-@@ -25,7 +25,7 @@ references:
+@@ -24,7 +24,7 @@ references:
      ospp: FMT_SMF_EXT.1
      srg: SRG-OS-000132-GPOS-00067,SRG-OS-000138-GPOS-00069,SRG-APP-000243-CTR-000600
      stigid@ol8: OL08-00-010376
 -    stigid@rhel8: RHEL-08-010376
 +    stigid@almalinux8: RHEL-08-010376
-     stigid@rhel9: RHEL-09-213015
  
  {{{ complete_ocil_entry_sysctl_option_value(sysctl="kernel.perf_event_paranoid", value="2") }}}
+ 
 diff --git a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_unprivileged_bpf_disabled/kubernetes/shared.yml b/linux_os/guide/system/permissions/restrictions/sysctl_kernel_unprivileged_bpf_disabled/kubernetes/shared.yml
 index 2e24d9211..7b706bb32 100644
 --- a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_unprivileged_bpf_disabled/kubernetes/shared.yml
@@ -13000,18 +13168,18 @@ index 2e24d9211..7b706bb32 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_unprivileged_bpf_disabled/rule.yml b/linux_os/guide/system/permissions/restrictions/sysctl_kernel_unprivileged_bpf_disabled/rule.yml
-index 4365ced4f..c14e3c816 100644
+index 7fe35df14..77944f241 100644
 --- a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_unprivileged_bpf_disabled/rule.yml
 +++ b/linux_os/guide/system/permissions/restrictions/sysctl_kernel_unprivileged_bpf_disabled/rule.yml
-@@ -24,7 +24,7 @@ references:
+@@ -23,7 +23,7 @@ references:
      ospp: FMT_SMF_EXT.1
      srg: SRG-OS-000132-GPOS-00067,SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-040281
 -    stigid@rhel8: RHEL-08-040281
 +    stigid@almalinux8: RHEL-08-040281
-     stigid@rhel9: RHEL-09-213075
  
  {{{ complete_ocil_entry_sysctl_option_value(sysctl="kernel.unprivileged_bpf_disabled", value="1") }}}
+ 
 diff --git a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_yama_ptrace_scope/kubernetes/shared.yml b/linux_os/guide/system/permissions/restrictions/sysctl_kernel_yama_ptrace_scope/kubernetes/shared.yml
 index ceafd4839..7006e2066 100644
 --- a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_yama_ptrace_scope/kubernetes/shared.yml
@@ -13024,18 +13192,18 @@ index ceafd4839..7006e2066 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_yama_ptrace_scope/rule.yml b/linux_os/guide/system/permissions/restrictions/sysctl_kernel_yama_ptrace_scope/rule.yml
-index 9c4d9262f..c75b04069 100644
+index 5e169c505..7ee81f7ce 100644
 --- a/linux_os/guide/system/permissions/restrictions/sysctl_kernel_yama_ptrace_scope/rule.yml
 +++ b/linux_os/guide/system/permissions/restrictions/sysctl_kernel_yama_ptrace_scope/rule.yml
-@@ -29,7 +29,7 @@ references:
+@@ -26,7 +26,7 @@ references:
      nist: SC-7(10)
      srg: SRG-OS-000132-GPOS-00067,SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-040282
 -    stigid@rhel8: RHEL-08-040282
 +    stigid@almalinux8: RHEL-08-040282
-     stigid@rhel9: RHEL-09-213080
  
  {{{ complete_ocil_entry_sysctl_option_value(sysctl="kernel.yama.ptrace_scope", value="1") }}}
+ 
 diff --git a/linux_os/guide/system/permissions/restrictions/sysctl_net_core_bpf_jit_harden/kubernetes/shared.yml b/linux_os/guide/system/permissions/restrictions/sysctl_net_core_bpf_jit_harden/kubernetes/shared.yml
 index 7519b7740..af6c30abd 100644
 --- a/linux_os/guide/system/permissions/restrictions/sysctl_net_core_bpf_jit_harden/kubernetes/shared.yml
@@ -13048,18 +13216,18 @@ index 7519b7740..af6c30abd 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/permissions/restrictions/sysctl_net_core_bpf_jit_harden/rule.yml b/linux_os/guide/system/permissions/restrictions/sysctl_net_core_bpf_jit_harden/rule.yml
-index b594399d7..bd08cc1fe 100644
+index 8b23c9a3e..c3b88766d 100644
 --- a/linux_os/guide/system/permissions/restrictions/sysctl_net_core_bpf_jit_harden/rule.yml
 +++ b/linux_os/guide/system/permissions/restrictions/sysctl_net_core_bpf_jit_harden/rule.yml
-@@ -24,7 +24,7 @@ references:
+@@ -23,7 +23,7 @@ references:
      ospp: FMT_SMF_EXT.1
      srg: SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-040286
 -    stigid@rhel8: RHEL-08-040286
 +    stigid@almalinux8: RHEL-08-040286
-     stigid@rhel9: RHEL-09-251045
  
  {{{ complete_ocil_entry_sysctl_option_value(sysctl="net.core.bpf_jit_harden", value="2") }}}
+ 
 diff --git a/linux_os/guide/system/permissions/restrictions/sysctl_user_max_user_namespaces/kubernetes/shared.yml b/linux_os/guide/system/permissions/restrictions/sysctl_user_max_user_namespaces/kubernetes/shared.yml
 index fdd4fb83e..3274d5b36 100644
 --- a/linux_os/guide/system/permissions/restrictions/sysctl_user_max_user_namespaces/kubernetes/shared.yml
@@ -13072,7 +13240,7 @@ index fdd4fb83e..3274d5b36 100644
  kind: MachineConfig
  spec:
 diff --git a/linux_os/guide/system/permissions/restrictions/sysctl_user_max_user_namespaces/rule.yml b/linux_os/guide/system/permissions/restrictions/sysctl_user_max_user_namespaces/rule.yml
-index 5e2508b9d..da921a343 100644
+index d1af3ca19..5f2d3c40d 100644
 --- a/linux_os/guide/system/permissions/restrictions/sysctl_user_max_user_namespaces/rule.yml
 +++ b/linux_os/guide/system/permissions/restrictions/sysctl_user_max_user_namespaces/rule.yml
 @@ -34,7 +34,7 @@ references:
@@ -13081,9 +13249,9 @@ index 5e2508b9d..da921a343 100644
      stigid@ol8: OL08-00-040284
 -    stigid@rhel8: RHEL-08-040284
 +    stigid@almalinux8: RHEL-08-040284
-     stigid@rhel9: RHEL-09-213105
  
  ocil: |
+     Verify that {{{ full_name }}} disables the use of user namespaces with the following commands:
 diff --git a/linux_os/guide/system/selinux/grub2_enable_selinux/ansible/shared.yml b/linux_os/guide/system/selinux/grub2_enable_selinux/ansible/shared.yml
 index 4be24a89d..76c0cc6df 100644
 --- a/linux_os/guide/system/selinux/grub2_enable_selinux/ansible/shared.yml
@@ -13116,7 +13284,7 @@ index 2520d3dcc..ed0bc9538 100644
  # Package libselinux cannot be uninstalled normally
  # as it would cause removal of sudo package which is
 diff --git a/linux_os/guide/system/selinux/package_policycoreutils_installed/rule.yml b/linux_os/guide/system/selinux/package_policycoreutils_installed/rule.yml
-index c9bddfefc..fb8565762 100644
+index 40f37f68e..9b41853da 100644
 --- a/linux_os/guide/system/selinux/package_policycoreutils_installed/rule.yml
 +++ b/linux_os/guide/system/selinux/package_policycoreutils_installed/rule.yml
 @@ -31,7 +31,7 @@ references:
@@ -13125,9 +13293,9 @@ index c9bddfefc..fb8565762 100644
      stigid@ol8: OL08-00-010171
 -    stigid@rhel8: RHEL-08-010171
 +    stigid@almalinux8: RHEL-08-010171
-     stigid@rhel9: RHEL-09-431025
  
  ocil_clause: 'the policycoreutils package is not installed'
+ 
 diff --git a/linux_os/guide/system/selinux/selinux_policytype/ansible/shared.yml b/linux_os/guide/system/selinux/selinux_policytype/ansible/shared.yml
 index fa39b8af6..33e2978d4 100644
 --- a/linux_os/guide/system/selinux/selinux_policytype/ansible/shared.yml
@@ -13149,18 +13317,18 @@ index 0b33e5768..c9b647b8e 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/system/selinux/selinux_policytype/rule.yml b/linux_os/guide/system/selinux/selinux_policytype/rule.yml
-index eb020851d..690015e10 100644
+index 6b2a7b480..b33e5e9da 100644
 --- a/linux_os/guide/system/selinux/selinux_policytype/rule.yml
 +++ b/linux_os/guide/system/selinux/selinux_policytype/rule.yml
-@@ -56,7 +56,7 @@ references:
+@@ -51,7 +51,7 @@ references:
      stigid@ol7: OL07-00-020220
      stigid@ol8: OL08-00-010450
      stigid@rhel7: RHEL-07-020220
 -    stigid@rhel8: RHEL-08-010450
 +    stigid@almalinux8: RHEL-08-010450
-     stigid@rhel9: RHEL-09-431015
  
  ocil_clause: 'the loaded policy name is not "{{{ xccdf_value("var_selinux_policy_name") }}}"'
+ 
 diff --git a/linux_os/guide/system/selinux/selinux_state/ansible/shared.yml b/linux_os/guide/system/selinux/selinux_state/ansible/shared.yml
 index 3234ef102..9961cbdd9 100644
 --- a/linux_os/guide/system/selinux/selinux_state/ansible/shared.yml
@@ -13182,18 +13350,18 @@ index 1f458fa5b..3a9811ea3 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/system/selinux/selinux_state/rule.yml b/linux_os/guide/system/selinux/selinux_state/rule.yml
-index 974c1c791..87c66527f 100644
+index fab00e74a..49e461c94 100644
 --- a/linux_os/guide/system/selinux/selinux_state/rule.yml
 +++ b/linux_os/guide/system/selinux/selinux_state/rule.yml
-@@ -48,7 +48,7 @@ references:
+@@ -44,7 +44,7 @@ references:
      stigid@ol7: OL07-00-020210
      stigid@ol8: OL08-00-010170
      stigid@rhel7: RHEL-07-020210
 -    stigid@rhel8: RHEL-08-010170
 +    stigid@almalinux8: RHEL-08-010170
-     stigid@rhel9: RHEL-09-431010
  
  ocil_clause: 'SELINUX is not set to enforcing'
+ 
 diff --git a/linux_os/guide/system/selinux/selinux_user_login_roles/rule.yml b/linux_os/guide/system/selinux/selinux_user_login_roles/rule.yml
 index b9bd06bcd..b69db1723 100644
 --- a/linux_os/guide/system/selinux/selinux_user_login_roles/rule.yml
@@ -13208,96 +13376,96 @@ index b9bd06bcd..b69db1723 100644
  ocil_clause: 'non-admin users are not confined correctly'
  
 diff --git a/linux_os/guide/system/software/disk_partitioning/encrypt_partitions/rule.yml b/linux_os/guide/system/software/disk_partitioning/encrypt_partitions/rule.yml
-index 3c73b4cde..beb5b86cd 100644
+index 04eb7884b..c989573f0 100644
 --- a/linux_os/guide/system/software/disk_partitioning/encrypt_partitions/rule.yml
 +++ b/linux_os/guide/system/software/disk_partitioning/encrypt_partitions/rule.yml
-@@ -76,7 +76,7 @@ references:
+@@ -77,7 +77,7 @@ references:
      nist@sle15: SC-28,SC-28.1
      srg: SRG-OS-000405-GPOS-00184,SRG-OS-000185-GPOS-00079,SRG-OS-000404-GPOS-00183
      stigid@ol8: OL08-00-010030
 -    stigid@rhel8: RHEL-08-010030
 +    stigid@almalinux8: RHEL-08-010030
-     stigid@rhel9: RHEL-09-231190
      stigid@sle12: SLES-12-010450
      stigid@sle15: SLES-15-010330
+     stigid@ubuntu2004: UBTU-20-010414
 diff --git a/linux_os/guide/system/software/disk_partitioning/partition_for_home/rule.yml b/linux_os/guide/system/software/disk_partitioning/partition_for_home/rule.yml
-index 38bf96760..7d76efdb5 100644
+index af2323216..ca312f7bb 100644
 --- a/linux_os/guide/system/software/disk_partitioning/partition_for_home/rule.yml
 +++ b/linux_os/guide/system/software/disk_partitioning/partition_for_home/rule.yml
-@@ -45,7 +45,7 @@ references:
+@@ -41,7 +41,7 @@ references:
      stigid@ol7: OL07-00-021310
      stigid@ol8: OL08-00-010800
      stigid@rhel7: RHEL-07-021310
 -    stigid@rhel8: RHEL-08-010800
 +    stigid@almalinux8: RHEL-08-010800
-     stigid@rhel9: RHEL-09-231010
      stigid@sle12: SLES-12-010850
      stigid@sle15: SLES-15-040200
+ 
 diff --git a/linux_os/guide/system/software/disk_partitioning/partition_for_tmp/rule.yml b/linux_os/guide/system/software/disk_partitioning/partition_for_tmp/rule.yml
-index c0c938f2b..8f3b33363 100644
+index 7256a515b..60eb673f7 100644
 --- a/linux_os/guide/system/software/disk_partitioning/partition_for_tmp/rule.yml
 +++ b/linux_os/guide/system/software/disk_partitioning/partition_for_tmp/rule.yml
-@@ -42,7 +42,7 @@ references:
+@@ -38,7 +38,7 @@ references:
      stigid@ol7: OL07-00-021340
      stigid@ol8: OL08-00-010543
      stigid@rhel7: RHEL-07-021340
 -    stigid@rhel8: RHEL-08-010543
 +    stigid@almalinux8: RHEL-08-010543
-     stigid@rhel9: RHEL-09-231015
  
  {{{ complete_ocil_entry_separate_partition(part="/tmp") }}}
+ 
 diff --git a/linux_os/guide/system/software/disk_partitioning/partition_for_var/rule.yml b/linux_os/guide/system/software/disk_partitioning/partition_for_var/rule.yml
-index 74bbec5a8..cb538f13d 100644
+index e81fc0941..d77ef5030 100644
 --- a/linux_os/guide/system/software/disk_partitioning/partition_for_var/rule.yml
 +++ b/linux_os/guide/system/software/disk_partitioning/partition_for_var/rule.yml
-@@ -44,7 +44,7 @@ references:
+@@ -40,7 +40,7 @@ references:
      stigid@ol7: OL07-00-021320
      stigid@ol8: OL08-00-010540
      stigid@rhel7: RHEL-07-021320
 -    stigid@rhel8: RHEL-08-010540
 +    stigid@almalinux8: RHEL-08-010540
-     stigid@rhel9: RHEL-09-231020
      stigid@sle12: SLES-12-010860
      stigid@sle15: SLES-15-040210
+ 
 diff --git a/linux_os/guide/system/software/disk_partitioning/partition_for_var_log/rule.yml b/linux_os/guide/system/software/disk_partitioning/partition_for_var_log/rule.yml
-index 563251a11..1fae6d160 100644
+index 04890f4b8..c1174ea16 100644
 --- a/linux_os/guide/system/software/disk_partitioning/partition_for_var_log/rule.yml
 +++ b/linux_os/guide/system/software/disk_partitioning/partition_for_var_log/rule.yml
-@@ -42,7 +42,7 @@ references:
+@@ -38,7 +38,7 @@ references:
      nist-csf: PR.PT-1,PR.PT-4
      srg: SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-010541
 -    stigid@rhel8: RHEL-08-010541
 +    stigid@almalinux8: RHEL-08-010541
-     stigid@rhel9: RHEL-09-231025
  
  {{{ complete_ocil_entry_separate_partition(part="/var/log") }}}
+ 
 diff --git a/linux_os/guide/system/software/disk_partitioning/partition_for_var_log_audit/rule.yml b/linux_os/guide/system/software/disk_partitioning/partition_for_var_log_audit/rule.yml
-index 25ab26c3e..4d4ca84c0 100644
+index e874b23cf..d92a2c8c6 100644
 --- a/linux_os/guide/system/software/disk_partitioning/partition_for_var_log_audit/rule.yml
 +++ b/linux_os/guide/system/software/disk_partitioning/partition_for_var_log_audit/rule.yml
-@@ -50,7 +50,7 @@ references:
+@@ -46,7 +46,7 @@ references:
      stigid@ol7: OL07-00-021330
      stigid@ol8: OL08-00-010542
      stigid@rhel7: RHEL-07-021330
 -    stigid@rhel8: RHEL-08-010542
 +    stigid@almalinux8: RHEL-08-010542
-     stigid@rhel9: RHEL-09-231030
      stigid@sle12: SLES-12-010870
      stigid@sle15: SLES-15-030810
+ 
 diff --git a/linux_os/guide/system/software/disk_partitioning/partition_for_var_tmp/rule.yml b/linux_os/guide/system/software/disk_partitioning/partition_for_var_tmp/rule.yml
-index 423da9c42..6e697d50e 100644
+index 65e4fed4d..de7bca415 100644
 --- a/linux_os/guide/system/software/disk_partitioning/partition_for_var_tmp/rule.yml
 +++ b/linux_os/guide/system/software/disk_partitioning/partition_for_var_tmp/rule.yml
-@@ -35,7 +35,7 @@ references:
+@@ -31,7 +31,7 @@ references:
      cis@ubuntu2204: 1.1.4.1
      srg: SRG-OS-000480-GPOS-00227
      stigid@ol8: OL08-00-010544
 -    stigid@rhel8: RHEL-08-010544
 +    stigid@almalinux8: RHEL-08-010544
-     stigid@rhel9: RHEL-09-231035
  
  {{{ complete_ocil_entry_separate_partition(part="/var/tmp") }}}
+ 
 diff --git a/linux_os/guide/system/software/gnome/gnome_login_screen/dconf_gnome_disable_restart_shutdown/ansible/shared.yml b/linux_os/guide/system/software/gnome/gnome_login_screen/dconf_gnome_disable_restart_shutdown/ansible/shared.yml
 index c3baa1b80..be83f158f 100644
 --- a/linux_os/guide/system/software/gnome/gnome_login_screen/dconf_gnome_disable_restart_shutdown/ansible/shared.yml
@@ -13319,18 +13487,18 @@ index 917fc7dc4..bc1d7c63c 100644
  # strategy = unknown
  # complexity = low
 diff --git a/linux_os/guide/system/software/gnome/gnome_login_screen/dconf_gnome_disable_user_list/rule.yml b/linux_os/guide/system/software/gnome/gnome_login_screen/dconf_gnome_disable_user_list/rule.yml
-index 49fd4c26a..ab9b2a806 100644
+index 4cca435a6..7cf3252cb 100644
 --- a/linux_os/guide/system/software/gnome/gnome_login_screen/dconf_gnome_disable_user_list/rule.yml
 +++ b/linux_os/guide/system/software/gnome/gnome_login_screen/dconf_gnome_disable_user_list/rule.yml
-@@ -47,7 +47,7 @@ references:
+@@ -43,7 +43,7 @@ references:
      stigid@ol7: OL07-00-010063
      stigid@ol8: OL08-00-020032
      stigid@rhel7: RHEL-07-010063
 -    stigid@rhel8: RHEL-08-020032
 +    stigid@almalinux8: RHEL-08-020032
-     stigid@rhel9: RHEL-09-271115
  
  ocil_clause: 'disable-user-list has not been configured or is not disabled'
+ 
 diff --git a/linux_os/guide/system/software/gnome/gnome_login_screen/dconf_gnome_enable_smartcard_auth/ansible/shared.yml b/linux_os/guide/system/software/gnome/gnome_login_screen/dconf_gnome_enable_smartcard_auth/ansible/shared.yml
 index f5d68f1c3..91f02c0d4 100644
 --- a/linux_os/guide/system/software/gnome/gnome_login_screen/dconf_gnome_enable_smartcard_auth/ansible/shared.yml
@@ -13342,7 +13510,7 @@ index f5d68f1c3..91f02c0d4 100644
  # strategy = unknown
  # complexity = low
 diff --git a/linux_os/guide/system/software/gnome/gnome_login_screen/dconf_gnome_lock_screen_on_smartcard_removal/rule.yml b/linux_os/guide/system/software/gnome/gnome_login_screen/dconf_gnome_lock_screen_on_smartcard_removal/rule.yml
-index 640a61e51..ae0fcb24e 100644
+index 72feb1469..e5c79fba9 100644
 --- a/linux_os/guide/system/software/gnome/gnome_login_screen/dconf_gnome_lock_screen_on_smartcard_removal/rule.yml
 +++ b/linux_os/guide/system/software/gnome/gnome_login_screen/dconf_gnome_lock_screen_on_smartcard_removal/rule.yml
 @@ -32,7 +32,7 @@ references:
@@ -13351,9 +13519,9 @@ index 640a61e51..ae0fcb24e 100644
      stigid@ol8: OL08-00-020050
 -    stigid@rhel8: RHEL-08-020050
 +    stigid@almalinux8: RHEL-08-020050
-     stigid@rhel9: RHEL-09-271045,RHEL-09-271050
  
  ocil_clause: 'removal-action has not been configured'
+ 
 diff --git a/linux_os/guide/system/software/gnome/gnome_login_screen/dconf_gnome_login_retries/ansible/shared.yml b/linux_os/guide/system/software/gnome/gnome_login_screen/dconf_gnome_login_retries/ansible/shared.yml
 index 45e6c24aa..e06d9600f 100644
 --- a/linux_os/guide/system/software/gnome/gnome_login_screen/dconf_gnome_login_retries/ansible/shared.yml
@@ -13375,18 +13543,18 @@ index 6b19c8138..1f656f5a8 100644
  # strategy = unknown
  # complexity = low
 diff --git a/linux_os/guide/system/software/gnome/gnome_login_screen/gnome_gdm_disable_automatic_login/rule.yml b/linux_os/guide/system/software/gnome/gnome_login_screen/gnome_gdm_disable_automatic_login/rule.yml
-index 99bc0c878..b3fac1ffa 100644
+index 73002177c..2c9e6735f 100644
 --- a/linux_os/guide/system/software/gnome/gnome_login_screen/gnome_gdm_disable_automatic_login/rule.yml
 +++ b/linux_os/guide/system/software/gnome/gnome_login_screen/gnome_gdm_disable_automatic_login/rule.yml
-@@ -39,7 +39,7 @@ references:
+@@ -38,7 +38,7 @@ references:
      stigid@ol7: OL07-00-010440
      stigid@ol8: OL08-00-010820
      stigid@rhel7: RHEL-07-010440
 -    stigid@rhel8: RHEL-08-010820
 +    stigid@almalinux8: RHEL-08-010820
-     stigid@rhel9: RHEL-09-271040
  
  ocil_clause: 'GDM allows users to automatically login'
+ 
 diff --git a/linux_os/guide/system/software/gnome/gnome_login_screen/gnome_gdm_disable_guest_login/ansible/shared.yml b/linux_os/guide/system/software/gnome/gnome_login_screen/gnome_gdm_disable_guest_login/ansible/shared.yml
 index ef2933c52..0d72f6f65 100644
 --- a/linux_os/guide/system/software/gnome/gnome_login_screen/gnome_gdm_disable_guest_login/ansible/shared.yml
@@ -13528,18 +13696,18 @@ index 5b08acff4..d1af90b16 100644
  # strategy = unknown
  # complexity = low
 diff --git a/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_idle_delay/rule.yml b/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_idle_delay/rule.yml
-index c3aae1f94..27893d7fa 100644
+index 2b869894f..13072bdd1 100644
 --- a/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_idle_delay/rule.yml
 +++ b/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_idle_delay/rule.yml
-@@ -53,7 +53,7 @@ references:
+@@ -48,7 +48,7 @@ references:
      stigid@ol7: OL07-00-010070
      stigid@ol8: OL08-00-020060
      stigid@rhel7: RHEL-07-010070
 -    stigid@rhel8: RHEL-08-020060
 +    stigid@almalinux8: RHEL-08-020060
-     stigid@rhel9: RHEL-09-271065
      stigid@sle12: SLES-12-010080
      stigid@sle15: SLES-15-010120
+     stigid@ubuntu2204: UBTU-22-271025
 diff --git a/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_lock_delay/ansible/shared.yml b/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_lock_delay/ansible/shared.yml
 index 9d034e519..2c45806b4 100644
 --- a/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_lock_delay/ansible/shared.yml
@@ -13551,16 +13719,16 @@ index 9d034e519..2c45806b4 100644
  # strategy = unknown
  # complexity = low
 diff --git a/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_lock_delay/rule.yml b/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_lock_delay/rule.yml
-index 9caab7125..5571ec5d1 100644
+index 5c05b158d..a6e2d3e37 100644
 --- a/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_lock_delay/rule.yml
 +++ b/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_lock_delay/rule.yml
-@@ -45,7 +45,7 @@ references:
+@@ -40,7 +40,7 @@ references:
      stigid@ol7: OL07-00-010110
      stigid@ol8: OL08-00-020031
      stigid@rhel7: RHEL-07-010110
 -    stigid@rhel8: RHEL-08-020031
 +    stigid@almalinux8: RHEL-08-020031
-     stigid@rhel9: RHEL-09-271075
+     stigid@ubuntu2204: UBTU-22-271025
  
  ocil_clause: 'the screensaver lock delay is missing, or is set to a value greater than {{{ xccdf_value("var_screensaver_lock_delay") }}}'
 diff --git a/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_lock_enabled/ansible/shared.yml b/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_lock_enabled/ansible/shared.yml
@@ -13574,18 +13742,18 @@ index d04e6893f..5b9cba007 100644
  # strategy = unknown
  # complexity = low
 diff --git a/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_lock_enabled/rule.yml b/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_lock_enabled/rule.yml
-index 7281b7192..a0b8093d1 100644
+index 73d787909..583783561 100644
 --- a/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_lock_enabled/rule.yml
 +++ b/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_lock_enabled/rule.yml
-@@ -57,7 +57,7 @@ references:
+@@ -56,7 +56,7 @@ references:
      stigid@ol7: OL07-00-010060
      stigid@ol8: OL08-00-020030,OL08-00-020082
      stigid@rhel7: RHEL-07-010060
 -    stigid@rhel8: RHEL-08-020030
 +    stigid@almalinux8: RHEL-08-020030
-     stigid@rhel9: RHEL-09-271060,RHEL-09-271055
      stigid@sle12: SLES-12-010060
      stigid@sle15: SLES-15-010100
+     stigid@ubuntu2004: UBTU-20-010004
 diff --git a/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_lock_locked/ansible/shared.yml b/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_lock_locked/ansible/shared.yml
 index 34ff91ab3..875abf68d 100644
 --- a/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_lock_locked/ansible/shared.yml
@@ -13640,41 +13808,41 @@ index ed7d98843..a41cb7151 100644
  # strategy = unknown
  # complexity = low
 diff --git a/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_user_locks/rule.yml b/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_user_locks/rule.yml
-index 8af7828af..23932ed00 100644
+index c5918b524..c1079ba3d 100644
 --- a/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_user_locks/rule.yml
 +++ b/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_user_locks/rule.yml
-@@ -43,7 +43,7 @@ references:
+@@ -40,7 +40,7 @@ references:
      stigid@ol7: OL07-00-010081
      stigid@ol8: OL08-00-020080
      stigid@rhel7: RHEL-07-010081
 -    stigid@rhel8: RHEL-08-020080
 +    stigid@almalinux8: RHEL-08-020080
-     stigid@rhel9: RHEL-09-271080
  
  ocil_clause: 'GNOME3 session settings are not locked or configured properly'
+ 
 diff --git a/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_session_idle_user_locks/ansible/shared.yml b/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_session_idle_user_locks/ansible/shared.yml
-index aae97c962..18c7ec75f 100644
+index c379700ad..6d91cec21 100644
 --- a/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_session_idle_user_locks/ansible/shared.yml
 +++ b/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_session_idle_user_locks/ansible/shared.yml
 @@ -1,4 +1,4 @@
--# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_sle
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol,multi_platform_sle
  # reboot = false
  # strategy = unknown
  # complexity = low
 diff --git a/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_session_idle_user_locks/rule.yml b/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_session_idle_user_locks/rule.yml
-index 8f83ef5b1..07aa048e9 100644
+index aa5afe291..a3d7f1ec8 100644
 --- a/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_session_idle_user_locks/rule.yml
 +++ b/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_session_idle_user_locks/rule.yml
-@@ -47,7 +47,7 @@ references:
+@@ -43,7 +43,7 @@ references:
      stigid@ol7: OL07-00-010082
      stigid@ol8: OL08-00-020081
      stigid@rhel7: RHEL-07-010082
 -    stigid@rhel8: RHEL-08-020081
 +    stigid@almalinux8: RHEL-08-020081
-     stigid@rhel9: RHEL-09-271070
      stigid@sle12: SLES-12-010080
      stigid@sle15: SLES-15-010120
+ 
 diff --git a/linux_os/guide/system/software/gnome/gnome_system_settings/dconf_gnome_disable_ctrlaltdel_reboot/ansible/shared.yml b/linux_os/guide/system/software/gnome/gnome_system_settings/dconf_gnome_disable_ctrlaltdel_reboot/ansible/shared.yml
 index 76181547b..eb340cb5b 100644
 --- a/linux_os/guide/system/software/gnome/gnome_system_settings/dconf_gnome_disable_ctrlaltdel_reboot/ansible/shared.yml
@@ -13686,7 +13854,7 @@ index 76181547b..eb340cb5b 100644
  # strategy = unknown
  # complexity = low
 diff --git a/linux_os/guide/system/software/gnome/gnome_system_settings/dconf_gnome_disable_ctrlaltdel_reboot/rule.yml b/linux_os/guide/system/software/gnome/gnome_system_settings/dconf_gnome_disable_ctrlaltdel_reboot/rule.yml
-index 6700f0533..30d3068ab 100644
+index d1efec913..aba40a0ea 100644
 --- a/linux_os/guide/system/software/gnome/gnome_system_settings/dconf_gnome_disable_ctrlaltdel_reboot/rule.yml
 +++ b/linux_os/guide/system/software/gnome/gnome_system_settings/dconf_gnome_disable_ctrlaltdel_reboot/rule.yml
 @@ -46,7 +46,7 @@ references:
@@ -13695,8 +13863,8 @@ index 6700f0533..30d3068ab 100644
      stigid@rhel7: RHEL-07-020231
 -    stigid@rhel8: RHEL-08-040171
 +    stigid@almalinux8: RHEL-08-040171
-     stigid@rhel9: RHEL-09-271105,RHEL-09-271110
      stigid@ubuntu2004: UBTU-20-010459
+     stigid@ubuntu2204: UBTU-22-271030
  
 diff --git a/linux_os/guide/system/software/gnome/gnome_system_settings/dconf_gnome_disable_geolocation/ansible/shared.yml b/linux_os/guide/system/software/gnome/gnome_system_settings/dconf_gnome_disable_geolocation/ansible/shared.yml
 index fa4f578ef..f0d0708d1 100644
@@ -13734,7 +13902,7 @@ index 7ef0e5992..be7bc59b3 100644
        <extend_definition comment="Installed OS is RHEL8" definition_ref="installed_OS_is_rhel8" />
        <extend_definition comment="Installed OS is RHEL9" definition_ref="installed_OS_is_rhel9" />
 diff --git a/linux_os/guide/system/software/integrity/certified-vendor/installed_OS_is_vendor_supported/rule.yml b/linux_os/guide/system/software/integrity/certified-vendor/installed_OS_is_vendor_supported/rule.yml
-index 90d7c08b0..a19283b81 100644
+index c6f87fb5b..904472d09 100644
 --- a/linux_os/guide/system/software/integrity/certified-vendor/installed_OS_is_vendor_supported/rule.yml
 +++ b/linux_os/guide/system/software/integrity/certified-vendor/installed_OS_is_vendor_supported/rule.yml
 @@ -11,6 +11,9 @@ description: |-
@@ -13753,11 +13921,11 @@ index 90d7c08b0..a19283b81 100644
      stigid@rhel7: RHEL-07-020250
 -    stigid@rhel8: RHEL-08-010000
 +    stigid@almalinux8: RHEL-08-010000
-     stigid@rhel9: RHEL-09-211010
      stigid@sle12: SLES-12-010000
      stigid@sle15: SLES-15-010000
+ 
 diff --git a/linux_os/guide/system/software/integrity/crypto/configure_bind_crypto_policy/rule.yml b/linux_os/guide/system/software/integrity/crypto/configure_bind_crypto_policy/rule.yml
-index 395e7a665..ed739f421 100644
+index 837dab8a5..85463738a 100644
 --- a/linux_os/guide/system/software/integrity/crypto/configure_bind_crypto_policy/rule.yml
 +++ b/linux_os/guide/system/software/integrity/crypto/configure_bind_crypto_policy/rule.yml
 @@ -30,7 +30,7 @@ references:
@@ -13766,9 +13934,9 @@ index 395e7a665..ed739f421 100644
      stigid@ol8: OL08-00-010020
 -    stigid@rhel8: RHEL-08-010020
 +    stigid@almalinux8: RHEL-08-010020
-     stigid@rhel9: RHEL-09-672050
  
  ocil_clause: |-
+     BIND is installed and the BIND config file doesn't contain the
 diff --git a/linux_os/guide/system/software/integrity/crypto/configure_bind_crypto_policy/tests/absent.fail.sh b/linux_os/guide/system/software/integrity/crypto/configure_bind_crypto_policy/tests/absent.fail.sh
 index c7385d2c3..637496acd 100644
 --- a/linux_os/guide/system/software/integrity/crypto/configure_bind_crypto_policy/tests/absent.fail.sh
@@ -13840,26 +14008,26 @@ index dd096ab41..b180ed3b3 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/system/software/integrity/crypto/configure_crypto_policy/rule.yml b/linux_os/guide/system/software/integrity/crypto/configure_crypto_policy/rule.yml
-index 89225c96f..c2b0b4a14 100644
+index c065a2f53..7c2623f0b 100644
 --- a/linux_os/guide/system/software/integrity/crypto/configure_crypto_policy/rule.yml
 +++ b/linux_os/guide/system/software/integrity/crypto/configure_crypto_policy/rule.yml
-@@ -70,7 +70,7 @@ references:
-     pcidss4: '2.2.7'
+@@ -66,7 +66,7 @@ references:
+     ospp: FCS_COP.1(1),FCS_COP.1(2),FCS_COP.1(3),FCS_COP.1(4),FCS_CKM.1,FCS_CKM.2,FCS_TLSC_EXT.1
      srg: SRG-OS-000396-GPOS-00176,SRG-OS-000393-GPOS-00173,SRG-OS-000394-GPOS-00174
      stigid@ol8: OL08-00-010020
 -    stigid@rhel8: RHEL-08-010020
 +    stigid@almalinux8: RHEL-08-010020
-     stigid@rhel9: RHEL-09-671010,RHEL-09-672030,RHEL-09-672045
  
  ocil_clause: 'cryptographic policy is not configured or is configured incorrectly'
+ 
 diff --git a/linux_os/guide/system/software/integrity/crypto/configure_crypto_policy/tests/cis_l2.pass.sh b/linux_os/guide/system/software/integrity/crypto/configure_crypto_policy/tests/cis_l2.pass.sh
-index 053093a64..b7e1ee47a 100644
+index 7fca85ed5..53274ec25 100644
 --- a/linux_os/guide/system/software/integrity/crypto/configure_crypto_policy/tests/cis_l2.pass.sh
 +++ b/linux_os/guide/system/software/integrity/crypto/configure_crypto_policy/tests/cis_l2.pass.sh
 @@ -1,5 +1,5 @@
  #!/bin/bash
--# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
-+# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux 8,Red Hat Enterprise Linux 9
+-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8
++# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux 8
  # profiles = xccdf_org.ssgproject.content_profile_cis,xccdf_org.ssgproject.content_profile_cis_workstation_l2
  # packages = crypto-policies-scripts
  
@@ -13940,17 +14108,6 @@ index 56a081eca..a5383733b 100644
  # profiles = xccdf_org.ssgproject.content_profile_ospp
  # packages = crypto-policies-scripts
  
-diff --git a/linux_os/guide/system/software/integrity/crypto/configure_crypto_policy/tests/policy_default_cis_l1.pass.sh b/linux_os/guide/system/software/integrity/crypto/configure_crypto_policy/tests/policy_default_cis_l1.pass.sh
-index 10cb25593..55f128c10 100644
---- a/linux_os/guide/system/software/integrity/crypto/configure_crypto_policy/tests/policy_default_cis_l1.pass.sh
-+++ b/linux_os/guide/system/software/integrity/crypto/configure_crypto_policy/tests/policy_default_cis_l1.pass.sh
-@@ -1,5 +1,5 @@
- #!/bin/bash
--# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
-+# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux 8,Red Hat Enterprise Linux 9
- # profiles = xccdf_org.ssgproject.content_profile_cis_server_l1,xccdf_org.ssgproject.content_profile_cis_workstation_l1
- # packages = crypto-policies-scripts
- 
 diff --git a/linux_os/guide/system/software/integrity/crypto/configure_crypto_policy/tests/policy_default_nosha1_set.pass.sh b/linux_os/guide/system/software/integrity/crypto/configure_crypto_policy/tests/policy_default_nosha1_set.pass.sh
 index a2107d146..b6d9804d2 100644
 --- a/linux_os/guide/system/software/integrity/crypto/configure_crypto_policy/tests/policy_default_nosha1_set.pass.sh
@@ -14053,7 +14210,7 @@ index 3776d35aa..8710aef51 100644
  configfile=/etc/crypto-policies/back-ends/gnutls.config
  
 diff --git a/linux_os/guide/system/software/integrity/crypto/configure_kerberos_crypto_policy/rule.yml b/linux_os/guide/system/software/integrity/crypto/configure_kerberos_crypto_policy/rule.yml
-index de54d7f96..6c2c30188 100644
+index 0fe42c652..f126bf1b1 100644
 --- a/linux_os/guide/system/software/integrity/crypto/configure_kerberos_crypto_policy/rule.yml
 +++ b/linux_os/guide/system/software/integrity/crypto/configure_kerberos_crypto_policy/rule.yml
 @@ -28,7 +28,7 @@ references:
@@ -14062,9 +14219,9 @@ index de54d7f96..6c2c30188 100644
      stigid@ol8: OL08-00-010020
 -    stigid@rhel8: RHEL-08-010020
 +    stigid@almalinux8: RHEL-08-010020
-     stigid@rhel9: RHEL-09-672025
  
  ocil_clause: 'the symlink does not exist or points to a different target'
+ 
 diff --git a/linux_os/guide/system/software/integrity/crypto/configure_kerberos_crypto_policy/tests/kerberos_correct_policy.pass.sh b/linux_os/guide/system/software/integrity/crypto/configure_kerberos_crypto_policy/tests/kerberos_correct_policy.pass.sh
 index 4834387dc..1d404fe6e 100644
 --- a/linux_os/guide/system/software/integrity/crypto/configure_kerberos_crypto_policy/tests/kerberos_correct_policy.pass.sh
@@ -14098,7 +14255,7 @@ index 4eb5348f2..9047445c5 100644
  rm -f /etc/krb5.conf.d/crypto-policies
  ln -s /etc/crypto-policies/back-ends/openssh.config /etc/krb5.conf.d/crypto-policies
 diff --git a/linux_os/guide/system/software/integrity/crypto/configure_libreswan_crypto_policy/rule.yml b/linux_os/guide/system/software/integrity/crypto/configure_libreswan_crypto_policy/rule.yml
-index f0b782571..c85593f9e 100644
+index 50a24168a..1e5cb365a 100644
 --- a/linux_os/guide/system/software/integrity/crypto/configure_libreswan_crypto_policy/rule.yml
 +++ b/linux_os/guide/system/software/integrity/crypto/configure_libreswan_crypto_policy/rule.yml
 @@ -35,7 +35,7 @@ references:
@@ -14107,9 +14264,9 @@ index f0b782571..c85593f9e 100644
      stigid@ol8: OL08-00-010020
 -    stigid@rhel8: RHEL-08-010020
 +    stigid@almalinux8: RHEL-08-010020
-     stigid@rhel9: RHEL-09-671020
  
  ocil_clause: |-
+     the "IPsec" service is active and the ipsec configuration file does not contain does not contain <tt>include /etc/crypto-policies/back-ends/libreswan.config</tt>
 diff --git a/linux_os/guide/system/software/integrity/crypto/configure_libreswan_crypto_policy/tests/libreswan_not_installed.pass.sh b/linux_os/guide/system/software/integrity/crypto/configure_libreswan_crypto_policy/tests/libreswan_not_installed.pass.sh
 index 9379b5ff3..c8fdbd4f5 100644
 --- a/linux_os/guide/system/software/integrity/crypto/configure_libreswan_crypto_policy/tests/libreswan_not_installed.pass.sh
@@ -14169,7 +14326,7 @@ index 2863c6102..aeeddb9a1 100644
  
  cp ipsec.conf /etc
 diff --git a/linux_os/guide/system/software/integrity/crypto/configure_openssl_crypto_policy/rule.yml b/linux_os/guide/system/software/integrity/crypto/configure_openssl_crypto_policy/rule.yml
-index 0f60c61d7..523515c11 100644
+index b3ef46578..752c1d4ca 100644
 --- a/linux_os/guide/system/software/integrity/crypto/configure_openssl_crypto_policy/rule.yml
 +++ b/linux_os/guide/system/software/integrity/crypto/configure_openssl_crypto_policy/rule.yml
 @@ -44,7 +44,7 @@ references:
@@ -14178,9 +14335,9 @@ index 0f60c61d7..523515c11 100644
      stigid@ol8: OL08-00-010293
 -    stigid@rhel8: RHEL-08-010293
 +    stigid@almalinux8: RHEL-08-010293
-     stigid@rhel9: RHEL-09-672035
  
  ocil_clause: |-
+     the OpenSSL config file doesn't contain the whole section,
 diff --git a/linux_os/guide/system/software/integrity/crypto/configure_openssl_crypto_policy/tests/include_with_equal_sign.pass.sh b/linux_os/guide/system/software/integrity/crypto/configure_openssl_crypto_policy/tests/include_with_equal_sign.pass.sh
 index 8ccb6cef9..306b29698 100644
 --- a/linux_os/guide/system/software/integrity/crypto/configure_openssl_crypto_policy/tests/include_with_equal_sign.pass.sh
@@ -14237,7 +14394,7 @@ index 1b2ea8d80..7795d5a96 100644
  . common.sh
  
 diff --git a/linux_os/guide/system/software/integrity/crypto/configure_openssl_tls_crypto_policy/rule.yml b/linux_os/guide/system/software/integrity/crypto/configure_openssl_tls_crypto_policy/rule.yml
-index 6fad634d7..969472391 100644
+index bef94ba7e..6b46a9800 100644
 --- a/linux_os/guide/system/software/integrity/crypto/configure_openssl_tls_crypto_policy/rule.yml
 +++ b/linux_os/guide/system/software/integrity/crypto/configure_openssl_tls_crypto_policy/rule.yml
 @@ -44,7 +44,7 @@ references:
@@ -14246,9 +14403,9 @@ index 6fad634d7..969472391 100644
      stigid@ol8: OL08-00-010294
 -    stigid@rhel8: RHEL-08-010294
 +    stigid@almalinux8: RHEL-08-010294
-     stigid@rhel9: RHEL-09-672040
  
  ocil_clause: 'cryptographic policy for openssl is not configured or is configured incorrectly'
+ 
 diff --git a/linux_os/guide/system/software/integrity/crypto/configure_openssl_tls_crypto_policy/tests/correct.pass.sh b/linux_os/guide/system/software/integrity/crypto/configure_openssl_tls_crypto_policy/tests/correct.pass.sh
 index 48ccb9b98..80b0cdbbc 100644
 --- a/linux_os/guide/system/software/integrity/crypto/configure_openssl_tls_crypto_policy/tests/correct.pass.sh
@@ -14327,18 +14484,18 @@ index 1593ce8ae..e42f42388 100644
  configfile=/etc/crypto-policies/back-ends/opensslcnf.config
  
 diff --git a/linux_os/guide/system/software/integrity/crypto/configure_ssh_crypto_policy/rule.yml b/linux_os/guide/system/software/integrity/crypto/configure_ssh_crypto_policy/rule.yml
-index 3fcebafa3..f5be4edbb 100644
+index 84e934e64..7c16d2955 100644
 --- a/linux_os/guide/system/software/integrity/crypto/configure_ssh_crypto_policy/rule.yml
 +++ b/linux_os/guide/system/software/integrity/crypto/configure_ssh_crypto_policy/rule.yml
-@@ -36,7 +36,7 @@ references:
-     pcidss4: '2.2.7'
+@@ -32,7 +32,7 @@ references:
+     pcidss: Req-2.2
      srg: SRG-OS-000250-GPOS-00093
      stigid@ol8: OL08-00-010287
 -    stigid@rhel8: RHEL-08-010287
 +    stigid@almalinux8: RHEL-08-010287
-     stigid@rhel9: RHEL-09-255055
  
  ocil_clause: 'the CRYPTO_POLICY variable is set or is not commented out in the /etc/sysconfig/sshd'
+ 
 diff --git a/linux_os/guide/system/software/integrity/crypto/configure_ssh_crypto_policy/tests/absent.pass.sh b/linux_os/guide/system/software/integrity/crypto/configure_ssh_crypto_policy/tests/absent.pass.sh
 index 96ae6a064..399d9d334 100644
 --- a/linux_os/guide/system/software/integrity/crypto/configure_ssh_crypto_policy/tests/absent.pass.sh
@@ -14814,7 +14971,7 @@ index 6db8f9654..2f0172991 100644
  {{{ bash_instantiate_variables("sshd_approved_ciphers") }}}
  
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_openssh_conf_crypto_policy/rule.yml b/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_openssh_conf_crypto_policy/rule.yml
-index d8dbff009..2ff8a7b55 100644
+index f25e84f0e..2c0b0062c 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_openssh_conf_crypto_policy/rule.yml
 +++ b/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_openssh_conf_crypto_policy/rule.yml
 @@ -31,7 +31,7 @@ references:
@@ -14823,9 +14980,9 @@ index d8dbff009..2ff8a7b55 100644
      stigid@ol8: OL08-00-010020
 -    stigid@rhel8: RHEL-08-010020
 +    stigid@almalinux8: RHEL-08-010020
-     stigid@rhel9: RHEL-09-255060
  
  ocil_clause: 'Crypto Policy for OpenSSH client is not configured correctly'
+ 
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_openssh_conf_crypto_policy/tests/stig_correct.pass.sh b/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_openssh_conf_crypto_policy/tests/stig_correct.pass.sh
 index 0bf0e7eef..9521cde55 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_openssh_conf_crypto_policy/tests/stig_correct.pass.sh
@@ -14925,7 +15082,7 @@ index e83aeb894..f64e72e60 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_opensshserver_conf_crypto_policy/bash/shared.sh b/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_opensshserver_conf_crypto_policy/bash/shared.sh
-index 14d764ca8..49e23f8c7 100644
+index 365136d0c..e7f764dda 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_opensshserver_conf_crypto_policy/bash/shared.sh
 +++ b/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_opensshserver_conf_crypto_policy/bash/shared.sh
 @@ -1,4 +1,4 @@
@@ -14935,7 +15092,7 @@ index 14d764ca8..49e23f8c7 100644
  {{{ bash_instantiate_variables("sshd_approved_ciphers") }}}
  
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_opensshserver_conf_crypto_policy/rule.yml b/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_opensshserver_conf_crypto_policy/rule.yml
-index 946f7e102..0553c1e54 100644
+index 2b95e3b80..a7628932f 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_opensshserver_conf_crypto_policy/rule.yml
 +++ b/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_opensshserver_conf_crypto_policy/rule.yml
 @@ -31,7 +31,7 @@ references:
@@ -14944,9 +15101,9 @@ index 946f7e102..0553c1e54 100644
      stigid@ol8: OL08-00-010291
 -    stigid@rhel8: RHEL-08-010291
 +    stigid@almalinux8: RHEL-08-010291
-     stigid@rhel9: RHEL-09-255065
  
  ocil_clause: 'Crypto Policy for OpenSSH Server is not configured correctly'
+ 
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_opensshserver_conf_crypto_policy/tests/rhel8_stig_correct.pass.sh b/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_opensshserver_conf_crypto_policy/tests/rhel8_stig_correct.pass.sh
 index 34b69406a..7156acfe3 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_opensshserver_conf_crypto_policy/tests/rhel8_stig_correct.pass.sh
@@ -15221,7 +15378,7 @@ index 6a0e45947..3ce060968 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_opensshserver_conf_crypto_policy/bash/shared.sh b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_opensshserver_conf_crypto_policy/bash/shared.sh
-index a06ffc2d7..6b4a4f76c 100644
+index 18388a11a..cb12e1345 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_opensshserver_conf_crypto_policy/bash/shared.sh
 +++ b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_opensshserver_conf_crypto_policy/bash/shared.sh
 @@ -1,4 +1,4 @@
@@ -15339,31 +15496,31 @@ index 0447bf2c4..43627ebd3 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/system/software/integrity/endpoint_security_software/mcafee_security_software/mcafee_endpoint_security_software/agent_mfetpd_running/rule.yml b/linux_os/guide/system/software/integrity/endpoint_security_software/mcafee_security_software/mcafee_endpoint_security_software/agent_mfetpd_running/rule.yml
-index 3f8e47ab0..4d64f217a 100644
+index a678a64d6..f9002684b 100644
 --- a/linux_os/guide/system/software/integrity/endpoint_security_software/mcafee_security_software/mcafee_endpoint_security_software/agent_mfetpd_running/rule.yml
 +++ b/linux_os/guide/system/software/integrity/endpoint_security_software/mcafee_security_software/mcafee_endpoint_security_software/agent_mfetpd_running/rule.yml
-@@ -26,7 +26,7 @@ references:
+@@ -28,7 +28,7 @@ references:
      stigid@ol7: OL07-00-020019
      stigid@ol8: OL08-00-010001
      stigid@rhel7: RHEL-07-020019
 -    stigid@rhel8: RHEL-08-010001
 +    stigid@almalinux8: RHEL-08-010001
-     stigid@rhel9: RHEL-09-211025
+     stigid@sle12: SLES-12-010599
+     stigid@sle15: SLES-15-010001
  
- ocil_clause: 'virus scanning software is not running'
 diff --git a/linux_os/guide/system/software/integrity/endpoint_security_software/mcafee_security_software/mcafee_endpoint_security_software/package_mcafeetp_installed/rule.yml b/linux_os/guide/system/software/integrity/endpoint_security_software/mcafee_security_software/mcafee_endpoint_security_software/package_mcafeetp_installed/rule.yml
-index 97f7635dd..cdc2c119b 100644
+index 003163e10..c3c95c2c4 100644
 --- a/linux_os/guide/system/software/integrity/endpoint_security_software/mcafee_security_software/mcafee_endpoint_security_software/package_mcafeetp_installed/rule.yml
 +++ b/linux_os/guide/system/software/integrity/endpoint_security_software/mcafee_security_software/mcafee_endpoint_security_software/package_mcafeetp_installed/rule.yml
-@@ -34,7 +34,7 @@ references:
+@@ -36,7 +36,7 @@ references:
      stigid@ol7: OL07-00-020019
      stigid@ol8: OL08-00-010001
      stigid@rhel7: RHEL-07-020019
 -    stigid@rhel8: RHEL-08-010001
 +    stigid@almalinux8: RHEL-08-010001
-     stigid@rhel9: RHEL-09-211025
+     stigid@sle12: SLES-12-010599
+     stigid@sle15: SLES-15-010001
      stigid@ubuntu2004: UBTU-20-010415
- 
 diff --git a/linux_os/guide/system/software/integrity/fips/enable_dracut_fips_module/ansible/shared.yml b/linux_os/guide/system/software/integrity/fips/enable_dracut_fips_module/ansible/shared.yml
 index 9647791ef..9f70b30d4 100644
 --- a/linux_os/guide/system/software/integrity/fips/enable_dracut_fips_module/ansible/shared.yml
@@ -15385,7 +15542,7 @@ index 5da0c99e6..57ac7592b 100644
  fips-mode-setup --enable
  FIPS_CONF="/etc/dracut.conf.d/40-fips.conf"
 diff --git a/linux_os/guide/system/software/integrity/fips/enable_dracut_fips_module/rule.yml b/linux_os/guide/system/software/integrity/fips/enable_dracut_fips_module/rule.yml
-index 885a4044e..4aeb05b68 100644
+index 047aaf284..569f532c3 100644
 --- a/linux_os/guide/system/software/integrity/fips/enable_dracut_fips_module/rule.yml
 +++ b/linux_os/guide/system/software/integrity/fips/enable_dracut_fips_module/rule.yml
 @@ -30,7 +30,7 @@ references:
@@ -15394,9 +15551,9 @@ index 885a4044e..4aeb05b68 100644
      stigid@ol8: OL08-00-010020
 -    stigid@rhel8: RHEL-08-010020
 +    stigid@almalinux8: RHEL-08-010020
-     stigid@rhel9: RHEL-09-671010
  
  ocil_clause: 'the Dracut FIPS module is not enabled'
+ 
 diff --git a/linux_os/guide/system/software/integrity/fips/enable_dracut_fips_module/tests/fips_dracut_module_missing.fail.sh b/linux_os/guide/system/software/integrity/fips/enable_dracut_fips_module/tests/fips_dracut_module_missing.fail.sh
 index 9c232fc94..f3d71ee21 100644
 --- a/linux_os/guide/system/software/integrity/fips/enable_dracut_fips_module/tests/fips_dracut_module_missing.fail.sh
@@ -15444,7 +15601,7 @@ index 3b50e0706..4e4d713e1 100644
      check="all" check_existence="all_exist"
      comment="FIPS mode is selected in running kernel options">
 diff --git a/linux_os/guide/system/software/integrity/fips/enable_fips_mode/rule.yml b/linux_os/guide/system/software/integrity/fips/enable_fips_mode/rule.yml
-index 97898e301..554bb0e25 100644
+index 239818829..ecb10914b 100644
 --- a/linux_os/guide/system/software/integrity/fips/enable_fips_mode/rule.yml
 +++ b/linux_os/guide/system/software/integrity/fips/enable_fips_mode/rule.yml
 @@ -47,7 +47,7 @@ references:
@@ -15453,11 +15610,11 @@ index 97898e301..554bb0e25 100644
      stigid@ol8: OL08-00-010020
 -    stigid@rhel8: RHEL-08-010020
 +    stigid@almalinux8: RHEL-08-010020
-     stigid@rhel9: RHEL-09-671010
  
  ocil_clause: 'FIPS mode is not enabled'
+ 
 diff --git a/linux_os/guide/system/software/integrity/fips/sysctl_crypto_fips_enabled/rule.yml b/linux_os/guide/system/software/integrity/fips/sysctl_crypto_fips_enabled/rule.yml
-index c498e1dad..fba92cdb5 100644
+index d93723005..5f3e56335 100644
 --- a/linux_os/guide/system/software/integrity/fips/sysctl_crypto_fips_enabled/rule.yml
 +++ b/linux_os/guide/system/software/integrity/fips/sysctl_crypto_fips_enabled/rule.yml
 @@ -34,7 +34,7 @@ references:
@@ -15466,9 +15623,9 @@ index c498e1dad..fba92cdb5 100644
      stigid@ol8: OL08-00-010020
 -    stigid@rhel8: RHEL-08-010020
 +    stigid@almalinux8: RHEL-08-010020
-     stigid@rhel9: RHEL-09-671010
  
  ocil_clause: 'crypto.fips_enabled is not 1'
+ 
 diff --git a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_build_database/bash/shared.sh b/linux_os/guide/system/software/integrity/software-integrity/aide/aide_build_database/bash/shared.sh
 index 04e69228b..9072c4023 100644
 --- a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_build_database/bash/shared.sh
@@ -15480,10 +15637,10 @@ index 04e69228b..9072c4023 100644
  {{% if 'sle' in product %}}
  zypper -q --no-remote ref
 diff --git a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_build_database/rule.yml b/linux_os/guide/system/software/integrity/software-integrity/aide/aide_build_database/rule.yml
-index c95dc4a0d..1f1a00502 100644
+index 6ab661bf5..4d73a9d14 100644
 --- a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_build_database/rule.yml
 +++ b/linux_os/guide/system/software/integrity/software-integrity/aide/aide_build_database/rule.yml
-@@ -65,7 +65,7 @@ references:
+@@ -60,7 +60,7 @@ references:
      stigid@ol7: OL07-00-020029
      stigid@ol8: OL08-00-010359
      stigid@rhel7: RHEL-07-020029
@@ -15493,7 +15650,7 @@ index c95dc4a0d..1f1a00502 100644
      stigid@sle15: SLES-15-010419
      stigid@ubuntu2004: UBTU-20-010450
 diff --git a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_check_audit_tools/ansible/shared.yml b/linux_os/guide/system/software/integrity/software-integrity/aide/aide_check_audit_tools/ansible/shared.yml
-index 7a53caee5..ca8c351f7 100644
+index 4109e8d44..65a693e23 100644
 --- a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_check_audit_tools/ansible/shared.yml
 +++ b/linux_os/guide/system/software/integrity/software-integrity/aide/aide_check_audit_tools/ansible/shared.yml
 @@ -1,4 +1,4 @@
@@ -15513,18 +15670,18 @@ index ea2a1113b..fbc6b9b8a 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_check_audit_tools/rule.yml b/linux_os/guide/system/software/integrity/software-integrity/aide/aide_check_audit_tools/rule.yml
-index 14ee598be..e780b1bd0 100644
+index c0f614ec1..a5b5beeb1 100644
 --- a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_check_audit_tools/rule.yml
 +++ b/linux_os/guide/system/software/integrity/software-integrity/aide/aide_check_audit_tools/rule.yml
-@@ -43,7 +43,7 @@ references:
+@@ -41,7 +41,7 @@ references:
      nist: AU-9(3),AU-9(3).1
      srg: SRG-OS-000278-GPOS-00108
      stigid@ol8: OL08-00-030650
 -    stigid@rhel8: RHEL-08-030650
 +    stigid@almalinux8: RHEL-08-030650
-     stigid@rhel9: RHEL-09-651025
      stigid@sle12: SLES-12-010540
      stigid@sle15: SLES-15-030630
+     stigid@ubuntu2004: UBTU-20-010205
 diff --git a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_check_audit_tools/tests/correct.pass.sh b/linux_os/guide/system/software/integrity/software-integrity/aide/aide_check_audit_tools/tests/correct.pass.sh
 index 5f751bee5..2684687ff 100644
 --- a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_check_audit_tools/tests/correct.pass.sh
@@ -15580,18 +15737,18 @@ index dfa5c1b6c..60ac94141 100644
  {{{ bash_package_install("aide") }}}
  
 diff --git a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_scan_notification/rule.yml b/linux_os/guide/system/software/integrity/software-integrity/aide/aide_scan_notification/rule.yml
-index 8a24a9300..5bca2dc40 100644
+index c2d7e7a7c..3d27eca9f 100644
 --- a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_scan_notification/rule.yml
 +++ b/linux_os/guide/system/software/integrity/software-integrity/aide/aide_scan_notification/rule.yml
-@@ -48,7 +48,7 @@ references:
+@@ -47,7 +47,7 @@ references:
      stigid@ol7: OL07-00-020040
      stigid@ol8: OL08-00-010360
      stigid@rhel7: RHEL-07-020040
 -    stigid@rhel8: RHEL-08-010360
 +    stigid@almalinux8: RHEL-08-010360
-     stigid@rhel9: RHEL-09-651015
      stigid@sle12: SLES-12-010510
      stigid@sle15: SLES-15-010570
+ 
 diff --git a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_use_fips_hashes/bash/shared.sh b/linux_os/guide/system/software/integrity/software-integrity/aide/aide_use_fips_hashes/bash/shared.sh
 index 34a114520..b22a658da 100644
 --- a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_use_fips_hashes/bash/shared.sh
@@ -15627,18 +15784,18 @@ index 3c2037208..8211c4ad0 100644
  
  cat >/etc/aide.conf <<EOL
 diff --git a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_verify_acls/rule.yml b/linux_os/guide/system/software/integrity/software-integrity/aide/aide_verify_acls/rule.yml
-index 32d104fc7..1ee861755 100644
+index 3154dbb7e..718f28b48 100644
 --- a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_verify_acls/rule.yml
 +++ b/linux_os/guide/system/software/integrity/software-integrity/aide/aide_verify_acls/rule.yml
-@@ -42,7 +42,7 @@ references:
+@@ -41,7 +41,7 @@ references:
      stigid@ol7: OL07-00-021600
      stigid@ol8: OL08-00-040310
      stigid@rhel7: RHEL-07-021600
 -    stigid@rhel8: RHEL-08-040310
 +    stigid@almalinux8: RHEL-08-040310
-     stigid@rhel9: RHEL-09-651030
      stigid@sle12: SLES-12-010520
      stigid@sle15: SLES-15-040040
+ 
 diff --git a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_verify_acls/tests/correct_value.pass.sh b/linux_os/guide/system/software/integrity/software-integrity/aide/aide_verify_acls/tests/correct_value.pass.sh
 index 9f9f96e4d..e654ec2ee 100644
 --- a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_verify_acls/tests/correct_value.pass.sh
@@ -15664,18 +15821,18 @@ index fd664d468..a00afa564 100644
  
  cat >/etc/aide.conf <<EOL
 diff --git a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_verify_ext_attributes/rule.yml b/linux_os/guide/system/software/integrity/software-integrity/aide/aide_verify_ext_attributes/rule.yml
-index 5869e4ff8..74a27b14c 100644
+index a6282859f..67623f003 100644
 --- a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_verify_ext_attributes/rule.yml
 +++ b/linux_os/guide/system/software/integrity/software-integrity/aide/aide_verify_ext_attributes/rule.yml
-@@ -42,7 +42,7 @@ references:
+@@ -41,7 +41,7 @@ references:
      stigid@ol7: OL07-00-021610
      stigid@ol8: OL08-00-040300
      stigid@rhel7: RHEL-07-021610
 -    stigid@rhel8: RHEL-08-040300
 +    stigid@almalinux8: RHEL-08-040300
-     stigid@rhel9: RHEL-09-651035
      stigid@sle12: SLES-12-010530
      stigid@sle15: SLES-15-040050
+ 
 diff --git a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_verify_ext_attributes/tests/correct_value.pass.sh b/linux_os/guide/system/software/integrity/software-integrity/aide/aide_verify_ext_attributes/tests/correct_value.pass.sh
 index 9f9f96e4d..e654ec2ee 100644
 --- a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_verify_ext_attributes/tests/correct_value.pass.sh
@@ -15701,7 +15858,7 @@ index d02d969a2..a88b92ab3 100644
  
  cat >/etc/aide.conf <<EOL
 diff --git a/linux_os/guide/system/software/integrity/software-integrity/aide/file_audit_tools_group_ownership/rule.yml b/linux_os/guide/system/software/integrity/software-integrity/aide/file_audit_tools_group_ownership/rule.yml
-index 5a4079e2d..c3c865563 100644
+index 7e9f58461..61df4e464 100644
 --- a/linux_os/guide/system/software/integrity/software-integrity/aide/file_audit_tools_group_ownership/rule.yml
 +++ b/linux_os/guide/system/software/integrity/software-integrity/aide/file_audit_tools_group_ownership/rule.yml
 @@ -25,7 +25,7 @@ references:
@@ -15710,11 +15867,11 @@ index 5a4079e2d..c3c865563 100644
      stigid@ol8: OL08-00-030640
 -    stigid@rhel8: RHEL-08-030640
 +    stigid@almalinux8: RHEL-08-030640
-     stigid@rhel9: RHEL-09-232225
  
  ocil_clause: 'any audit tools are not group-owned by root'
+ 
 diff --git a/linux_os/guide/system/software/integrity/software-integrity/aide/file_audit_tools_ownership/rule.yml b/linux_os/guide/system/software/integrity/software-integrity/aide/file_audit_tools_ownership/rule.yml
-index 766e086b2..bc053fc0a 100644
+index 5f823d146..15778e4a8 100644
 --- a/linux_os/guide/system/software/integrity/software-integrity/aide/file_audit_tools_ownership/rule.yml
 +++ b/linux_os/guide/system/software/integrity/software-integrity/aide/file_audit_tools_ownership/rule.yml
 @@ -25,7 +25,7 @@ references:
@@ -15723,11 +15880,11 @@ index 766e086b2..bc053fc0a 100644
      stigid@ol8: OL08-00-030630
 -    stigid@rhel8: RHEL-08-030630
 +    stigid@almalinux8: RHEL-08-030630
-     stigid@rhel9: RHEL-09-232220
  
  ocil_clause: 'any audit tools are not owned by root'
+ 
 diff --git a/linux_os/guide/system/software/integrity/software-integrity/aide/file_audit_tools_permissions/rule.yml b/linux_os/guide/system/software/integrity/software-integrity/aide/file_audit_tools_permissions/rule.yml
-index 96c20bb32..6abaec41c 100644
+index cdad30447..8b4b7e7c8 100644
 --- a/linux_os/guide/system/software/integrity/software-integrity/aide/file_audit_tools_permissions/rule.yml
 +++ b/linux_os/guide/system/software/integrity/software-integrity/aide/file_audit_tools_permissions/rule.yml
 @@ -25,7 +25,7 @@ references:
@@ -15736,22 +15893,22 @@ index 96c20bb32..6abaec41c 100644
      stigid@ol8: OL08-00-030620
 -    stigid@rhel8: RHEL-08-030620
 +    stigid@almalinux8: RHEL-08-030620
-     stigid@rhel9: RHEL-09-232035
  
  ocil_clause: 'any of these files have more permissive permissions than 0755'
+ 
 diff --git a/linux_os/guide/system/software/integrity/software-integrity/aide/package_aide_installed/rule.yml b/linux_os/guide/system/software/integrity/software-integrity/aide/package_aide_installed/rule.yml
-index 7e62f7094..72cef2e4f 100644
+index 00609b4df..0f0ebfa5a 100644
 --- a/linux_os/guide/system/software/integrity/software-integrity/aide/package_aide_installed/rule.yml
 +++ b/linux_os/guide/system/software/integrity/software-integrity/aide/package_aide_installed/rule.yml
-@@ -42,7 +42,7 @@ references:
+@@ -37,7 +37,7 @@ references:
      stigid@ol7: OL07-00-020029
      stigid@ol8: OL08-00-010359
      stigid@rhel7: RHEL-07-020029
 -    stigid@rhel8: RHEL-08-010359
 +    stigid@almalinux8: RHEL-08-010359
-     stigid@rhel9: RHEL-09-651010
      stigid@sle12: SLES-12-010499
      stigid@sle15: SLES-15-010419
+     stigid@ubuntu2004: UBTU-20-010450
 diff --git a/linux_os/guide/system/software/integrity/software-integrity/rpm_verification/rpm_verify_hashes/ansible/shared.yml b/linux_os/guide/system/software/integrity/software-integrity/rpm_verification/rpm_verify_hashes/ansible/shared.yml
 index 9e5172cc5..88a2fa5de 100644
 --- a/linux_os/guide/system/software/integrity/software-integrity/rpm_verification/rpm_verify_hashes/ansible/shared.yml
@@ -15823,7 +15980,7 @@ index 0f791c95e..0efde1682 100644
  # strategy = restrict
  # complexity = high
 diff --git a/linux_os/guide/system/software/sudo/sudo_add_env_reset/rule.yml b/linux_os/guide/system/software/sudo/sudo_add_env_reset/rule.yml
-index 12db58eb3..c02427f46 100644
+index adef5881f..71de2f705 100644
 --- a/linux_os/guide/system/software/sudo/sudo_add_env_reset/rule.yml
 +++ b/linux_os/guide/system/software/sudo/sudo_add_env_reset/rule.yml
 @@ -6,7 +6,7 @@ title: 'Ensure sudo Runs In A Minimal Environment - sudo env_reset'
@@ -15836,7 +15993,7 @@ index 12db58eb3..c02427f46 100644
  {{%- endif %}}
      This should be enabled by making sure that the <tt>env_reset</tt> tag exists in
 diff --git a/linux_os/guide/system/software/sudo/sudo_add_ignore_dot/rule.yml b/linux_os/guide/system/software/sudo/sudo_add_ignore_dot/rule.yml
-index 730dc5504..b625424cb 100644
+index 4ef155c07..9b83039dd 100644
 --- a/linux_os/guide/system/software/sudo/sudo_add_ignore_dot/rule.yml
 +++ b/linux_os/guide/system/software/sudo/sudo_add_ignore_dot/rule.yml
 @@ -6,7 +6,7 @@ title: 'Ensure sudo Ignores Commands In Current Dir - sudo ignore_dot'
@@ -15862,7 +16019,7 @@ index 1445c701a..b1ff0cd91 100644
  {{% endif %}}
      The passwd_timeout should be configured by making sure that the
 diff --git a/linux_os/guide/system/software/sudo/sudo_add_umask/rule.yml b/linux_os/guide/system/software/sudo/sudo_add_umask/rule.yml
-index ae86e7293..4674e6b97 100644
+index 10df3eea7..6f2821342 100644
 --- a/linux_os/guide/system/software/sudo/sudo_add_umask/rule.yml
 +++ b/linux_os/guide/system/software/sudo/sudo_add_umask/rule.yml
 @@ -6,7 +6,7 @@ title: 'Ensure sudo umask is appropriate - sudo umask'
@@ -15929,10 +16086,10 @@ index 39ec72b52..a2849d3b4 100644
  # variables = var_sudo_umask=0027
  
  echo "Defaults use_pty,umask=0027,noexec" >> /etc/sudoers
-diff --git a/linux_os/guide/system/software/sudo/sudo_dedicated_group/tests/root_default.pass.sh b/linux_os/guide/system/software/sudo/sudo_dedicated_group/tests/root_default.pass.sh
+diff --git a/linux_os/guide/system/software/sudo/sudo_dedicated_group/tests/root_default.fail.sh b/linux_os/guide/system/software/sudo/sudo_dedicated_group/tests/root_default.fail.sh
 index 0e5aed5d0..c75edccd5 100644
---- a/linux_os/guide/system/software/sudo/sudo_dedicated_group/tests/root_default.pass.sh
-+++ b/linux_os/guide/system/software/sudo/sudo_dedicated_group/tests/root_default.pass.sh
+--- a/linux_os/guide/system/software/sudo/sudo_dedicated_group/tests/root_default.fail.sh
++++ b/linux_os/guide/system/software/sudo/sudo_dedicated_group/tests/root_default.fail.sh
 @@ -1,4 +1,4 @@
 -# platform = multi_platform_ol,multi_platform_rhel
 +# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
@@ -15940,46 +16097,46 @@ index 0e5aed5d0..c75edccd5 100644
  
  # Make sure sudo is owned by root group
 diff --git a/linux_os/guide/system/software/sudo/sudo_remove_no_authenticate/rule.yml b/linux_os/guide/system/software/sudo/sudo_remove_no_authenticate/rule.yml
-index 553370c11..d5a9a7f5f 100644
+index e580c801c..17790c07e 100644
 --- a/linux_os/guide/system/software/sudo/sudo_remove_no_authenticate/rule.yml
 +++ b/linux_os/guide/system/software/sudo/sudo_remove_no_authenticate/rule.yml
-@@ -39,7 +39,7 @@ references:
+@@ -38,7 +38,7 @@ references:
      stigid@ol7: OL07-00-010350
      stigid@ol8: OL08-00-010381
      stigid@rhel7: RHEL-07-010350
 -    stigid@rhel8: RHEL-08-010381
 +    stigid@almalinux8: RHEL-08-010381
-     stigid@rhel9: RHEL-09-432025
      stigid@sle12: SLES-12-010110
      stigid@sle15: SLES-15-010450
+ 
 diff --git a/linux_os/guide/system/software/sudo/sudo_remove_nopasswd/rule.yml b/linux_os/guide/system/software/sudo/sudo_remove_nopasswd/rule.yml
-index 1f1aba0f4..8fb3c5e56 100644
+index 342345a59..dfce5ae9d 100644
 --- a/linux_os/guide/system/software/sudo/sudo_remove_nopasswd/rule.yml
 +++ b/linux_os/guide/system/software/sudo/sudo_remove_nopasswd/rule.yml
-@@ -39,7 +39,7 @@ references:
+@@ -38,7 +38,7 @@ references:
      stigid@ol7: OL07-00-010340
      stigid@ol8: OL08-00-010380
      stigid@rhel7: RHEL-07-010340
 -    stigid@rhel8: RHEL-08-010380
 +    stigid@almalinux8: RHEL-08-010380
-     stigid@rhel9: RHEL-09-611085
      stigid@sle12: SLES-12-010110
      stigid@sle15: SLES-15-010450
+ 
 diff --git a/linux_os/guide/system/software/sudo/sudo_require_reauthentication/rule.yml b/linux_os/guide/system/software/sudo/sudo_require_reauthentication/rule.yml
-index b6eeb72d5..f7339aa12 100644
+index f6e67303e..fdaa75660 100644
 --- a/linux_os/guide/system/software/sudo/sudo_require_reauthentication/rule.yml
 +++ b/linux_os/guide/system/software/sudo/sudo_require_reauthentication/rule.yml
-@@ -42,7 +42,7 @@ references:
+@@ -37,7 +37,7 @@ references:
      stigid@ol7: OL07-00-010343
      stigid@ol8: OL08-00-010384
      stigid@rhel7: RHEL-07-010343
 -    stigid@rhel8: RHEL-08-010384
 +    stigid@almalinux8: RHEL-08-010384
-     stigid@rhel9: RHEL-09-432015
      stigid@sle12: SLES-12-010113
      stigid@sle15: SLES-15-020102
+ 
 diff --git a/linux_os/guide/system/software/sudo/sudo_restrict_privilege_elevation_to_authorized/rule.yml b/linux_os/guide/system/software/sudo/sudo_restrict_privilege_elevation_to_authorized/rule.yml
-index ff37f2f17..7834ac1e4 100644
+index 74cab63ec..e442a8047 100644
 --- a/linux_os/guide/system/software/sudo/sudo_restrict_privilege_elevation_to_authorized/rule.yml
 +++ b/linux_os/guide/system/software/sudo/sudo_restrict_privilege_elevation_to_authorized/rule.yml
 @@ -33,7 +33,7 @@ references:
@@ -15988,9 +16145,9 @@ index ff37f2f17..7834ac1e4 100644
      stigid@rhel7: RHEL-07-010341
 -    stigid@rhel8: RHEL-08-010382
 +    stigid@almalinux8: RHEL-08-010382
-     stigid@rhel9: RHEL-09-432030
      stigid@sle12: SLES-12-010111
      stigid@sle15: SLES-15-020101
+ 
 diff --git a/linux_os/guide/system/software/sudo/sudoers_default_includedir/rule.yml b/linux_os/guide/system/software/sudo/sudoers_default_includedir/rule.yml
 index 5b8379c35..efa3b3bb3 100644
 --- a/linux_os/guide/system/software/sudo/sudoers_default_includedir/rule.yml
@@ -16005,7 +16162,7 @@ index 5b8379c35..efa3b3bb3 100644
      stigid@sle15: SLES-15-020099
  
 diff --git a/linux_os/guide/system/software/sudo/sudoers_validate_passwd/rule.yml b/linux_os/guide/system/software/sudo/sudoers_validate_passwd/rule.yml
-index bfb4e8fe1..48797fa16 100644
+index 862c38764..f73a2b014 100644
 --- a/linux_os/guide/system/software/sudo/sudoers_validate_passwd/rule.yml
 +++ b/linux_os/guide/system/software/sudo/sudoers_validate_passwd/rule.yml
 @@ -37,7 +37,7 @@ references:
@@ -16014,9 +16171,9 @@ index bfb4e8fe1..48797fa16 100644
      stigid@rhel7: RHEL-07-010342
 -    stigid@rhel8: RHEL-08-010383
 +    stigid@almalinux8: RHEL-08-010383
-     stigid@rhel9: RHEL-09-432020
      stigid@sle12: SLES-12-010112
      stigid@sle15: SLES-15-020103
+ 
 diff --git a/linux_os/guide/system/software/sudo/sudoers_validate_passwd/tests/sudoers_d_duplicate.pass.sh b/linux_os/guide/system/software/sudo/sudoers_validate_passwd/tests/sudoers_d_duplicate.pass.sh
 index a258d108a..904d4adb0 100644
 --- a/linux_os/guide/system/software/sudo/sudoers_validate_passwd/tests/sudoers_d_duplicate.pass.sh
@@ -16183,7 +16340,7 @@ index 73dcdc0ab..c87af02dc 100644
  {{{ complete_ocil_entry_package(package="abrt-plugin-sosreport") }}}
  
 diff --git a/linux_os/guide/system/software/system-tools/package_gssproxy_removed/rule.yml b/linux_os/guide/system/software/system-tools/package_gssproxy_removed/rule.yml
-index ba437727c..284b7c32f 100644
+index 801df41d9..9038f6a82 100644
 --- a/linux_os/guide/system/software/system-tools/package_gssproxy_removed/rule.yml
 +++ b/linux_os/guide/system/software/system-tools/package_gssproxy_removed/rule.yml
 @@ -20,7 +20,7 @@ references:
@@ -16192,11 +16349,11 @@ index ba437727c..284b7c32f 100644
      stigid@ol8: OL08-00-040370
 -    stigid@rhel8: RHEL-08-040370
 +    stigid@almalinux8: RHEL-08-040370
-     stigid@rhel9: RHEL-09-215045
  
  {{{ complete_ocil_entry_package(package="gssproxy") }}}
+ 
 diff --git a/linux_os/guide/system/software/system-tools/package_iprutils_removed/rule.yml b/linux_os/guide/system/software/system-tools/package_iprutils_removed/rule.yml
-index 4000e219f..e7b817370 100644
+index 53e7a0a8b..b5d0b1594 100644
 --- a/linux_os/guide/system/software/system-tools/package_iprutils_removed/rule.yml
 +++ b/linux_os/guide/system/software/system-tools/package_iprutils_removed/rule.yml
 @@ -21,7 +21,7 @@ references:
@@ -16205,9 +16362,9 @@ index 4000e219f..e7b817370 100644
      stigid@ol8: OL08-00-040380
 -    stigid@rhel8: RHEL-08-040380
 +    stigid@almalinux8: RHEL-08-040380
-     stigid@rhel9: RHEL-09-215050
  
  {{{ complete_ocil_entry_package(package="iprutils") }}}
+ 
 diff --git a/linux_os/guide/system/software/system-tools/package_krb5-workstation_removed/rule.yml b/linux_os/guide/system/software/system-tools/package_krb5-workstation_removed/rule.yml
 index cc3d2a62c..766658456 100644
 --- a/linux_os/guide/system/software/system-tools/package_krb5-workstation_removed/rule.yml
@@ -16261,7 +16418,7 @@ index 5a020f452..a3769b969 100644
  {{{ complete_ocil_entry_package(package="python3-abrt-addon") }}}
  
 diff --git a/linux_os/guide/system/software/system-tools/package_rng-tools_installed/rule.yml b/linux_os/guide/system/software/system-tools/package_rng-tools_installed/rule.yml
-index 53b65dca1..fae286e73 100644
+index 135b6b398..4e756ea81 100644
 --- a/linux_os/guide/system/software/system-tools/package_rng-tools_installed/rule.yml
 +++ b/linux_os/guide/system/software/system-tools/package_rng-tools_installed/rule.yml
 @@ -21,7 +21,7 @@ references:
@@ -16270,11 +16427,11 @@ index 53b65dca1..fae286e73 100644
      stigid@ol8: OL08-00-010472
 -    stigid@rhel8: RHEL-08-010472
 +    stigid@almalinux8: RHEL-08-010472
-     stigid@rhel9: RHEL-09-215090
  
  ocil_clause: 'the package is not installed'
+ 
 diff --git a/linux_os/guide/system/software/system-tools/package_tuned_removed/rule.yml b/linux_os/guide/system/software/system-tools/package_tuned_removed/rule.yml
-index 76bd27a31..566a46135 100644
+index e14d516e3..cbfcb9489 100644
 --- a/linux_os/guide/system/software/system-tools/package_tuned_removed/rule.yml
 +++ b/linux_os/guide/system/software/system-tools/package_tuned_removed/rule.yml
 @@ -23,7 +23,7 @@ references:
@@ -16283,9 +16440,9 @@ index 76bd27a31..566a46135 100644
      stigid@ol8: OL08-00-040390
 -    stigid@rhel8: RHEL-08-040390
 +    stigid@almalinux8: RHEL-08-040390
-     stigid@rhel9: RHEL-09-215055
  
  {{{ complete_ocil_entry_package(package="tuned") }}}
+ 
 diff --git a/linux_os/guide/system/software/updating/clean_components_post_updating/ansible/shared.yml b/linux_os/guide/system/software/updating/clean_components_post_updating/ansible/shared.yml
 index 71b66ebab..f51a5fa0a 100644
 --- a/linux_os/guide/system/software/updating/clean_components_post_updating/ansible/shared.yml
@@ -16307,7 +16464,7 @@ index 34127fd17..e30b09600 100644
  {{% if 'sle' in product %}}
  {{{ bash_replace_or_append('/etc/zypp/zypp.conf', '^solver.upgradeRemoveDroppedPackages', 'true', '%s=%s') }}}
 diff --git a/linux_os/guide/system/software/updating/clean_components_post_updating/rule.yml b/linux_os/guide/system/software/updating/clean_components_post_updating/rule.yml
-index 79ecf5d46..37f25dbcd 100644
+index 2514c5d7f..be6fe2b28 100644
 --- a/linux_os/guide/system/software/updating/clean_components_post_updating/rule.yml
 +++ b/linux_os/guide/system/software/updating/clean_components_post_updating/rule.yml
 @@ -46,7 +46,7 @@ references:
@@ -16316,9 +16473,9 @@ index 79ecf5d46..37f25dbcd 100644
      stigid@rhel7: RHEL-07-020200
 -    stigid@rhel8: RHEL-08-010440
 +    stigid@almalinux8: RHEL-08-010440
-     stigid@rhel9: RHEL-09-214035
      stigid@sle12: SLES-12-010570
      stigid@sle15: SLES-15-010560
+     stigid@ubuntu2004: UBTU-20-010449
 diff --git a/linux_os/guide/system/software/updating/clean_components_post_updating/tests/yum_commented.fail.sh b/linux_os/guide/system/software/updating/clean_components_post_updating/tests/yum_commented.fail.sh
 index 4cba82b3c..1d8495018 100644
 --- a/linux_os/guide/system/software/updating/clean_components_post_updating/tests/yum_commented.fail.sh
@@ -16353,22 +16510,22 @@ index 8f2e4fac8..20d00061a 100644
  file={{{ pkg_manager_config_file }}}
  
 diff --git a/linux_os/guide/system/software/updating/dnf-automatic_apply_updates/ansible/shared.yml b/linux_os/guide/system/software/updating/dnf-automatic_apply_updates/ansible/shared.yml
-index 55851cc05..62557d6e2 100644
+index d74db7b2b..b44ee67b3 100644
 --- a/linux_os/guide/system/software/updating/dnf-automatic_apply_updates/ansible/shared.yml
 +++ b/linux_os/guide/system/software/updating/dnf-automatic_apply_updates/ansible/shared.yml
 @@ -1,4 +1,4 @@
--# platform = multi_platform_fedora,multi_platform_sle,Red Hat Enterprise Linux 8,Oracle Linux 8
-+# platform = multi_platform_fedora,multi_platform_sle,Red Hat Enterprise Linux 8,AlmaLinux 8,Oracle Linux 8
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_sle,Oracle Linux 8
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,Oracle Linux 8
  # reboot = false
  # strategy = unknown
  # complexity = low
 diff --git a/linux_os/guide/system/software/updating/dnf-automatic_security_updates_only/ansible/shared.yml b/linux_os/guide/system/software/updating/dnf-automatic_security_updates_only/ansible/shared.yml
-index 9d6c3eba8..4c61c3c3c 100644
+index ba0c54f3f..1890b7708 100644
 --- a/linux_os/guide/system/software/updating/dnf-automatic_security_updates_only/ansible/shared.yml
 +++ b/linux_os/guide/system/software/updating/dnf-automatic_security_updates_only/ansible/shared.yml
 @@ -1,4 +1,4 @@
--# platform = multi_platform_fedora,multi_platform_sle,Red Hat Enterprise Linux 8,Oracle Linux 8
-+# platform = multi_platform_fedora,multi_platform_sle,Red Hat Enterprise Linux 8,AlmaLinux 8,Oracle Linux 8
+-# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_sle,Oracle Linux 8
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,Oracle Linux 8
  # reboot = false
  # strategy = unknown
  # complexity = low
@@ -16513,14 +16670,12 @@ index 000000000..cbc55c2d7
 +</def-group>
 diff --git a/linux_os/guide/system/software/updating/ensure_almalinux_gpgkey_installed/rule.yml b/linux_os/guide/system/software/updating/ensure_almalinux_gpgkey_installed/rule.yml
 new file mode 100644
-index 000000000..b53e57618
+index 000000000..11cebb049
 --- /dev/null
 +++ b/linux_os/guide/system/software/updating/ensure_almalinux_gpgkey_installed/rule.yml
-@@ -0,0 +1,46 @@
+@@ -0,0 +1,44 @@
 +documentation_complete: true
 +
-+prodtype: almalinux8
-+
 +title: 'Ensure AlmaLinux GPG Key Installed'
 +
 +description: |-
@@ -16573,33 +16728,33 @@ index 2bf91c8ca..b5f520737 100644
  
  {{{ bash_replace_or_append( pkg_manager_config_file , '^gpgcheck', '1') }}}
 diff --git a/linux_os/guide/system/software/updating/ensure_gpgcheck_globally_activated/rule.yml b/linux_os/guide/system/software/updating/ensure_gpgcheck_globally_activated/rule.yml
-index c66f7a6bb..e9a9c1c17 100644
+index 7cb06aa46..2fe9bd994 100644
 --- a/linux_os/guide/system/software/updating/ensure_gpgcheck_globally_activated/rule.yml
 +++ b/linux_os/guide/system/software/updating/ensure_gpgcheck_globally_activated/rule.yml
-@@ -61,7 +61,7 @@ references:
+@@ -56,7 +56,7 @@ references:
      stigid@ol7: OL07-00-020050
      stigid@ol8: OL08-00-010370
      stigid@rhel7: RHEL-07-020050
 -    stigid@rhel8: RHEL-08-010370
 +    stigid@almalinux8: RHEL-08-010370
-     stigid@rhel9: RHEL-09-214015
      stigid@sle12: SLES-12-010550
      stigid@sle15: SLES-15-010430
+ 
 diff --git a/linux_os/guide/system/software/updating/ensure_gpgcheck_local_packages/rule.yml b/linux_os/guide/system/software/updating/ensure_gpgcheck_local_packages/rule.yml
-index 91bc53932..46b35ab1f 100644
+index 9aa0633f7..b02e1d7ed 100644
 --- a/linux_os/guide/system/software/updating/ensure_gpgcheck_local_packages/rule.yml
 +++ b/linux_os/guide/system/software/updating/ensure_gpgcheck_local_packages/rule.yml
-@@ -42,7 +42,7 @@ references:
+@@ -41,7 +41,7 @@ references:
      stigid@ol7: OL07-00-020060
      stigid@ol8: OL08-00-010371
      stigid@rhel7: RHEL-07-020060
 -    stigid@rhel8: RHEL-08-010371
 +    stigid@almalinux8: RHEL-08-010371
-     stigid@rhel9: RHEL-09-214020
  
  ocil_clause: 'there is no process to validate certificates for local packages that is approved by the organization'
+ 
 diff --git a/linux_os/guide/system/software/updating/ensure_gpgcheck_never_disabled/ansible/shared.yml b/linux_os/guide/system/software/updating/ensure_gpgcheck_never_disabled/ansible/shared.yml
-index 967e23bbb..4160832f8 100644
+index a653565f5..0e8220272 100644
 --- a/linux_os/guide/system/software/updating/ensure_gpgcheck_never_disabled/ansible/shared.yml
 +++ b/linux_os/guide/system/software/updating/ensure_gpgcheck_never_disabled/ansible/shared.yml
 @@ -1,4 +1,4 @@
@@ -16619,18 +16774,18 @@ index 07e02fa47..ee1d023d9 100644
  sed -i 's/gpgcheck\s*=.*/gpgcheck=1/g' /etc/zypp/repos.d/*
  {{% else %}}
 diff --git a/linux_os/guide/system/software/updating/ensure_gpgcheck_never_disabled/rule.yml b/linux_os/guide/system/software/updating/ensure_gpgcheck_never_disabled/rule.yml
-index de8e8ef47..fe8f9d75a 100644
+index d46746274..a3ffccf13 100644
 --- a/linux_os/guide/system/software/updating/ensure_gpgcheck_never_disabled/rule.yml
 +++ b/linux_os/guide/system/software/updating/ensure_gpgcheck_never_disabled/rule.yml
-@@ -47,7 +47,7 @@ references:
-     pcidss4: "6.3.3"
+@@ -43,7 +43,7 @@ references:
+     pcidss: Req-6.2
      srg: SRG-OS-000366-GPOS-00153
      stigid@ol8: OL08-00-010370
 -    stigid@rhel8: RHEL-08-010370
 +    stigid@almalinux8: RHEL-08-010370
-     stigid@rhel9: RHEL-09-214025
  
  ocil_clause: 'GPG checking is disabled'
+ 
 diff --git a/linux_os/guide/system/software/updating/ensure_gpgcheck_never_disabled/tests/gpgcheck_disabled.fail.sh b/linux_os/guide/system/software/updating/ensure_gpgcheck_never_disabled/tests/gpgcheck_disabled.fail.sh
 index 37e47e4d4..a852e856f 100644
 --- a/linux_os/guide/system/software/updating/ensure_gpgcheck_never_disabled/tests/gpgcheck_disabled.fail.sh
@@ -16652,30 +16807,20 @@ index 04ff6e577..b97d75469 100644
  
  sed -i 's/gpgcheck\s*=.*/gpgcheck=1/g' /etc/yum.repos.d/*
 diff --git a/linux_os/guide/system/software/updating/ensure_redhat_gpgkey_installed/rule.yml b/linux_os/guide/system/software/updating/ensure_redhat_gpgkey_installed/rule.yml
-index 9ba251904..bc7c8889c 100644
+index c30929636..3502e227f 100644
 --- a/linux_os/guide/system/software/updating/ensure_redhat_gpgkey_installed/rule.yml
 +++ b/linux_os/guide/system/software/updating/ensure_redhat_gpgkey_installed/rule.yml
-@@ -59,7 +59,7 @@ references:
-     pcidss4: '6.3.3'
+@@ -54,7 +54,7 @@ references:
+     pcidss: Req-6.2
      srg: SRG-OS-000366-GPOS-00153
      stigid@rhel7: RHEL-07-010019
 -    stigid@rhel8: RHEL-08-010019
 +    stigid@almalinux8: RHEL-08-010019
-     stigid@rhel9: RHEL-09-214010
  
  ocil_clause: 'the Red Hat GPG Key is not installed'
-diff --git a/linux_os/guide/system/software/updating/security_patches_up_to_date/bash/shared.sh b/linux_os/guide/system/software/updating/security_patches_up_to_date/bash/shared.sh
-index fd844d2a1..2932351f4 100644
---- a/linux_os/guide/system/software/updating/security_patches_up_to_date/bash/shared.sh
-+++ b/linux_os/guide/system/software/updating/security_patches_up_to_date/bash/shared.sh
-@@ -1,4 +1,4 @@
--# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_sle
-+# platform = Red Hat Virtualization 4,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
- # reboot = true
- # strategy = patch
- # complexity = low
+ 
 diff --git a/linux_os/guide/system/software/updating/security_patches_up_to_date/rule.yml b/linux_os/guide/system/software/updating/security_patches_up_to_date/rule.yml
-index dac777824..c4afe149f 100644
+index fed8d1e7e..c685f2237 100644
 --- a/linux_os/guide/system/software/updating/security_patches_up_to_date/rule.yml
 +++ b/linux_os/guide/system/software/updating/security_patches_up_to_date/rule.yml
 @@ -4,7 +4,7 @@ documentation_complete: true
@@ -16699,21 +16844,21 @@ index dac777824..c4afe149f 100644
  {{% elif product in ["sle12", "sle15"] %}}
      If the system is configured for online updates, invoking the following command will list available
      security updates:
-@@ -66,7 +71,7 @@ references:
+@@ -61,7 +66,7 @@ references:
      stigid@ol7: OL07-00-020260
      stigid@ol8: OL08-00-010010
      stigid@rhel7: RHEL-07-020260
 -    stigid@rhel8: RHEL-08-010010
 +    stigid@almalinux8: RHEL-08-010010
-     stigid@rhel9: RHEL-09-211015
      stigid@sle12: SLES-12-010010
      stigid@sle15: SLES-15-010010
+ 
 diff --git a/products/almalinux8/CMakeLists.txt b/products/almalinux8/CMakeLists.txt
 new file mode 100644
-index 000000000..511fdc1c4
+index 000000000..3dea77152
 --- /dev/null
 +++ b/products/almalinux8/CMakeLists.txt
-@@ -0,0 +1,33 @@
+@@ -0,0 +1,29 @@
 +# Sometimes our users will try to do: "cd almalinux8; cmake ." That needs to error in a nice way.
 +if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 +    message(FATAL_ERROR "cmake has to be used on the root CMakeLists.txt, see the Building ComplianceAsCode section in the Developer Guide!")
@@ -16743,16 +16888,12 @@ index 000000000..511fdc1c4
 +ssg_build_html_stig_tables_per_profile(${PRODUCT} "stig_gui")
 +
 +#ssg_build_html_stig_tables(${PRODUCT} "ospp")
-+
-+if(SSG_CENTOS_DERIVATIVES_ENABLED)
-+    ssg_build_derivative_product(${PRODUCT} "centos" "centos8")
-+endif()
 diff --git a/products/almalinux8/kickstart/ssg-almalinux8-anssi_bp28_enhanced-ks.cfg b/products/almalinux8/kickstart/ssg-almalinux8-anssi_bp28_enhanced-ks.cfg
 new file mode 100644
-index 000000000..ff05b3d8a
+index 000000000..15fb35079
 --- /dev/null
 +++ b/products/almalinux8/kickstart/ssg-almalinux8-anssi_bp28_enhanced-ks.cfg
-@@ -0,0 +1,154 @@
+@@ -0,0 +1,144 @@
 +# SCAP Security Guide ANSSI BP-028 (enhanced) profile kickstart for AlmaLinux 8
 +# Version: 0.0.1
 +# Date: 2021-01-28
@@ -16760,6 +16901,8 @@ index 000000000..ff05b3d8a
 +# Based on:
 +# https://pykickstart.readthedocs.io/en/latest/
 +# http://usgcb.nist.gov/usgcb/content/configuration/workstation-ks.cfg
++# For more information see the following documentation:
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/security_hardening/scanning-the-system-for-configuration-compliance-and-vulnerabilities_security-hardening#deploying-baseline-compliant-rhel-systems-using-kickstart_deploying-systems-that-are-compliant-with-a-security-profile-immediately-after-an-installation
 +
 +# Specify installation method to use for installation
 +# To use a different one comment out the 'url' one below, update
@@ -16881,20 +17024,8 @@ index 000000000..ff05b3d8a
 +#   pairs in the body of the %addon definition instead. These pairs are whitespace-agnostic.
 +#   Values can be optionally enclosed in single quotes (') or double quotes (").
 +#   
-+#  The following keys are recognized by the add-on:
-+#    content-type - Type of the security content. Possible values are datastream, archive, rpm, and scap-security-guide.
-+#      - If the content-type is scap-security-guide, the add-on will use content provided by the
-+#        scap-security-guide package, which is present on the boot media. This means that all other keys except profile will have no effect.
-+#    content-url - Location of the security content. The content must be accessible using HTTP, HTTPS, or FTP; local storage is currently not supported. A network connection must be available to reach content definitions in a remote location.
-+#    datastream-id - ID of the data stream referenced in the content-url value. Used only if content-type is datastream.
-+#    xccdf-id - ID of the benchmark you want to use.
-+#    xccdf-path - Path to the XCCDF file which should be used; given as a relative path in the archive.
-+#    profile - ID of the profile to be applied. Use default to apply the default profile.
-+#    fingerprint - A MD5, SHA1 or SHA2 checksum of the content referenced by content-url.
-+#    tailoring-path - Path to a tailoring file which should be used, given as a relative path in the archive.
-+#
-+#  The following is an example %addon org_fedora_oscap section which uses content from the
-+#  scap-security-guide on the installation media: 
++# For more details and configuration options see
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/performing_an_advanced_rhel_8_installation/kickstart-commands-and-options-reference_installing-rhel-as-an-experienced-user#addon-org_fedora_oscap_kickstart-commands-for-addons-supplied-with-the-rhel-installation-program
 +%addon org_fedora_oscap
 +	content-type = scap-security-guide
 +	profile = xccdf_org.ssgproject.content_profile_anssi_bp28_enhanced
@@ -16909,10 +17040,10 @@ index 000000000..ff05b3d8a
 +reboot --eject
 diff --git a/products/almalinux8/kickstart/ssg-almalinux8-anssi_bp28_high-ks.cfg b/products/almalinux8/kickstart/ssg-almalinux8-anssi_bp28_high-ks.cfg
 new file mode 100644
-index 000000000..ec2175fef
+index 000000000..5fba1c1b5
 --- /dev/null
 +++ b/products/almalinux8/kickstart/ssg-almalinux8-anssi_bp28_high-ks.cfg
-@@ -0,0 +1,158 @@
+@@ -0,0 +1,149 @@
 +# SCAP Security Guide ANSSI BP-028 (high) profile kickstart for AlmaLinux 8
 +# Version: 0.0.1
 +# Date: 2020-12-10
@@ -16920,6 +17051,8 @@ index 000000000..ec2175fef
 +# Based on:
 +# https://pykickstart.readthedocs.io/en/latest/
 +# http://usgcb.nist.gov/usgcb/content/configuration/workstation-ks.cfg
++# For more information see the following documentation:
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/security_hardening/scanning-the-system-for-configuration-compliance-and-vulnerabilities_security-hardening#deploying-baseline-compliant-rhel-systems-using-kickstart_deploying-systems-that-are-compliant-with-a-security-profile-immediately-after-an-installation
 +
 +# Specify installation method to use for installation
 +# To use a different one comment out the 'url' one below, update
@@ -17032,6 +17165,7 @@ index 000000000..ec2175fef
 +logvol /var/log/audit --fstype=xfs --name=varlogaudit --vgname=VolGroup --size=512 --fsoptions="nodev,nosuid,noexec"
 +logvol swap --name=swap --vgname=VolGroup --size=2016
 +
++
 +# The OpenSCAP installer add-on is used to apply SCAP (Security Content Automation Protocol)
 +# content - security policies - on the installed system.This add-on has been enabled by default
 +# since Red Hat Enterprise Linux 7.2. When enabled, the packages necessary to provide this 
@@ -17045,20 +17179,8 @@ index 000000000..ec2175fef
 +#   pairs in the body of the %addon definition instead. These pairs are whitespace-agnostic.
 +#   Values can be optionally enclosed in single quotes (') or double quotes (").
 +#   
-+#  The following keys are recognized by the add-on:
-+#    content-type - Type of the security content. Possible values are datastream, archive, rpm, and scap-security-guide.
-+#      - If the content-type is scap-security-guide, the add-on will use content provided by the
-+#        scap-security-guide package, which is present on the boot media. This means that all other keys except profile will have no effect.
-+#    content-url - Location of the security content. The content must be accessible using HTTP, HTTPS, or FTP; local storage is currently not supported. A network connection must be available to reach content definitions in a remote location.
-+#    datastream-id - ID of the data stream referenced in the content-url value. Used only if content-type is datastream.
-+#    xccdf-id - ID of the benchmark you want to use.
-+#    xccdf-path - Path to the XCCDF file which should be used; given as a relative path in the archive.
-+#    profile - ID of the profile to be applied. Use default to apply the default profile.
-+#    fingerprint - A MD5, SHA1 or SHA2 checksum of the content referenced by content-url.
-+#    tailoring-path - Path to a tailoring file which should be used, given as a relative path in the archive.
-+#
-+#  The following is an example %addon org_fedora_oscap section which uses content from the
-+#  scap-security-guide on the installation media: 
++# For more details and configuration options see
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/performing_an_advanced_rhel_8_installation/kickstart-commands-and-options-reference_installing-rhel-as-an-experienced-user#addon-org_fedora_oscap_kickstart-commands-for-addons-supplied-with-the-rhel-installation-program
 +%addon org_fedora_oscap
 +	content-type = scap-security-guide
 +	profile = xccdf_org.ssgproject.content_profile_anssi_bp28_high
@@ -17073,10 +17195,10 @@ index 000000000..ec2175fef
 +reboot --eject
 diff --git a/products/almalinux8/kickstart/ssg-almalinux8-anssi_bp28_intermediary-ks.cfg b/products/almalinux8/kickstart/ssg-almalinux8-anssi_bp28_intermediary-ks.cfg
 new file mode 100644
-index 000000000..52c9bb262
+index 000000000..6091d8dc6
 --- /dev/null
 +++ b/products/almalinux8/kickstart/ssg-almalinux8-anssi_bp28_intermediary-ks.cfg
-@@ -0,0 +1,154 @@
+@@ -0,0 +1,145 @@
 +# SCAP Security Guide ANSSI BP-028 (intermediary) profile kickstart for AlmaLinux 8
 +# Version: 0.0.1
 +# Date: 2021-01-28
@@ -17084,6 +17206,9 @@ index 000000000..52c9bb262
 +# Based on:
 +# https://pykickstart.readthedocs.io/en/latest/
 +# http://usgcb.nist.gov/usgcb/content/configuration/workstation-ks.cfg
++# For more information see the following documentation:
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/security_hardening/scanning-the-system-for-configuration-compliance-and-vulnerabilities_security-hardening#deploying-baseline-compliant-rhel-systems-using-kickstart_deploying-systems-that-are-compliant-with-a-security-profile-immediately-after-an-installation
++
 +
 +# Specify installation method to use for installation
 +# To use a different one comment out the 'url' one below, update
@@ -17205,20 +17330,8 @@ index 000000000..52c9bb262
 +#   pairs in the body of the %addon definition instead. These pairs are whitespace-agnostic.
 +#   Values can be optionally enclosed in single quotes (') or double quotes (").
 +#   
-+#  The following keys are recognized by the add-on:
-+#    content-type - Type of the security content. Possible values are datastream, archive, rpm, and scap-security-guide.
-+#      - If the content-type is scap-security-guide, the add-on will use content provided by the
-+#        scap-security-guide package, which is present on the boot media. This means that all other keys except profile will have no effect.
-+#    content-url - Location of the security content. The content must be accessible using HTTP, HTTPS, or FTP; local storage is currently not supported. A network connection must be available to reach content definitions in a remote location.
-+#    datastream-id - ID of the data stream referenced in the content-url value. Used only if content-type is datastream.
-+#    xccdf-id - ID of the benchmark you want to use.
-+#    xccdf-path - Path to the XCCDF file which should be used; given as a relative path in the archive.
-+#    profile - ID of the profile to be applied. Use default to apply the default profile.
-+#    fingerprint - A MD5, SHA1 or SHA2 checksum of the content referenced by content-url.
-+#    tailoring-path - Path to a tailoring file which should be used, given as a relative path in the archive.
-+#
-+#  The following is an example %addon org_fedora_oscap section which uses content from the
-+#  scap-security-guide on the installation media: 
++# For more details and configuration options see
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/performing_an_advanced_rhel_8_installation/kickstart-commands-and-options-reference_installing-rhel-as-an-experienced-user#addon-org_fedora_oscap_kickstart-commands-for-addons-supplied-with-the-rhel-installation-program
 +%addon org_fedora_oscap
 +	content-type = scap-security-guide
 +	profile = xccdf_org.ssgproject.content_profile_anssi_bp28_intermediary
@@ -17233,10 +17346,10 @@ index 000000000..52c9bb262
 +reboot --eject
 diff --git a/products/almalinux8/kickstart/ssg-almalinux8-anssi_bp28_minimal-ks.cfg b/products/almalinux8/kickstart/ssg-almalinux8-anssi_bp28_minimal-ks.cfg
 new file mode 100644
-index 000000000..4659ce9f3
+index 000000000..d71690cfe
 --- /dev/null
 +++ b/products/almalinux8/kickstart/ssg-almalinux8-anssi_bp28_minimal-ks.cfg
-@@ -0,0 +1,118 @@
+@@ -0,0 +1,108 @@
 +# SCAP Security Guide ANSSI BP-028 (minimal) profile kickstart for AlmaLinux 8
 +# Version: 0.0.1
 +# Date: 2021-01-28
@@ -17244,6 +17357,8 @@ index 000000000..4659ce9f3
 +# Based on:
 +# https://pykickstart.readthedocs.io/en/latest/
 +# http://usgcb.nist.gov/usgcb/content/configuration/workstation-ks.cfg
++# For more information see the following documentation:
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/security_hardening/scanning-the-system-for-configuration-compliance-and-vulnerabilities_security-hardening#deploying-baseline-compliant-rhel-systems-using-kickstart_deploying-systems-that-are-compliant-with-a-security-profile-immediately-after-an-installation
 +
 +# Specify installation method to use for installation
 +# To use a different one comment out the 'url' one below, update
@@ -17329,20 +17444,8 @@ index 000000000..4659ce9f3
 +#   pairs in the body of the %addon definition instead. These pairs are whitespace-agnostic.
 +#   Values can be optionally enclosed in single quotes (') or double quotes (").
 +#   
-+#  The following keys are recognized by the add-on:
-+#    content-type - Type of the security content. Possible values are datastream, archive, rpm, and scap-security-guide.
-+#      - If the content-type is scap-security-guide, the add-on will use content provided by the
-+#        scap-security-guide package, which is present on the boot media. This means that all other keys except profile will have no effect.
-+#    content-url - Location of the security content. The content must be accessible using HTTP, HTTPS, or FTP; local storage is currently not supported. A network connection must be available to reach content definitions in a remote location.
-+#    datastream-id - ID of the data stream referenced in the content-url value. Used only if content-type is datastream.
-+#    xccdf-id - ID of the benchmark you want to use.
-+#    xccdf-path - Path to the XCCDF file which should be used; given as a relative path in the archive.
-+#    profile - ID of the profile to be applied. Use default to apply the default profile.
-+#    fingerprint - A MD5, SHA1 or SHA2 checksum of the content referenced by content-url.
-+#    tailoring-path - Path to a tailoring file which should be used, given as a relative path in the archive.
-+#
-+#  The following is an example %addon org_fedora_oscap section which uses content from the
-+#  scap-security-guide on the installation media: 
++# For more details and configuration options see
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/performing_an_advanced_rhel_8_installation/kickstart-commands-and-options-reference_installing-rhel-as-an-experienced-user#addon-org_fedora_oscap_kickstart-commands-for-addons-supplied-with-the-rhel-installation-program
 +%addon org_fedora_oscap
 +	content-type = scap-security-guide
 +	profile = xccdf_org.ssgproject.content_profile_anssi_bp28_minimal
@@ -17357,17 +17460,18 @@ index 000000000..4659ce9f3
 +reboot --eject
 diff --git a/products/almalinux8/kickstart/ssg-almalinux8-cis-ks.cfg b/products/almalinux8/kickstart/ssg-almalinux8-cis-ks.cfg
 new file mode 100644
-index 000000000..4b702ec5a
+index 000000000..302e05c0b
 --- /dev/null
 +++ b/products/almalinux8/kickstart/ssg-almalinux8-cis-ks.cfg
-@@ -0,0 +1,128 @@
+@@ -0,0 +1,141 @@
 +# SCAP Security Guide CIS profile (Level 2 - Server) kickstart for AlmaLinux 8
 +# Version: 0.0.1
 +# Date: 2021-08-12
 +#
 +# Based on:
 +# https://pykickstart.readthedocs.io/en/latest/
-+# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/performing_an_advanced_rhel_installation/index#performing_an_automated_installation_using_kickstart
++# For more information see the following documentation:
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/security_hardening/scanning-the-system-for-configuration-compliance-and-vulnerabilities_security-hardening#deploying-baseline-compliant-rhel-systems-using-kickstart_deploying-systems-that-are-compliant-with-a-security-profile-immediately-after-an-installation
 +
 +# Specify installation method to use for installation
 +# To use a different one comment out the 'url' one below, update
@@ -17474,9 +17578,21 @@ index 000000000..4b702ec5a
 +logvol swap --name=swap --vgname=VolGroup --size=2016
 +
 +
-+# Harden installation with CIS profile
++# The OpenSCAP installer add-on is used to apply SCAP (Security Content Automation Protocol)
++# content - security policies - on the installed system.This add-on has been enabled by default
++# since Red Hat Enterprise Linux 7.2. When enabled, the packages necessary to provide this 
++# functionality will automatically be installed. However, by default, no policies are enforced,
++# meaning that no checks are performed during or after installation unless specifically configured.
++#  
++#  Important
++#   Applying a security policy is not necessary on all systems. This screen should only be used
++#   when a specific policy is mandated by your organization rules or government regulations.
++#   Unlike most other commands, this add-on does not accept regular options, but uses key-value
++#   pairs in the body of the %addon definition instead. These pairs are whitespace-agnostic.
++#   Values can be optionally enclosed in single quotes (') or double quotes (").
++#   
 +# For more details and configuration options see
-+# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/performing_an_advanced_rhel_installation/index#addon-org_fedora_oscap_kickstart-commands-for-addons-supplied-with-the-rhel-installation-program
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/performing_an_advanced_rhel_8_installation/kickstart-commands-and-options-reference_installing-rhel-as-an-experienced-user#addon-org_fedora_oscap_kickstart-commands-for-addons-supplied-with-the-rhel-installation-program
 +%addon org_fedora_oscap
 +        content-type = scap-security-guide
 +        profile = xccdf_org.ssgproject.content_profile_cis
@@ -17491,17 +17607,18 @@ index 000000000..4b702ec5a
 +reboot --eject
 diff --git a/products/almalinux8/kickstart/ssg-almalinux8-cis_server_l1-ks.cfg b/products/almalinux8/kickstart/ssg-almalinux8-cis_server_l1-ks.cfg
 new file mode 100644
-index 000000000..16287a134
+index 000000000..f9b7ad73c
 --- /dev/null
 +++ b/products/almalinux8/kickstart/ssg-almalinux8-cis_server_l1-ks.cfg
-@@ -0,0 +1,128 @@
+@@ -0,0 +1,141 @@
 +# SCAP Security Guide CIS profile (Level 1 - Server) kickstart for AlmaLinux 8
 +# Version: 0.0.1
 +# Date: 2021-08-12
 +#
 +# Based on:
 +# https://pykickstart.readthedocs.io/en/latest/
-+# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/performing_an_advanced_rhel_installation/index#performing_an_automated_installation_using_kickstart
++# For more information see the following documentation:
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/security_hardening/scanning-the-system-for-configuration-compliance-and-vulnerabilities_security-hardening#deploying-baseline-compliant-rhel-systems-using-kickstart_deploying-systems-that-are-compliant-with-a-security-profile-immediately-after-an-installation
 +
 +# Specify installation method to use for installation
 +# To use a different one comment out the 'url' one below, update
@@ -17608,9 +17725,21 @@ index 000000000..16287a134
 +logvol swap --name=swap --vgname=VolGroup --size=2016
 +
 +
-+# Harden installation with CIS profile
++# The OpenSCAP installer add-on is used to apply SCAP (Security Content Automation Protocol)
++# content - security policies - on the installed system.This add-on has been enabled by default
++# since Red Hat Enterprise Linux 7.2. When enabled, the packages necessary to provide this 
++# functionality will automatically be installed. However, by default, no policies are enforced,
++# meaning that no checks are performed during or after installation unless specifically configured.
++#  
++#  Important
++#   Applying a security policy is not necessary on all systems. This screen should only be used
++#   when a specific policy is mandated by your organization rules or government regulations.
++#   Unlike most other commands, this add-on does not accept regular options, but uses key-value
++#   pairs in the body of the %addon definition instead. These pairs are whitespace-agnostic.
++#   Values can be optionally enclosed in single quotes (') or double quotes (").
++#   
 +# For more details and configuration options see
-+# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/performing_an_advanced_rhel_installation/index#addon-org_fedora_oscap_kickstart-commands-for-addons-supplied-with-the-rhel-installation-program
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/performing_an_advanced_rhel_8_installation/kickstart-commands-and-options-reference_installing-rhel-as-an-experienced-user#addon-org_fedora_oscap_kickstart-commands-for-addons-supplied-with-the-rhel-installation-program
 +%addon org_fedora_oscap
 +        content-type = scap-security-guide
 +        profile = xccdf_org.ssgproject.content_profile_cis_server_l1
@@ -17625,17 +17754,18 @@ index 000000000..16287a134
 +reboot --eject
 diff --git a/products/almalinux8/kickstart/ssg-almalinux8-cis_workstation_l1-ks.cfg b/products/almalinux8/kickstart/ssg-almalinux8-cis_workstation_l1-ks.cfg
 new file mode 100644
-index 000000000..0ee9ca23a
+index 000000000..4527fae73
 --- /dev/null
 +++ b/products/almalinux8/kickstart/ssg-almalinux8-cis_workstation_l1-ks.cfg
-@@ -0,0 +1,128 @@
+@@ -0,0 +1,141 @@
 +# SCAP Security Guide CIS profile (Level 1 - Workstation) kickstart for AlmaLinux 8
 +# Version: 0.0.1
 +# Date: 2021-08-12
 +#
 +# Based on:
 +# https://pykickstart.readthedocs.io/en/latest/
-+# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/performing_an_advanced_rhel_installation/index#performing_an_automated_installation_using_kickstart
++# For more information see the following documentation:
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/security_hardening/scanning-the-system-for-configuration-compliance-and-vulnerabilities_security-hardening#deploying-baseline-compliant-rhel-systems-using-kickstart_deploying-systems-that-are-compliant-with-a-security-profile-immediately-after-an-installation
 +
 +# Specify installation method to use for installation
 +# To use a different one comment out the 'url' one below, update
@@ -17742,9 +17872,21 @@ index 000000000..0ee9ca23a
 +logvol swap --name=swap --vgname=VolGroup --size=2016
 +
 +
-+# Harden installation with CIS profile
++# The OpenSCAP installer add-on is used to apply SCAP (Security Content Automation Protocol)
++# content - security policies - on the installed system.This add-on has been enabled by default
++# since Red Hat Enterprise Linux 7.2. When enabled, the packages necessary to provide this 
++# functionality will automatically be installed. However, by default, no policies are enforced,
++# meaning that no checks are performed during or after installation unless specifically configured.
++#  
++#  Important
++#   Applying a security policy is not necessary on all systems. This screen should only be used
++#   when a specific policy is mandated by your organization rules or government regulations.
++#   Unlike most other commands, this add-on does not accept regular options, but uses key-value
++#   pairs in the body of the %addon definition instead. These pairs are whitespace-agnostic.
++#   Values can be optionally enclosed in single quotes (') or double quotes (").
++#   
 +# For more details and configuration options see
-+# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/performing_an_advanced_rhel_installation/index#addon-org_fedora_oscap_kickstart-commands-for-addons-supplied-with-the-rhel-installation-program
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/performing_an_advanced_rhel_8_installation/kickstart-commands-and-options-reference_installing-rhel-as-an-experienced-user#addon-org_fedora_oscap_kickstart-commands-for-addons-supplied-with-the-rhel-installation-program
 +%addon org_fedora_oscap
 +        content-type = scap-security-guide
 +        profile = xccdf_org.ssgproject.content_profile_cis_workstation_l1
@@ -17759,17 +17901,18 @@ index 000000000..0ee9ca23a
 +reboot --eject
 diff --git a/products/almalinux8/kickstart/ssg-almalinux8-cis_workstation_l2-ks.cfg b/products/almalinux8/kickstart/ssg-almalinux8-cis_workstation_l2-ks.cfg
 new file mode 100644
-index 000000000..d5286da91
+index 000000000..9d2e50709
 --- /dev/null
 +++ b/products/almalinux8/kickstart/ssg-almalinux8-cis_workstation_l2-ks.cfg
-@@ -0,0 +1,128 @@
+@@ -0,0 +1,141 @@
 +# SCAP Security Guide CIS profile (Level 2 - Workstation) kickstart for AlmaLinux 8
 +# Version: 0.0.1
 +# Date: 2021-08-12
 +#
 +# Based on:
 +# https://pykickstart.readthedocs.io/en/latest/
-+# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/performing_an_advanced_rhel_installation/index#performing_an_automated_installation_using_kickstart
++# For more information see the following documentation:
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/security_hardening/scanning-the-system-for-configuration-compliance-and-vulnerabilities_security-hardening#deploying-baseline-compliant-rhel-systems-using-kickstart_deploying-systems-that-are-compliant-with-a-security-profile-immediately-after-an-installation
 +
 +# Specify installation method to use for installation
 +# To use a different one comment out the 'url' one below, update
@@ -17876,9 +18019,21 @@ index 000000000..d5286da91
 +logvol swap --name=swap --vgname=VolGroup --size=2016
 +
 +
-+# Harden installation with CIS profile
++# The OpenSCAP installer add-on is used to apply SCAP (Security Content Automation Protocol)
++# content - security policies - on the installed system.This add-on has been enabled by default
++# since Red Hat Enterprise Linux 7.2. When enabled, the packages necessary to provide this 
++# functionality will automatically be installed. However, by default, no policies are enforced,
++# meaning that no checks are performed during or after installation unless specifically configured.
++#  
++#  Important
++#   Applying a security policy is not necessary on all systems. This screen should only be used
++#   when a specific policy is mandated by your organization rules or government regulations.
++#   Unlike most other commands, this add-on does not accept regular options, but uses key-value
++#   pairs in the body of the %addon definition instead. These pairs are whitespace-agnostic.
++#   Values can be optionally enclosed in single quotes (') or double quotes (").
++#   
 +# For more details and configuration options see
-+# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/performing_an_advanced_rhel_installation/index#addon-org_fedora_oscap_kickstart-commands-for-addons-supplied-with-the-rhel-installation-program
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/performing_an_advanced_rhel_8_installation/kickstart-commands-and-options-reference_installing-rhel-as-an-experienced-user#addon-org_fedora_oscap_kickstart-commands-for-addons-supplied-with-the-rhel-installation-program
 +%addon org_fedora_oscap
 +        content-type = scap-security-guide
 +        profile = xccdf_org.ssgproject.content_profile_cis_workstation_l2
@@ -17893,15 +18048,17 @@ index 000000000..d5286da91
 +reboot --eject
 diff --git a/products/almalinux8/kickstart/ssg-almalinux8-cui-ks.cfg b/products/almalinux8/kickstart/ssg-almalinux8-cui-ks.cfg
 new file mode 100644
-index 000000000..e1237a0b2
+index 000000000..e25cd22b4
 --- /dev/null
 +++ b/products/almalinux8/kickstart/ssg-almalinux8-cui-ks.cfg
-@@ -0,0 +1,149 @@
+@@ -0,0 +1,139 @@
 +# SCAP Security Guide CUI profile kickstart for AlmaLinux 8
 +#
 +# Based on:
 +# https://pykickstart.readthedocs.io/en/latest/
 +# http://usgcb.nist.gov/usgcb/content/configuration/workstation-ks.cfg
++# For more information see the following documentation:
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/security_hardening/scanning-the-system-for-configuration-compliance-and-vulnerabilities_security-hardening#deploying-baseline-compliant-rhel-systems-using-kickstart_deploying-systems-that-are-compliant-with-a-security-profile-immediately-after-an-installation
 +
 +# Specify installation method to use for installation
 +# To use a different one comment out the 'url' one below, update
@@ -18020,20 +18177,8 @@ index 000000000..e1237a0b2
 +#   pairs in the body of the %addon definition instead. These pairs are whitespace-agnostic.
 +#   Values can be optionally enclosed in single quotes (') or double quotes (").
 +#   
-+#  The following keys are recognized by the add-on:
-+#    content-type - Type of the security content. Possible values are datastream, archive, rpm, and scap-security-guide.
-+#      - If the content-type is scap-security-guide, the add-on will use content provided by the
-+#        scap-security-guide package, which is present on the boot media. This means that all other keys except profile will have no effect.
-+#    content-url - Location of the security content. The content must be accessible using HTTP, HTTPS, or FTP; local storage is currently not supported. A network connection must be available to reach content definitions in a remote location.
-+#    datastream-id - ID of the data stream referenced in the content-url value. Used only if content-type is datastream.
-+#    xccdf-id - ID of the benchmark you want to use.
-+#    xccdf-path - Path to the XCCDF file which should be used; given as a relative path in the archive.
-+#    profile - ID of the profile to be applied. Use default to apply the default profile.
-+#    fingerprint - A MD5, SHA1 or SHA2 checksum of the content referenced by content-url.
-+#    tailoring-path - Path to a tailoring file which should be used, given as a relative path in the archive.
-+#
-+#  The following is an example %addon org_fedora_oscap section which uses content from the
-+#  scap-security-guide on the installation media: 
++# For more details and configuration options see
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/performing_an_advanced_rhel_8_installation/kickstart-commands-and-options-reference_installing-rhel-as-an-experienced-user#addon-org_fedora_oscap_kickstart-commands-for-addons-supplied-with-the-rhel-installation-program
 +%addon org_fedora_oscap
 +	content-type = scap-security-guide
 +	profile = xccdf_org.ssgproject.content_profile_cui
@@ -18048,17 +18193,18 @@ index 000000000..e1237a0b2
 +reboot --eject
 diff --git a/products/almalinux8/kickstart/ssg-almalinux8-e8-ks.cfg b/products/almalinux8/kickstart/ssg-almalinux8-e8-ks.cfg
 new file mode 100644
-index 000000000..644f4613b
+index 000000000..754e3d6f7
 --- /dev/null
 +++ b/products/almalinux8/kickstart/ssg-almalinux8-e8-ks.cfg
-@@ -0,0 +1,107 @@
+@@ -0,0 +1,120 @@
 +# SCAP Security Guide Essential Eight profile kickstart for AlmaLinux 8
 +# Version: 0.0.1
 +# Date: 2019-11-13
 +#
 +# Based on:
 +# https://pykickstart.readthedocs.io/en/latest/
-+# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/performing_an_advanced_rhel_installation/index#performing_an_automated_installation_using_kickstart
++# For more information see the following documentation:
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/security_hardening/scanning-the-system-for-configuration-compliance-and-vulnerabilities_security-hardening#deploying-baseline-compliant-rhel-systems-using-kickstart_deploying-systems-that-are-compliant-with-a-security-profile-immediately-after-an-installation
 +
 +# Specify installation method to use for installation
 +# To use a different one comment out the 'url' one below, update
@@ -18144,9 +18290,21 @@ index 000000000..644f4613b
 +# Create primary system partitions (required for installs)
 +autopart
 +
-+# Harden installation with Essential Eight profile
++# The OpenSCAP installer add-on is used to apply SCAP (Security Content Automation Protocol)
++# content - security policies - on the installed system.This add-on has been enabled by default
++# since Red Hat Enterprise Linux 7.2. When enabled, the packages necessary to provide this 
++# functionality will automatically be installed. However, by default, no policies are enforced,
++# meaning that no checks are performed during or after installation unless specifically configured.
++#  
++#  Important
++#   Applying a security policy is not necessary on all systems. This screen should only be used
++#   when a specific policy is mandated by your organization rules or government regulations.
++#   Unlike most other commands, this add-on does not accept regular options, but uses key-value
++#   pairs in the body of the %addon definition instead. These pairs are whitespace-agnostic.
++#   Values can be optionally enclosed in single quotes (') or double quotes (").
++#   
 +# For more details and configuration options see
-+# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/performing_an_advanced_rhel_installation/index#addon-org_fedora_oscap_kickstart-commands-for-addons-supplied-with-the-rhel-installation-program
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/performing_an_advanced_rhel_8_installation/kickstart-commands-and-options-reference_installing-rhel-as-an-experienced-user#addon-org_fedora_oscap_kickstart-commands-for-addons-supplied-with-the-rhel-installation-program
 +%addon org_fedora_oscap
 +        content-type = scap-security-guide
 +        profile = xccdf_org.ssgproject.content_profile_e8
@@ -18161,17 +18319,18 @@ index 000000000..644f4613b
 +reboot --eject
 diff --git a/products/almalinux8/kickstart/ssg-almalinux8-hipaa-ks.cfg b/products/almalinux8/kickstart/ssg-almalinux8-hipaa-ks.cfg
 new file mode 100644
-index 000000000..ff867ee54
+index 000000000..561f0aab9
 --- /dev/null
 +++ b/products/almalinux8/kickstart/ssg-almalinux8-hipaa-ks.cfg
-@@ -0,0 +1,107 @@
+@@ -0,0 +1,120 @@
 +# SCAP Security Guide HIPAA profile kickstart for AlmaLinux 8
 +# Version: 0.0.1
 +# Date: 2020-05-25
 +#
 +# Based on:
 +# https://pykickstart.readthedocs.io/en/latest/
-+# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/performing_an_advanced_rhel_installation/index#performing_an_automated_installation_using_kickstart
++# For more information see the following documentation:
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/security_hardening/scanning-the-system-for-configuration-compliance-and-vulnerabilities_security-hardening#deploying-baseline-compliant-rhel-systems-using-kickstart_deploying-systems-that-are-compliant-with-a-security-profile-immediately-after-an-installation
 +
 +# Specify installation method to use for installation
 +# To use a different one comment out the 'url' one below, update
@@ -18257,9 +18416,21 @@ index 000000000..ff867ee54
 +# Create primary system partitions (required for installs)
 +autopart
 +
-+# Harden installation with HIPAA profile
++# The OpenSCAP installer add-on is used to apply SCAP (Security Content Automation Protocol)
++# content - security policies - on the installed system.This add-on has been enabled by default
++# since Red Hat Enterprise Linux 7.2. When enabled, the packages necessary to provide this 
++# functionality will automatically be installed. However, by default, no policies are enforced,
++# meaning that no checks are performed during or after installation unless specifically configured.
++#  
++#  Important
++#   Applying a security policy is not necessary on all systems. This screen should only be used
++#   when a specific policy is mandated by your organization rules or government regulations.
++#   Unlike most other commands, this add-on does not accept regular options, but uses key-value
++#   pairs in the body of the %addon definition instead. These pairs are whitespace-agnostic.
++#   Values can be optionally enclosed in single quotes (') or double quotes (").
++#   
 +# For more details and configuration options see
-+# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/performing_an_advanced_rhel_installation/index#addon-org_fedora_oscap_kickstart-commands-for-addons-supplied-with-the-rhel-installation-program
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/performing_an_advanced_rhel_8_installation/kickstart-commands-and-options-reference_installing-rhel-as-an-experienced-user#addon-org_fedora_oscap_kickstart-commands-for-addons-supplied-with-the-rhel-installation-program
 +%addon org_fedora_oscap
 +        content-type = scap-security-guide
 +        profile = xccdf_org.ssgproject.content_profile_hipaa
@@ -18274,17 +18445,18 @@ index 000000000..ff867ee54
 +reboot --eject
 diff --git a/products/almalinux8/kickstart/ssg-almalinux8-ism_o-ks.cfg b/products/almalinux8/kickstart/ssg-almalinux8-ism_o-ks.cfg
 new file mode 100644
-index 000000000..e3c8f1040
+index 000000000..ed30b2d72
 --- /dev/null
 +++ b/products/almalinux8/kickstart/ssg-almalinux8-ism_o-ks.cfg
-@@ -0,0 +1,106 @@
+@@ -0,0 +1,119 @@
 +# SCAP Security Guide ISM Official profile kickstart for AlmaLinux 8
 +# Version: 0.0.1
 +# Date: 2021-08-16
 +#
 +# Based on:
 +# https://pykickstart.readthedocs.io/en/latest/
-+# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/performing_an_advanced_rhel_installation/index#performing_an_automated_installation_using_kickstart
++# For more information see the following documentation:
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/security_hardening/scanning-the-system-for-configuration-compliance-and-vulnerabilities_security-hardening#deploying-baseline-compliant-rhel-systems-using-kickstart_deploying-systems-that-are-compliant-with-a-security-profile-immediately-after-an-installation
 +
 +# Specify installation method to use for installation
 +# To use a different one comment out the 'url' one below, update
@@ -18369,9 +18541,21 @@ index 000000000..e3c8f1040
 +# Create primary system partitions (required for installs)
 +autopart
 +
-+# Harden installation with Essential Eight profile
++# The OpenSCAP installer add-on is used to apply SCAP (Security Content Automation Protocol)
++# content - security policies - on the installed system.This add-on has been enabled by default
++# since Red Hat Enterprise Linux 7.2. When enabled, the packages necessary to provide this 
++# functionality will automatically be installed. However, by default, no policies are enforced,
++# meaning that no checks are performed during or after installation unless specifically configured.
++#  
++#  Important
++#   Applying a security policy is not necessary on all systems. This screen should only be used
++#   when a specific policy is mandated by your organization rules or government regulations.
++#   Unlike most other commands, this add-on does not accept regular options, but uses key-value
++#   pairs in the body of the %addon definition instead. These pairs are whitespace-agnostic.
++#   Values can be optionally enclosed in single quotes (') or double quotes (").
++#   
 +# For more details and configuration options see
-+# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/performing_an_advanced_rhel_installation/index#addon-org_fedora_oscap_kickstart-commands-for-addons-supplied-with-the-rhel-installation-program
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/performing_an_advanced_rhel_8_installation/kickstart-commands-and-options-reference_installing-rhel-as-an-experienced-user#addon-org_fedora_oscap_kickstart-commands-for-addons-supplied-with-the-rhel-installation-program
 +%addon org_fedora_oscap
 +        content-type = scap-security-guide
 +        profile = xccdf_org.ssgproject.content_profile_ism_o
@@ -18386,15 +18570,17 @@ index 000000000..e3c8f1040
 +reboot --eject
 diff --git a/products/almalinux8/kickstart/ssg-almalinux8-ospp-ks.cfg b/products/almalinux8/kickstart/ssg-almalinux8-ospp-ks.cfg
 new file mode 100644
-index 000000000..62b9ca40f
+index 000000000..d74607ae9
 --- /dev/null
 +++ b/products/almalinux8/kickstart/ssg-almalinux8-ospp-ks.cfg
-@@ -0,0 +1,149 @@
+@@ -0,0 +1,139 @@
 +# SCAP Security Guide OSPP profile kickstart for AlmaLinux 8
 +#
 +# Based on:
 +# https://pykickstart.readthedocs.io/en/latest/
 +# http://usgcb.nist.gov/usgcb/content/configuration/workstation-ks.cfg
++# For more information see the following documentation:
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/security_hardening/scanning-the-system-for-configuration-compliance-and-vulnerabilities_security-hardening#deploying-baseline-compliant-rhel-systems-using-kickstart_deploying-systems-that-are-compliant-with-a-security-profile-immediately-after-an-installation
 +
 +# Specify installation method to use for installation
 +# To use a different one comment out the 'url' one below, update
@@ -18513,20 +18699,8 @@ index 000000000..62b9ca40f
 +#   pairs in the body of the %addon definition instead. These pairs are whitespace-agnostic.
 +#   Values can be optionally enclosed in single quotes (') or double quotes (").
 +#   
-+#  The following keys are recognized by the add-on:
-+#    content-type - Type of the security content. Possible values are datastream, archive, rpm, and scap-security-guide.
-+#      - If the content-type is scap-security-guide, the add-on will use content provided by the
-+#        scap-security-guide package, which is present on the boot media. This means that all other keys except profile will have no effect.
-+#    content-url - Location of the security content. The content must be accessible using HTTP, HTTPS, or FTP; local storage is currently not supported. A network connection must be available to reach content definitions in a remote location.
-+#    datastream-id - ID of the data stream referenced in the content-url value. Used only if content-type is datastream.
-+#    xccdf-id - ID of the benchmark you want to use.
-+#    xccdf-path - Path to the XCCDF file which should be used; given as a relative path in the archive.
-+#    profile - ID of the profile to be applied. Use default to apply the default profile.
-+#    fingerprint - A MD5, SHA1 or SHA2 checksum of the content referenced by content-url.
-+#    tailoring-path - Path to a tailoring file which should be used, given as a relative path in the archive.
-+#
-+#  The following is an example %addon org_fedora_oscap section which uses content from the
-+#  scap-security-guide on the installation media: 
++# For more details and configuration options see
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/performing_an_advanced_rhel_8_installation/kickstart-commands-and-options-reference_installing-rhel-as-an-experienced-user#addon-org_fedora_oscap_kickstart-commands-for-addons-supplied-with-the-rhel-installation-program
 +%addon org_fedora_oscap
 +	content-type = scap-security-guide
 +	profile = xccdf_org.ssgproject.content_profile_ospp
@@ -18541,15 +18715,17 @@ index 000000000..62b9ca40f
 +reboot --eject
 diff --git a/products/almalinux8/kickstart/ssg-almalinux8-pci-dss-ks.cfg b/products/almalinux8/kickstart/ssg-almalinux8-pci-dss-ks.cfg
 new file mode 100644
-index 000000000..e997629e8
+index 000000000..eda7c7be4
 --- /dev/null
 +++ b/products/almalinux8/kickstart/ssg-almalinux8-pci-dss-ks.cfg
-@@ -0,0 +1,144 @@
+@@ -0,0 +1,134 @@
 +# SCAP Security Guide PCI-DSS profile kickstart for AlmaLinux 8
 +#
 +# Based on:
 +# https://pykickstart.readthedocs.io/en/latest/
 +# http://usgcb.nist.gov/usgcb/content/configuration/workstation-ks.cfg
++# For more information see the following documentation:
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/security_hardening/scanning-the-system-for-configuration-compliance-and-vulnerabilities_security-hardening#deploying-baseline-compliant-rhel-systems-using-kickstart_deploying-systems-that-are-compliant-with-a-security-profile-immediately-after-an-installation
 +
 +# Specify installation method to use for installation
 +# To use a different one comment out the 'url' one below, update
@@ -18663,20 +18839,8 @@ index 000000000..e997629e8
 +#   pairs in the body of the %addon definition instead. These pairs are whitespace-agnostic.
 +#   Values can be optionally enclosed in single quotes (') or double quotes (").
 +#   
-+#  The following keys are recognized by the add-on:
-+#    content-type - Type of the security content. Possible values are datastream, archive, rpm, and scap-security-guide.
-+#      - If the content-type is scap-security-guide, the add-on will use content provided by the
-+#        scap-security-guide package, which is present on the boot media. This means that all other keys except profile will have no effect.
-+#    content-url - Location of the security content. The content must be accessible using HTTP, HTTPS, or FTP; local storage is currently not supported. A network connection must be available to reach content definitions in a remote location.
-+#    datastream-id - ID of the data stream referenced in the content-url value. Used only if content-type is datastream.
-+#    xccdf-id - ID of the benchmark you want to use.
-+#    xccdf-path - Path to the XCCDF file which should be used; given as a relative path in the archive.
-+#    profile - ID of the profile to be applied. Use default to apply the default profile.
-+#    fingerprint - A MD5, SHA1 or SHA2 checksum of the content referenced by content-url.
-+#    tailoring-path - Path to a tailoring file which should be used, given as a relative path in the archive.
-+#
-+#  The following is an example %addon org_fedora_oscap section which uses content from the
-+#  scap-security-guide on the installation media: 
++# For more details and configuration options see
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/performing_an_advanced_rhel_8_installation/kickstart-commands-and-options-reference_installing-rhel-as-an-experienced-user#addon-org_fedora_oscap_kickstart-commands-for-addons-supplied-with-the-rhel-installation-program
 +%addon org_fedora_oscap
 +        content-type = scap-security-guide
 +        profile = xccdf_org.ssgproject.content_profile_pci-dss
@@ -18691,15 +18855,17 @@ index 000000000..e997629e8
 +reboot --eject
 diff --git a/products/almalinux8/kickstart/ssg-almalinux8-stig-ks.cfg b/products/almalinux8/kickstart/ssg-almalinux8-stig-ks.cfg
 new file mode 100644
-index 000000000..d00b911b5
+index 000000000..22c981ee2
 --- /dev/null
 +++ b/products/almalinux8/kickstart/ssg-almalinux8-stig-ks.cfg
-@@ -0,0 +1,151 @@
+@@ -0,0 +1,141 @@
 +# SCAP Security Guide STIG profile kickstart for AlmaLinux 8
 +#
 +# Based on:
 +# https://pykickstart.readthedocs.io/en/latest/
 +# http://usgcb.nist.gov/usgcb/content/configuration/workstation-ks.cfg
++# For more information see the following documentation:
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/security_hardening/scanning-the-system-for-configuration-compliance-and-vulnerabilities_security-hardening#deploying-baseline-compliant-rhel-systems-using-kickstart_deploying-systems-that-are-compliant-with-a-security-profile-immediately-after-an-installation
 +
 +# Specify installation method to use for installation
 +# To use a different one comment out the 'url' one below, update
@@ -18820,20 +18986,8 @@ index 000000000..d00b911b5
 +#   pairs in the body of the %addon definition instead. These pairs are whitespace-agnostic.
 +#   Values can be optionally enclosed in single quotes (') or double quotes (").
 +#   
-+#  The following keys are recognized by the add-on:
-+#    content-type - Type of the security content. Possible values are datastream, archive, rpm, and scap-security-guide.
-+#      - If the content-type is scap-security-guide, the add-on will use content provided by the
-+#        scap-security-guide package, which is present on the boot media. This means that all other keys except profile will have no effect.
-+#    content-url - Location of the security content. The content must be accessible using HTTP, HTTPS, or FTP; local storage is currently not supported. A network connection must be available to reach content definitions in a remote location.
-+#    datastream-id - ID of the data stream referenced in the content-url value. Used only if content-type is datastream.
-+#    xccdf-id - ID of the benchmark you want to use.
-+#    xccdf-path - Path to the XCCDF file which should be used; given as a relative path in the archive.
-+#    profile - ID of the profile to be applied. Use default to apply the default profile.
-+#    fingerprint - A MD5, SHA1 or SHA2 checksum of the content referenced by content-url.
-+#    tailoring-path - Path to a tailoring file which should be used, given as a relative path in the archive.
-+#
-+#  The following is an example %addon org_fedora_oscap section which uses content from the
-+#  scap-security-guide on the installation media: 
++# For more details and configuration options see
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/performing_an_advanced_rhel_8_installation/kickstart-commands-and-options-reference_installing-rhel-as-an-experienced-user#addon-org_fedora_oscap_kickstart-commands-for-addons-supplied-with-the-rhel-installation-program
 +%addon org_fedora_oscap
 +	content-type = scap-security-guide
 +	profile = xccdf_org.ssgproject.content_profile_stig
@@ -18848,15 +19002,17 @@ index 000000000..d00b911b5
 +reboot --eject
 diff --git a/products/almalinux8/kickstart/ssg-almalinux8-stig_gui-ks.cfg b/products/almalinux8/kickstart/ssg-almalinux8-stig_gui-ks.cfg
 new file mode 100644
-index 000000000..bacba279f
+index 000000000..091ef836e
 --- /dev/null
 +++ b/products/almalinux8/kickstart/ssg-almalinux8-stig_gui-ks.cfg
-@@ -0,0 +1,153 @@
+@@ -0,0 +1,143 @@
 +# SCAP Security Guide STIG with GUI profile kickstart for AlmaLinux 8
 +#
 +# Based on:
 +# https://pykickstart.readthedocs.io/en/latest/
 +# http://usgcb.nist.gov/usgcb/content/configuration/workstation-ks.cfg
++# For more information see the following documentation:
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/security_hardening/scanning-the-system-for-configuration-compliance-and-vulnerabilities_security-hardening#deploying-baseline-compliant-rhel-systems-using-kickstart_deploying-systems-that-are-compliant-with-a-security-profile-immediately-after-an-installation
 +
 +# Specify installation method to use for installation
 +# To use a different one comment out the 'url' one below, update
@@ -18976,20 +19132,8 @@ index 000000000..bacba279f
 +#   pairs in the body of the %addon definition instead. These pairs are whitespace-agnostic.
 +#   Values can be optionally enclosed in single quotes (') or double quotes (").
 +#   
-+#  The following keys are recognized by the add-on:
-+#    content-type - Type of the security content. Possible values are datastream, archive, rpm, and scap-security-guide.
-+#      - If the content-type is scap-security-guide, the add-on will use content provided by the
-+#        scap-security-guide package, which is present on the boot media. This means that all other keys except profile will have no effect.
-+#    content-url - Location of the security content. The content must be accessible using HTTP, HTTPS, or FTP; local storage is currently not supported. A network connection must be available to reach content definitions in a remote location.
-+#    datastream-id - ID of the data stream referenced in the content-url value. Used only if content-type is datastream.
-+#    xccdf-id - ID of the benchmark you want to use.
-+#    xccdf-path - Path to the XCCDF file which should be used; given as a relative path in the archive.
-+#    profile - ID of the profile to be applied. Use default to apply the default profile.
-+#    fingerprint - A MD5, SHA1 or SHA2 checksum of the content referenced by content-url.
-+#    tailoring-path - Path to a tailoring file which should be used, given as a relative path in the archive.
-+#
-+#  The following is an example %addon org_fedora_oscap section which uses content from the
-+#  scap-security-guide on the installation media: 
++# For more details and configuration options see
++# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/performing_an_advanced_rhel_8_installation/kickstart-commands-and-options-reference_installing-rhel-as-an-experienced-user#addon-org_fedora_oscap_kickstart-commands-for-addons-supplied-with-the-rhel-installation-program
 +%addon org_fedora_oscap
 +	content-type = scap-security-guide
 +	profile = xccdf_org.ssgproject.content_profile_stig_gui
@@ -19186,10 +19330,10 @@ index 000000000..08c87ea68
 +</Group>
 diff --git a/products/almalinux8/product.yml b/products/almalinux8/product.yml
 new file mode 100644
-index 000000000..536dc8a7c
+index 000000000..fadfc608a
 --- /dev/null
 +++ b/products/almalinux8/product.yml
-@@ -0,0 +1,52 @@
+@@ -0,0 +1,51 @@
 +product: almalinux8
 +full_name: AlmaLinux 8
 +type: platform
@@ -19218,7 +19362,6 @@ index 000000000..536dc8a7c
 +
 +release_key_fingerprint: "5E9B8F5617B5066CE92057C3488FCF7C3ABB34F8"
 +auxiliary_key_fingerprint: "BC5EDDCADF502C077F1582882AE81E8ACED7258B"
-+oval_feed_url: "https://security.almalinux.org/oval/org.almalinux.alsa-8.xml.bz2"
 +
 +groups:
 +  dedicated_ssh_keyowner:
@@ -19431,7 +19574,7 @@ index 000000000..aa606b38b
 +  - '!ensure_oracle_gpgkey_installed'
 diff --git a/products/almalinux8/profiles/cis.profile b/products/almalinux8/profiles/cis.profile
 new file mode 100644
-index 000000000..c52f6b4c4
+index 000000000..77c47e69d
 --- /dev/null
 +++ b/products/almalinux8/profiles/cis.profile
 @@ -0,0 +1,26 @@
@@ -19451,7 +19594,7 @@ index 000000000..c52f6b4c4
 +description: |-
 +    This profile defines a baseline that aligns to the "Level 2 - Server"
 +    configuration from the Center for Internet Security® 
-+    AlmaLinux OS 8 Benchmark™, v2.0.0, released 05-31-2022.
++    AlmaLinux OS 8 Benchmark™, v3.0.0, released 05-31-2022.
 +
 +    This profile includes Center for Internet Security®
 +    AlmaLinux OS 8 CIS Benchmarks™ content.
@@ -19463,7 +19606,7 @@ index 000000000..c52f6b4c4
 +    - '!package_dnsmasq_removed'
 diff --git a/products/almalinux8/profiles/cis_server_l1.profile b/products/almalinux8/profiles/cis_server_l1.profile
 new file mode 100644
-index 000000000..19b6dfc97
+index 000000000..ee01c1f0a
 --- /dev/null
 +++ b/products/almalinux8/profiles/cis_server_l1.profile
 @@ -0,0 +1,26 @@
@@ -19483,7 +19626,7 @@ index 000000000..19b6dfc97
 +description: |-
 +    This profile defines a baseline that aligns to the "Level 1 - Server"
 +    configuration from the Center for Internet Security® 
-+    AlmaLinux OS 8 Benchmark™, v2.0.0, released 05-31-2022.
++    AlmaLinux OS 8 Benchmark™, v3.0.0, released 05-31-2022.
 +
 +    This profile includes Center for Internet Security®
 +    AlmaLinux OS 8 CIS Benchmarks™ content.
@@ -19495,7 +19638,7 @@ index 000000000..19b6dfc97
 +    - '!package_dnsmasq_removed'
 diff --git a/products/almalinux8/profiles/cis_workstation_l1.profile b/products/almalinux8/profiles/cis_workstation_l1.profile
 new file mode 100644
-index 000000000..a36fed734
+index 000000000..9c5dc2ec9
 --- /dev/null
 +++ b/products/almalinux8/profiles/cis_workstation_l1.profile
 @@ -0,0 +1,26 @@
@@ -19515,7 +19658,7 @@ index 000000000..a36fed734
 +description: |-
 +    This profile defines a baseline that aligns to the "Level 1 - Workstation"
 +    configuration from the Center for Internet Security® 
-+    AlmaLinux OS 8 Benchmark™, v2.0.0, released 05-31-2022.
++    AlmaLinux OS 8 Benchmark™, v3.0.0, released 05-31-2022.
 +
 +    This profile includes Center for Internet Security®
 +    AlmaLinux OS 8 CIS Benchmarks™ content.
@@ -19527,7 +19670,7 @@ index 000000000..a36fed734
 +    - '!package_dnsmasq_removed'
 diff --git a/products/almalinux8/profiles/cis_workstation_l2.profile b/products/almalinux8/profiles/cis_workstation_l2.profile
 new file mode 100644
-index 000000000..f5e158ff0
+index 000000000..69e85bbf3
 --- /dev/null
 +++ b/products/almalinux8/profiles/cis_workstation_l2.profile
 @@ -0,0 +1,26 @@
@@ -19547,7 +19690,7 @@ index 000000000..f5e158ff0
 +description: |-
 +    This profile defines a baseline that aligns to the "Level 2 - Workstation"
 +    configuration from the Center for Internet Security® 
-+    AlmaLinux OS 8 Benchmark™, v2.0.0, released 05-31-2022.
++    AlmaLinux OS 8 Benchmark™, v3.0.0, released 05-31-2022.
 +
 +    This profile includes Center for Internet Security®
 +    AlmaLinux OS 8 CIS Benchmarks™ content.
@@ -19559,7 +19702,7 @@ index 000000000..f5e158ff0
 +    - '!package_dnsmasq_removed'
 diff --git a/products/almalinux8/profiles/cjis.profile b/products/almalinux8/profiles/cjis.profile
 new file mode 100644
-index 000000000..e4202eccc
+index 000000000..b3ef56e62
 --- /dev/null
 +++ b/products/almalinux8/profiles/cjis.profile
 @@ -0,0 +1,145 @@
@@ -19670,7 +19813,7 @@ index 000000000..e4202eccc
 +    - dconf_gnome_screensaver_mode_blank
 +    - sshd_allow_only_protocol2
 +    - sshd_set_idle_timeout
-+    - var_sshd_set_keepalive=0
++    - var_sshd_set_keepalive=1
 +    - sshd_set_keepalive_0
 +    - disable_host_auth
 +    - sshd_disable_root_login
@@ -19710,10 +19853,10 @@ index 000000000..e4202eccc
 +    - kernel_module_bluetooth_disabled
 diff --git a/products/almalinux8/profiles/cui.profile b/products/almalinux8/profiles/cui.profile
 new file mode 100644
-index 000000000..216999b09
+index 000000000..5fd48dbdc
 --- /dev/null
 +++ b/products/almalinux8/profiles/cui.profile
-@@ -0,0 +1,32 @@
+@@ -0,0 +1,33 @@
 +documentation_complete: true
 +
 +metadata:
@@ -19746,17 +19889,18 @@ index 000000000..216999b09
 +
 +selections:
 +    - inactivity_timeout_value=10_minutes
++    - var_system_crypto_policy=fips
 diff --git a/products/almalinux8/profiles/default.profile b/products/almalinux8/profiles/default.profile
 new file mode 100644
-index 000000000..127bef3cc
+index 000000000..ab8b8ece7
 --- /dev/null
 +++ b/products/almalinux8/profiles/default.profile
-@@ -0,0 +1,711 @@
+@@ -0,0 +1,710 @@
 +documentation_complete: true
 +
 +hidden: true
 +
-+title: Default Profile for Red Hat Enterprise Linux 8
++title: Default Profile for AlmaLinux 8
 +
 +description: |-
 +    This profile contains all the rules that once belonged to the
@@ -20205,7 +20349,6 @@ index 000000000..127bef3cc
 +    - sebool_openvpn_enable_homedirs
 +    - zipl_enable_selinux
 +    - bios_disable_usb_boot
-+    - file_permissions_systemmap
 +    - audit_rules_unsuccessful_file_modification_open_o_creat
 +    - kernel_config_ipv6
 +    - service_rpcgssd_disabled
@@ -20623,7 +20766,7 @@ index 000000000..491958fdd
 +  - package_rear_installed
 diff --git a/products/almalinux8/profiles/hipaa.profile b/products/almalinux8/profiles/hipaa.profile
 new file mode 100644
-index 000000000..e736c0657
+index 000000000..f4c77f241
 --- /dev/null
 +++ b/products/almalinux8/profiles/hipaa.profile
 @@ -0,0 +1,166 @@
@@ -20693,7 +20836,7 @@ index 000000000..e736c0657
 +    - sshd_do_not_permit_user_env
 +    - sshd_enable_strictmodes
 +    - sshd_enable_warning_banner
-+    - var_sshd_set_keepalive=0
++    - var_sshd_set_keepalive=1
 +    - sshd_set_keepalive_0
 +    - encrypt_partitions
 +    - var_system_crypto_policy=fips
@@ -20940,7 +21083,7 @@ index 000000000..aac055ee1
 +  - file_permissions_sshd_private_key
 diff --git a/products/almalinux8/profiles/ospp.profile b/products/almalinux8/profiles/ospp.profile
 new file mode 100644
-index 000000000..3255908d7
+index 000000000..094c14a62
 --- /dev/null
 +++ b/products/almalinux8/profiles/ospp.profile
 @@ -0,0 +1,437 @@
@@ -21009,7 +21152,7 @@ index 000000000..3255908d7
 +    - sshd_disable_empty_passwords
 +    - sshd_disable_kerb_auth
 +    - sshd_disable_gssapi_auth
-+    - var_sshd_set_keepalive=0
++    - var_sshd_set_keepalive=1
 +    - sshd_set_keepalive_0
 +    - sshd_enable_warning_banner
 +    - sshd_rekey_limit
@@ -21448,7 +21591,7 @@ index 000000000..a27fdbd6f
 +    - '!package_cryptsetup-luks_installed'
 diff --git a/products/almalinux8/profiles/rht-ccp.profile b/products/almalinux8/profiles/rht-ccp.profile
 new file mode 100644
-index 000000000..67dad56fd
+index 000000000..dfb137cb2
 --- /dev/null
 +++ b/products/almalinux8/profiles/rht-ccp.profile
 @@ -0,0 +1,102 @@
@@ -21544,7 +21687,7 @@ index 000000000..67dad56fd
 +    - package_telnet_removed
 +    - sshd_allow_only_protocol2
 +    - sshd_set_idle_timeout
-+    - var_sshd_set_keepalive=0
++    - var_sshd_set_keepalive=1
 +    - sshd_set_keepalive_0
 +    - disable_host_auth
 +    - sshd_disable_root_login
@@ -21556,7 +21699,7 @@ index 000000000..67dad56fd
 +    - configure_ssh_crypto_policy
 diff --git a/products/almalinux8/profiles/standard.profile b/products/almalinux8/profiles/standard.profile
 new file mode 100644
-index 000000000..30e6a3d30
+index 000000000..3c09d50d0
 --- /dev/null
 +++ b/products/almalinux8/profiles/standard.profile
 @@ -0,0 +1,91 @@
@@ -21564,11 +21707,11 @@ index 000000000..30e6a3d30
 +
 +hidden: true
 +
-+title: 'Standard System Security Profile for Red Hat Enterprise Linux 8'
++title: 'Standard System Security Profile for AlmaLinux 8'
 +
 +description: |-
 +    This profile contains rules to ensure standard security baseline
-+    of a Red Hat Enterprise Linux 8 system. Regardless of your system's workload
++    of a AlmaLinux 8 system. Regardless of your system's workload
 +    all of these checks should pass.
 +
 +selections:
@@ -21653,14 +21796,14 @@ index 000000000..30e6a3d30
 +    - file_permissions_user_cfg
 diff --git a/products/almalinux8/profiles/stig.profile b/products/almalinux8/profiles/stig.profile
 new file mode 100644
-index 000000000..a82d15f64
+index 000000000..27ff5f9ce
 --- /dev/null
 +++ b/products/almalinux8/profiles/stig.profile
-@@ -0,0 +1,1251 @@
+@@ -0,0 +1,1254 @@
 +documentation_complete: true
 +
 +metadata:
-+    version: V1R13
++    version: V1R14
 +    SMEs:
 +        - mab879
 +        - ggbecker
@@ -21671,7 +21814,7 @@ index 000000000..a82d15f64
 +
 +description: |-
 +    This profile contains configuration checks that align to the
-+    DISA STIG for Red Hat Enterprise Linux 8 V1R13.
++    DISA STIG for Red Hat Enterprise Linux 8 V1R14.
 +
 +    In addition to being applicable to Red Hat Enterprise Linux 8, DISA recognizes this
 +    configuration baseline as applicable to the operating system tier of
@@ -21731,6 +21874,8 @@ index 000000000..a82d15f64
 +    - var_sssd_certificate_verification_digest_function=sha1
 +    - login_banner_text=dod_banners
 +    - var_authselect_profile=sssd
++    - var_multiple_time_servers=stig
++    - var_time_service_set_maxpoll=18_hours
 +
 +    ### Enable / Configure FIPS
 +    - enable_fips_mode
@@ -22624,6 +22769,7 @@ index 000000000..a82d15f64
 +    # remediation fails because default configuration file contains pool instead of server keyword
 +    - chronyd_or_ntpd_set_maxpoll
 +    - chronyd_server_directive
++    - chronyd_specify_remote_server
 +
 +    # RHEL-08-030741
 +    - chronyd_client_only
@@ -22910,14 +23056,14 @@ index 000000000..a82d15f64
 +    - package_krb5-server_removed
 diff --git a/products/almalinux8/profiles/stig_gui.profile b/products/almalinux8/profiles/stig_gui.profile
 new file mode 100644
-index 000000000..7bc5761ae
+index 000000000..52f2ece73
 --- /dev/null
 +++ b/products/almalinux8/profiles/stig_gui.profile
-@@ -0,0 +1,43 @@
+@@ -0,0 +1,48 @@
 +documentation_complete: true
 +
 +metadata:
-+    version: V1R13
++    version: V1R14
 +    SMEs:
 +        - mab879
 +        - ggbecker
@@ -22928,7 +23074,7 @@ index 000000000..7bc5761ae
 +
 +description: |-
 +    This profile contains configuration checks that align to the
-+    DISA STIG with GUI for Red Hat Enterprise Linux 8 V1R13.
++    DISA STIG with GUI for Red Hat Enterprise Linux 8 V1R14.
 +
 +    In addition to being applicable to Red Hat Enterprise Linux 8, DISA recognizes this
 +    configuration baseline as applicable to the operating system tier of
@@ -22957,6 +23103,11 @@ index 000000000..7bc5761ae
 +
 +    # RHEL-08-040001
 +    - '!package_libreport-plugin-rhtsupport_removed'
++
++    # RHEL-08-040284
++    # Limiting user namespaces cause issues with user apps, such as Firefox and Cheese
++    # https://issues.redhat.com/browse/RHEL-10416
++    - '!sysctl_user_max_user_namespaces'
 diff --git a/products/almalinux8/transforms/constants.xslt b/products/almalinux8/transforms/constants.xslt
 new file mode 100644
 index 000000000..92f8f9c4c
@@ -23093,13 +23244,13 @@ index 000000000..8b175b211
 @@ -0,0 +1 @@
 +disa-stig-rhel8-v1r12-xccdf-scap.xml
 \ No newline at end of file
-diff --git a/shared/references/disa-stig-almalinux8-v1r13-xccdf-manual.xml b/shared/references/disa-stig-almalinux8-v1r13-xccdf-manual.xml
+diff --git a/shared/references/disa-stig-almalinux8-v1r14-xccdf-manual.xml b/shared/references/disa-stig-almalinux8-v1r14-xccdf-manual.xml
 new file mode 120000
-index 000000000..7e3fb4c84
+index 000000000..f6292c450
 --- /dev/null
-+++ b/shared/references/disa-stig-almalinux8-v1r13-xccdf-manual.xml
++++ b/shared/references/disa-stig-almalinux8-v1r14-xccdf-manual.xml
 @@ -0,0 +1 @@
-+disa-stig-rhel8-v1r13-xccdf-manual.xml
++disa-stig-rhel8-v1r14-xccdf-manual.xml
 \ No newline at end of file
 diff --git a/shared/references/disa-stig-ol7-v2r14-xccdf-manual.xml b/shared/references/disa-stig-ol7-v2r14-xccdf-manual.xml
 index 1d087be21..306818938 100644
@@ -23185,11 +23336,11 @@ index 1d087be21..306818938 100644
  set superusers="[someuniquestringhere]"
  export superusers
  
-diff --git a/shared/references/disa-stig-ol8-v1r9-xccdf-manual.xml b/shared/references/disa-stig-ol8-v1r9-xccdf-manual.xml
-index 750f80b02..934912a5e 100644
---- a/shared/references/disa-stig-ol8-v1r9-xccdf-manual.xml
-+++ b/shared/references/disa-stig-ol8-v1r9-xccdf-manual.xml
-@@ -434,7 +434,7 @@ SHA_CRYPT_MIN_ROUNDS 5000</fixtext><fix id="F-51923r818600_fix" /><check system=
+diff --git a/shared/references/disa-stig-ol8-v1r10-xccdf-manual.xml b/shared/references/disa-stig-ol8-v1r10-xccdf-manual.xml
+index 54f2012ff..ed7a02856 100644
+--- a/shared/references/disa-stig-ol8-v1r10-xccdf-manual.xml
++++ b/shared/references/disa-stig-ol8-v1r10-xccdf-manual.xml
+@@ -435,7 +435,7 @@ SHA_CRYPT_MIN_ROUNDS 5000</fixtext><fix id="F-51923r818600_fix" /><check system=
  
  If only one of "SHA_CRYPT_MIN_ROUNDS" or "SHA_CRYPT_MAX_ROUNDS" is set, and this value is below "5000", this is a finding.
  
@@ -23198,7 +23349,7 @@ index 750f80b02..934912a5e 100644
   
  Generate an encrypted grub2 password for the grub superusers account with the following command: 
   
-@@ -444,7 +444,7 @@ Confirm password:</fixtext><fix id="F-51925r779176_fix" /><check system="C-51971
+@@ -445,7 +445,7 @@ Confirm password:</fixtext><fix id="F-51925r779176_fix" /><check system="C-51971
   
  Determine if an encrypted password is set for the grub superusers account. On systems that use UEFI, use the following command: 
   
@@ -23207,7 +23358,7 @@ index 750f80b02..934912a5e 100644
   
  GRUB2_PASSWORD=grub.pbkdf2.sha512.[password_hash] 
   
-@@ -459,11 +459,11 @@ password_pbkdf2 [someuniqueUserNamehere] ${GRUB2_PASSWORD}
+@@ -460,11 +460,11 @@ password_pbkdf2 [someuniqueUserNamehere] ${GRUB2_PASSWORD}
  
  Generate a new grub.cfg file with the following command:
  
@@ -26094,11 +26245,11 @@ index cf7ead7c0..860287958 100644
              </affected>
              <reference ref_id="cpe:/o:redhat:enterprise_linux:8" source="CPE" />
              <description>RHEL 8 is installed</description>
-diff --git a/shared/references/disa-stig-rhel8-v1r13-xccdf-manual.xml b/shared/references/disa-stig-rhel8-v1r13-xccdf-manual.xml
-index b9d25d9e9..3df1cb89c 100644
---- a/shared/references/disa-stig-rhel8-v1r13-xccdf-manual.xml
-+++ b/shared/references/disa-stig-rhel8-v1r13-xccdf-manual.xml
-@@ -373,7 +373,7 @@ SHA_CRYPT_MIN_ROUNDS 5000</fixtext><fix id="F-32877r809272_fix" /><check system=
+diff --git a/shared/references/disa-stig-rhel8-v1r14-xccdf-manual.xml b/shared/references/disa-stig-rhel8-v1r14-xccdf-manual.xml
+index 89b69d69d..cf9365113 100644
+--- a/shared/references/disa-stig-rhel8-v1r14-xccdf-manual.xml
++++ b/shared/references/disa-stig-rhel8-v1r14-xccdf-manual.xml
+@@ -374,7 +374,7 @@ SHA_CRYPT_MIN_ROUNDS 5000</fixtext><fix id="F-32877r809272_fix" /><check system=
  
  If only one of "SHA_CRYPT_MIN_ROUNDS" or "SHA_CRYPT_MAX_ROUNDS" is set, and this value is below "5000", this is a finding.
  
@@ -26107,7 +26258,7 @@ index b9d25d9e9..3df1cb89c 100644
  
  Generate an encrypted grub2 password for the grub superusers account with the following command:
  
-@@ -383,7 +383,7 @@ Confirm password:</fixtext><fix id="F-32878r743921_fix" /><check system="C-32903
+@@ -384,7 +384,7 @@ Confirm password:</fixtext><fix id="F-32878r743921_fix" /><check system="C-32903
  
  Check to see if an encrypted grub superusers password is set. On systems that use UEFI, use the following command:
  
@@ -26116,7 +26267,7 @@ index b9d25d9e9..3df1cb89c 100644
  
  GRUB2_PASSWORD=grub.pbkdf2.sha512.[password_hash]
  
-@@ -6456,11 +6456,11 @@ password_pbkdf2 [someuniquestringhere] ${GRUB2_PASSWORD}
+@@ -6468,11 +6468,11 @@ password_pbkdf2 [someuniquestringhere] ${GRUB2_PASSWORD}
  
  Generate a new grub.cfg file with the following command:
  
@@ -26130,11 +26281,11 @@ index b9d25d9e9..3df1cb89c 100644
  set superusers="[someuniquestringhere]"
  export superusers
  
-diff --git a/shared/references/disa-stig-rhel9-v1r0-xccdf-scap.xml b/shared/references/disa-stig-rhel9-v1r0-xccdf-scap.xml
-index 7ed716276..d334df131 100755
---- a/shared/references/disa-stig-rhel9-v1r0-xccdf-scap.xml
-+++ b/shared/references/disa-stig-rhel9-v1r0-xccdf-scap.xml
-@@ -3244,7 +3244,7 @@ Reboot the system for the changes to take effect.</xccdf:fixtext>
+diff --git a/shared/references/disa-stig-rhel9-v1r1-xccdf-scap.xml b/shared/references/disa-stig-rhel9-v1r1-xccdf-scap.xml
+index c14013393..fe7d48d2c 100644
+--- a/shared/references/disa-stig-rhel9-v1r1-xccdf-scap.xml
++++ b/shared/references/disa-stig-rhel9-v1r1-xccdf-scap.xml
+@@ -20991,7 +20991,7 @@ include "/etc/crypto-policies/back-ends/bind.config";</xccdf:fixtext>
            </metadata>
            <criteria operator="OR">
              <criteria operator="AND">
@@ -26143,7 +26294,7 @@ index 7ed716276..d334df131 100755
                <criteria operator="OR" comment="System is RHEL7, RHEL 8, OL7, OL8, TOSS, SLES12, SLES15, Ubuntu18, or Ubuntu20">
                  <extend_definition definition_ref="oval:mil.disa.stig.ubuntu1804:def:1" />
                  <extend_definition definition_ref="oval:mil.disa.stig.ubuntu2004:def:1" />
-@@ -4629,7 +4629,7 @@ Satisfies: SRG-OS-000033-GPOS-00014, SRG-OS-000125-GPOS-00065, SRG-OS-000396-GPO
+@@ -29178,7 +29178,7 @@ Satisfies: SRG-OS-000423-GPOS-00187, SRG-OS-000426-GPOS-00190</description>
            <object object_ref="oval:mil.disa.stig.ubuntu2004:obj:100" />
            <state state_ref="oval:mil.disa.stig.ubuntu2004:ste:100" />
          </textfilecontent54_test>
@@ -26152,7 +26303,7 @@ index 7ed716276..d334df131 100755
            <object object_ref="oval:mil.disa.stig.unix:obj:10000600" />
          </file_test>
          <file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#unix" check="all" check_existence="all_exist" id="oval:mil.disa.stig.unix:tst:10000601" comment="/etc/grub2-efi.cfg exists." version="1">
-@@ -5249,7 +5249,7 @@ Satisfies: SRG-OS-000033-GPOS-00014, SRG-OS-000125-GPOS-00065, SRG-OS-000396-GPO
+@@ -33049,7 +33049,7 @@ Satisfies: SRG-OS-000423-GPOS-00187, SRG-OS-000426-GPOS-00190</description>
            <instance datatype="int">1</instance>
          </textfilecontent54_object>
          <file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#unix" id="oval:mil.disa.stig.unix:obj:10000600" version="1">
@@ -26400,17 +26551,17 @@ index 7e9ea909e..152f27303 100644
  {{%- set ARG_NAME_VALUE = ARG_NAME ~ "=(blueprint-populate " ~ ARG_VARIABLE ~ ")" -%}}
  {{%- endif %}}
 diff --git a/shared/templates/grub2_bootloader_argument/tests/arg_not_there_etcdefaultgrub.fail.sh b/shared/templates/grub2_bootloader_argument/tests/arg_not_there_etcdefaultgrub.fail.sh
-index 93907c794..289fcf4d9 100644
+index b594abe6d..bac3e9fc6 100644
 --- a/shared/templates/grub2_bootloader_argument/tests/arg_not_there_etcdefaultgrub.fail.sh
 +++ b/shared/templates/grub2_bootloader_argument/tests/arg_not_there_etcdefaultgrub.fail.sh
 @@ -1,6 +1,6 @@
  #!/bin/bash
  
--# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel
-+# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
- # packages = grub2,grubby
- 
- source common.sh
+-# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_ubuntu
++# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_ubuntu
+ {{%- if 'ubuntu' in product %}}
+ # packages = grub2
+ {{%- else %}}
 diff --git a/shared/templates/grub2_bootloader_argument/tests/arg_not_there_grubenv.fail.sh b/shared/templates/grub2_bootloader_argument/tests/arg_not_there_grubenv.fail.sh
 index e52ae2417..5f5306e14 100644
 --- a/shared/templates/grub2_bootloader_argument/tests/arg_not_there_grubenv.fail.sh
@@ -26502,7 +26653,7 @@ index 88e846697..a329cbe76 100644
  # strategy = disable
  # complexity = low
 diff --git a/shared/templates/kernel_module_disabled/bash.template b/shared/templates/kernel_module_disabled/bash.template
-index 699c13a20..a6cf74ccd 100644
+index df7229bc4..d6dc65bff 100644
 --- a/shared/templates/kernel_module_disabled/bash.template
 +++ b/shared/templates/kernel_module_disabled/bash.template
 @@ -1,4 +1,4 @@
@@ -26512,7 +26663,7 @@ index 699c13a20..a6cf74ccd 100644
  # strategy = disable
  # complexity = low
 diff --git a/shared/templates/kernel_module_disabled/kubernetes.template b/shared/templates/kernel_module_disabled/kubernetes.template
-index bc678c80e..516c10ce4 100644
+index c77cebfbb..2820e9745 100644
 --- a/shared/templates/kernel_module_disabled/kubernetes.template
 +++ b/shared/templates/kernel_module_disabled/kubernetes.template
 @@ -1,5 +1,5 @@
@@ -26753,6 +26904,17 @@ index 3d3bbbd8e..ae10153cd 100755
 @@ -1,5 +1,5 @@
  #!/bin/bash
 -# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_sle
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol,multi_platform_sle
+ 
+ # Declare variables used for the tests and define the create_rsyslog_test_logs function
+ source $SHARED/rsyslog_log_utils.sh
+diff --git a/shared/templates/rsyslog_logfiles_attributes_modify/tests/rainer_correct_attr_exceptions.pass.sh b/shared/templates/rsyslog_logfiles_attributes_modify/tests/rainer_correct_attr_exceptions.pass.sh
+index 868318728..d744d549d 100755
+--- a/shared/templates/rsyslog_logfiles_attributes_modify/tests/rainer_correct_attr_exceptions.pass.sh
++++ b/shared/templates/rsyslog_logfiles_attributes_modify/tests/rainer_correct_attr_exceptions.pass.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_sle
 +# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol,multi_platform_sle
  
  # Declare variables used for the tests and define the create_rsyslog_test_logs function
@@ -26874,7 +27036,7 @@ index 00fd1ee2f..2d99ec854 100644
  # strategy = enable
  # complexity = low
 diff --git a/shared/templates/sysctl/bash.template b/shared/templates/sysctl/bash.template
-index d66b33206..f02d3bac6 100644
+index 166788260..fa79e7262 100644
 --- a/shared/templates/sysctl/bash.template
 +++ b/shared/templates/sysctl/bash.template
 @@ -1,4 +1,4 @@
@@ -26883,6 +27045,16 @@ index d66b33206..f02d3bac6 100644
  # reboot = true
  # strategy = disable
  # complexity = low
+diff --git a/shared/templates/systemd_mount_enabled/anaconda.template b/shared/templates/systemd_mount_enabled/anaconda.template
+index 42ec0778d..475010b6a 100644
+--- a/shared/templates/systemd_mount_enabled/anaconda.template
++++ b/shared/templates/systemd_mount_enabled/anaconda.template
+@@ -1,4 +1,4 @@
+-# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_rhv
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ol,multi_platform_rhv
+ # reboot = false
+ # strategy = enable
+ # complexity = low
 diff --git a/shared/templates/zipl_bls_entries_option/ansible.template b/shared/templates/zipl_bls_entries_option/ansible.template
 index 336775e4f..6411d1b9b 100644
 --- a/shared/templates/zipl_bls_entries_option/ansible.template
@@ -26904,7 +27076,7 @@ index 25cd7432c..a415f2a38 100644
  # Correct BLS option using grubby, which is a thin wrapper around BLS operations
  grubby --update-kernel=ALL --args="{{{ ARG_NAME }}}={{{ ARG_VALUE }}}"
 diff --git a/ssg/constants.py b/ssg/constants.py
-index 18fbf39d3..4dfe02089 100644
+index c02858096..4ed46741f 100644
 --- a/ssg/constants.py
 +++ b/ssg/constants.py
 @@ -40,6 +40,7 @@ SSG_REF_URIS = {
@@ -26915,7 +27087,7 @@ index 18fbf39d3..4dfe02089 100644
      'anolis8',
      'anolis23',
      'chromium',
-@@ -197,6 +198,7 @@ PKG_MANAGER_TO_CONFIG_FILE = {
+@@ -198,6 +199,7 @@ PKG_MANAGER_TO_CONFIG_FILE = {
  FULL_NAME_TO_PRODUCT_MAPPING = {
      "Alibaba Cloud Linux 2": "alinux2",
      "Alibaba Cloud Linux 3": "alinux3",
@@ -26923,7 +27095,7 @@ index 18fbf39d3..4dfe02089 100644
      "Anolis OS 8": "anolis8",
      "Anolis OS 23": "anolis23",
      "Chromium": "chromium",
-@@ -276,7 +278,7 @@ REFERENCES = dict(
+@@ -278,7 +280,7 @@ REFERENCES = dict(
  )
  
  
@@ -26932,7 +27104,7 @@ index 18fbf39d3..4dfe02089 100644
                         "openeuler",
                         "opensuse", "sle", "ol", "ocp", "rhcos",
                         "example", "eks", "alinux", "uos", "anolis", "openembedded"]
-@@ -284,6 +286,7 @@ MULTI_PLATFORM_LIST = ["rhel", "fedora", "rhv", "debian", "ubuntu",
+@@ -286,6 +288,7 @@ MULTI_PLATFORM_LIST = ["rhel", "fedora", "rhv", "debian", "ubuntu",
  MULTI_PLATFORM_MAPPING = {
      "multi_platform_alinux": ["alinux2", "alinux3"],
      "multi_platform_anolis": ["anolis8", "anolis23"],
@@ -26940,7 +27112,7 @@ index 18fbf39d3..4dfe02089 100644
      "multi_platform_debian": ["debian10", "debian11", "debian12"],
      "multi_platform_example": ["example"],
      "multi_platform_eks": ["eks"],
-@@ -470,6 +473,7 @@ MAKEFILE_ID_TO_PRODUCT_MAP = {
+@@ -473,6 +476,7 @@ MAKEFILE_ID_TO_PRODUCT_MAP = {
      'rhcos': 'Red Hat Enterprise Linux CoreOS',
      'eks': 'Amazon Elastic Kubernetes Service',
      'openembedded': 'OpenEmbedded',
@@ -26948,39 +27120,6 @@ index 18fbf39d3..4dfe02089 100644
  }
  
  # References that can not be used with product-qualifiers
-diff --git a/tests/unit/ssg-module/data/accounts_tmout.yml b/tests/unit/ssg-module/data/accounts_tmout.yml
-index e8400ed73..63ed082a0 100644
---- a/tests/unit/ssg-module/data/accounts_tmout.yml
-+++ b/tests/unit/ssg-module/data/accounts_tmout.yml
-@@ -1,4 +1,4 @@
--prodtype: alinux2,alinux3,fedora,ol7,ol8,ol9,rhcos4,rhel7,rhel8,rhel9,rhv4,sle12,sle15,ubuntu2004,ubuntu2204
-+prodtype: alinux2,alinux3,fedora,ol7,ol8,ol9,rhcos4,rhel7,rhel8,almalinux8,rhel9,rhv4,sle12,sle15,ubuntu2004,ubuntu2204
- title: Set Interactive Session Timeout
- description: 'Setting the <tt>TMOUT</tt> option in <tt>/etc/profile</tt> ensures that
- 
-diff --git a/tests/unit/ssg-module/data/accounts_tmout_without_ocil.yml b/tests/unit/ssg-module/data/accounts_tmout_without_ocil.yml
-index 1feaeb55c..1e96bdeb9 100644
---- a/tests/unit/ssg-module/data/accounts_tmout_without_ocil.yml
-+++ b/tests/unit/ssg-module/data/accounts_tmout_without_ocil.yml
-@@ -1,4 +1,4 @@
--prodtype: alinux2,alinux3,fedora,ol7,ol8,ol9,rhcos4,rhel7,rhel8,rhel9,rhv4,sle12,sle15,ubuntu2004,ubuntu2204
-+prodtype: alinux2,alinux3,fedora,ol7,ol8,ol9,rhcos4,rhel7,rhel8,almalinux8,rhel9,rhv4,sle12,sle15,ubuntu2004,ubuntu2204
- title: Set Interactive Session Timeout
- description: 'Setting the <tt>TMOUT</tt> option in <tt>/etc/profile</tt> ensures that
- 
-diff --git a/tests/unit/ssg-module/data/file_owner_grub2_cfg.yml b/tests/unit/ssg-module/data/file_owner_grub2_cfg.yml
-index 83d5532f5..bc9f9e17a 100644
---- a/tests/unit/ssg-module/data/file_owner_grub2_cfg.yml
-+++ b/tests/unit/ssg-module/data/file_owner_grub2_cfg.yml
-@@ -22,7 +22,7 @@ platforms: !!set
- cpe_platform_names: !!set
-     machine: null
- inherited_platforms: []
--prodtype: rhel7,rhel8,fedora,ol7,ol8
-+prodtype: rhel7,rhel8,almalinux8,fedora,ol7,ol8
- rationale: Only root should be able to modify important boot parameters.
- references: {cis: 1.4.1, cis-csc: '12,13,14,15,16,18,3,5', cjis: 5.5.2.2, cobit5: 'APO01.06,DSS05.04,DSS05.07,DSS06.02',
-   cui: 3.4.5, disa: 'CCI-000225', hipaa: '164.308(a)(1)(ii)(B),164.308(a)(7)(i),164.308(a)(7)(ii)(A),164.310(a)(1),164.310(a)(2)(i),164.310(a)(2)(ii),164.310(a)(2)(iii),164.310(b),164.310(c),164.310(d)(1),164.310(d)(2)(iii)',
 diff --git a/tests/unit/ssg-module/test_playbook_builder_data/fixes/selinux_state.yml b/tests/unit/ssg-module/test_playbook_builder_data/fixes/selinux_state.yml
 index ff0b30f03..0116294f1 100644
 --- a/tests/unit/ssg-module/test_playbook_builder_data/fixes/selinux_state.yml
@@ -26991,18 +27130,6 @@ index ff0b30f03..0116294f1 100644
  # reboot = false
  # strategy = restrict
  # complexity = low
-diff --git a/tests/unit/ssg-module/test_playbook_builder_data/guide/configure_crypto_policy/rule.yml b/tests/unit/ssg-module/test_playbook_builder_data/guide/configure_crypto_policy/rule.yml
-index 9d0a0d087..b64b4b0fc 100644
---- a/tests/unit/ssg-module/test_playbook_builder_data/guide/configure_crypto_policy/rule.yml
-+++ b/tests/unit/ssg-module/test_playbook_builder_data/guide/configure_crypto_policy/rule.yml
-@@ -1,6 +1,6 @@
- documentation_complete: true
- 
--prodtype: fedora,ol8,rhcos4,rhel8,rhel9,rhv4
-+prodtype: fedora,ol8,rhcos4,rhel8,almalinux8,rhel9,rhv4
- 
- title: 'Configure System Cryptography Policy'
- 
 diff --git a/tests/unit/ssg-module/test_playbook_builder_data/guide/configure_crypto_policy/tests/config_and_current_same_time.pass.sh b/tests/unit/ssg-module/test_playbook_builder_data/guide/configure_crypto_policy/tests/config_and_current_same_time.pass.sh
 index b607202c5..621420882 100644
 --- a/tests/unit/ssg-module/test_playbook_builder_data/guide/configure_crypto_policy/tests/config_and_current_same_time.pass.sh
@@ -27146,18 +27273,6 @@ index 9461c3ddd..5b5b06ac9 100644
  # profiles = xccdf_org.ssgproject.content_profile_ospp, xccdf_org.ssgproject.content_profile_standard
  # packages = crypto-policies-scripts
  
-diff --git a/tests/unit/ssg-module/test_playbook_builder_data/guide/package_abrt_removed/rule.yml b/tests/unit/ssg-module/test_playbook_builder_data/guide/package_abrt_removed/rule.yml
-index 5becd90b7..976bc6a85 100644
---- a/tests/unit/ssg-module/test_playbook_builder_data/guide/package_abrt_removed/rule.yml
-+++ b/tests/unit/ssg-module/test_playbook_builder_data/guide/package_abrt_removed/rule.yml
-@@ -1,6 +1,6 @@
- documentation_complete: true
- 
--prodtype: fedora,ol7,ol8,rhel7,rhel8,rhel9
-+prodtype: fedora,ol7,ol8,rhel7,rhel8,almalinux8,rhel9
- 
- title: 'Uninstall Automatic Bug Reporting Tool (abrt)'
- 
 diff --git a/tests/unit/ssg-module/test_playbook_builder_data/guide/selinux_state/ansible/shared.yml b/tests/unit/ssg-module/test_playbook_builder_data/guide/selinux_state/ansible/shared.yml
 index 1c1560a86..fc86b614e 100644
 --- a/tests/unit/ssg-module/test_playbook_builder_data/guide/selinux_state/ansible/shared.yml
@@ -27178,19 +27293,6 @@ index 10ecee505..3d3098f4e 100644
  # reboot = true
  # strategy = restrict
  # complexity = low
-diff --git a/tests/unit/ssg-module/test_playbook_builder_data/rules/selinux_state.yml b/tests/unit/ssg-module/test_playbook_builder_data/rules/selinux_state.yml
-index 64e6cee7f..7bcd15189 100644
---- a/tests/unit/ssg-module/test_playbook_builder_data/rules/selinux_state.yml
-+++ b/tests/unit/ssg-module/test_playbook_builder_data/rules/selinux_state.yml
-@@ -14,7 +14,7 @@ ocil_clause: SELINUX is not set to enforcing
- oval_external_content: null
- platforms:
-   - machine
--prodtype: rhel7,rhel8,fedora,ol7,ol8,rhv4
-+prodtype: rhel7,rhel8,almalinux8,fedora,ol7,ol8,rhv4
- rationale: 'Setting the SELinux state to enforcing ensures SELinux is able to confine
- 
-   potentially compromised processes to the security policy, which is designed to
 diff --git a/tests/unit/ssg_test_suite/data/correct.pass.sh b/tests/unit/ssg_test_suite/data/correct.pass.sh
 index 8e5e284ee..ce1b79416 100644
 --- a/tests/unit/ssg_test_suite/data/correct.pass.sh
@@ -27204,13 +27306,13 @@ index 8e5e284ee..ce1b79416 100644
  # remediation = none
  # variables = var_password_pam_remember=5,var_password_pam_remember_control_flag=requisite
 diff --git a/utils/ansible_playbook_to_role.py b/utils/ansible_playbook_to_role.py
-index 60eaf4402..c55660e35 100755
+index e9a7a9618..fcd81b2c0 100755
 --- a/utils/ansible_playbook_to_role.py
 +++ b/utils/ansible_playbook_to_role.py
-@@ -58,6 +58,7 @@ yaml.add_constructor(_mapping_tag, dict_constructor)
- PRODUCT_ALLOWLIST = set([
+@@ -66,6 +66,7 @@ PRODUCT_ALLOWLIST = set([
      "rhel7",
      "rhel8",
+     "rhel9",
 +    "almalinux8",
  ])