diff --git a/files/scap-security-guide-add-almalinux8-product.patch b/files/scap-security-guide-add-almalinux8-product.patch index fe6a9ec..1f84c4f 100644 --- a/files/scap-security-guide-add-almalinux8-product.patch +++ b/files/scap-security-guide-add-almalinux8-product.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a31014247..ac0084aea 100644 +index c16a3d91c..d9fdb0cec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,7 +90,7 @@ option(SSG_PRODUCT_DEFAULT "If enabled, all default release products will be bui @@ -11,7 +11,7 @@ index a31014247..ac0084aea 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}) -@@ -328,7 +328,7 @@ message(STATUS "Products:") +@@ -331,7 +331,7 @@ message(STATUS "Products:") message(STATUS "Amazon Linux 2023: ${SSG_PRODUCT_AL2023}") message(STATUS "Alibaba Cloud Linux 2: ${SSG_PRODUCT_ALINUX2}") message(STATUS "Alibaba Cloud Linux 3: ${SSG_PRODUCT_ALINUX3}") @@ -20,7 +20,7 @@ index a31014247..ac0084aea 100644 message(STATUS "Anolis OS 8: ${SSG_PRODUCT_ANOLIS8}") message(STATUS "Anolis OS 23: ${SSG_PRODUCT_ANOLIS23}") message(STATUS "Chromium: ${SSG_PRODUCT_CHROMIUM}") -@@ -394,8 +394,8 @@ endif() +@@ -396,8 +396,8 @@ endif() if(SSG_PRODUCT_ALINUX3) add_subdirectory("products/alinux3" "alinux3") endif() @@ -32,10 +32,10 @@ index a31014247..ac0084aea 100644 if(SSG_PRODUCT_ANOLIS8) add_subdirectory("products/anolis8" "anolis8") diff --git a/build_product b/build_product -index 90b25237e..891825861 100755 +index 567375462..8085f62ef 100755 --- a/build_product +++ b/build_product -@@ -364,7 +364,7 @@ all_cmake_products=( +@@ -356,7 +356,7 @@ all_cmake_products=( AL2023 ALINUX2 ALINUX3 @@ -45,7 +45,7 @@ index 90b25237e..891825861 100755 ANOLIS8 CHROMIUM diff --git a/cmake/SSGCommon.cmake b/cmake/SSGCommon.cmake -index 81ff323b8..81458461f 100644 +index 0a8b98d6c..1e4f115d4 100644 --- a/cmake/SSGCommon.cmake +++ b/cmake/SSGCommon.cmake @@ -811,7 +811,7 @@ macro(ssg_build_product PRODUCT) @@ -58,592 +58,193 @@ index 81ff323b8..81458461f 100644 add_dependencies(${PRODUCT} generate-ssg-delta-${PRODUCT}-stig) endif() diff --git a/controls/anssi.yml b/controls/anssi.yml -index 86b84a044..2d04a7814 100644 +index dfd95d3c8..936e30d0c 100644 --- a/controls/anssi.yml +++ b/controls/anssi.yml -@@ -806,10 +806,8 @@ controls: - ANSSI doesn't specify the length of the inactivity period, we are choosing 10 minutes as reasonable number. - status: automated - rules: -- {{% if "rhel" in product or "ol" in families %}} - - logind_session_timeout - - var_logind_session_timeout=10_minutes -- {{% endif %}} - - accounts_tmout - - var_accounts_tmout=10_min +@@ -1254,7 +1254,7 @@ controls: + - ensure_gpgcheck_never_disabled + - ensure_gpgcheck_globally_activated + - ensure_gpgcheck_local_packages +- - ensure_redhat_gpgkey_installed ++ - ensure_almalinux_gpgkey_installed + - ensure_oracle_gpgkey_installed + - ensure_almalinux_gpgkey_installed -@@ -1246,7 +1244,7 @@ controls: - - ensure_gpgcheck_never_disabled - - ensure_gpgcheck_globally_activated - - ensure_gpgcheck_local_packages -- - ensure_redhat_gpgkey_installed -+ - ensure_almalinux_gpgkey_installed - - ensure_oracle_gpgkey_installed - - ensure_almalinux_gpgkey_installed - -@@ -1298,10 +1296,6 @@ controls: - - package_rsh_removed - - package_rsh-server_removed - - package_sendmail_removed -- {{%- if "rhel" not in product %}} -- - package_talk_removed -- - package_talk-server_removed -- {{%- endif %}} - - package_telnet_removed - - package_telnet-server_removed - - package_tftp_removed diff --git a/controls/cis_almalinux9.yml b/controls/cis_almalinux9.yml -index 4591f52c6..670d0b14f 100644 +index 73d3a0474..836bb6b3c 100644 --- a/controls/cis_almalinux9.yml +++ b/controls/cis_almalinux9.yml -@@ -360,7 +360,7 @@ controls: - - l1_workstation - status: manual - related_rules: -- - ensure_redhat_gpgkey_installed -+ - ensure_almalinux_gpgkey_installed +@@ -363,7 +363,7 @@ controls: + - l1_workstation + status: manual + related_rules: +- - ensure_redhat_gpgkey_installed ++ - ensure_almalinux_gpgkey_installed - - id: 1.2.1.2 - title: Ensure gpgcheck is globally activated (Automated) + - id: 1.2.1.2 + title: Ensure gpgcheck is globally activated (Automated) diff --git a/controls/cis_rhel10.yml b/controls/cis_rhel10.yml -index 8a3fd6b86..e1a46a905 100644 +index e0b5a9530..89ab69a5d 100644 --- a/controls/cis_rhel10.yml +++ b/controls/cis_rhel10.yml -@@ -303,7 +303,7 @@ controls: - - l1_workstation - status: manual - related_rules: -- - ensure_redhat_gpgkey_installed -+ - ensure_almalinux_gpgkey_installed +@@ -305,7 +305,7 @@ controls: + - l1_workstation + status: manual + related_rules: +- - ensure_redhat_gpgkey_installed ++ - ensure_almalinux_gpgkey_installed - - id: 1.2.1.2 - title: Ensure gpgcheck is globally activated (Automated) + - id: 1.2.1.2 + title: Ensure gpgcheck is globally activated (Automated) diff --git a/controls/cis_rhel8.yml b/controls/cis_rhel8.yml -index 05152b5b8..fa73354e0 100644 +index a3365c4ea..12ab44ac0 100644 --- a/controls/cis_rhel8.yml +++ b/controls/cis_rhel8.yml -@@ -353,7 +353,7 @@ controls: - - l1_workstation - status: manual - related_rules: -- - ensure_redhat_gpgkey_installed -+ - ensure_almalinux_gpgkey_installed +@@ -356,7 +356,7 @@ controls: + - l1_workstation + status: manual + related_rules: +- - ensure_redhat_gpgkey_installed ++ - ensure_almalinux_gpgkey_installed - - id: 1.2.2 - title: Ensure gpgcheck is globally activated (Automated) + - id: 1.2.2 + title: Ensure gpgcheck is globally activated (Automated) diff --git a/controls/cis_rhel9.yml b/controls/cis_rhel9.yml -index 017acb8d4..d97bb7c0b 100644 +index 7a200b8b8..c94146de5 100644 --- a/controls/cis_rhel9.yml +++ b/controls/cis_rhel9.yml -@@ -360,7 +360,7 @@ controls: - - l1_workstation - status: manual - related_rules: -- - ensure_redhat_gpgkey_installed -+ - ensure_almalinux_gpgkey_installed +@@ -363,7 +363,7 @@ controls: + - l1_workstation + status: manual + related_rules: +- - ensure_redhat_gpgkey_installed ++ - ensure_almalinux_gpgkey_installed - - id: 1.2.1.2 - title: Ensure gpgcheck is globally activated (Automated) + - id: 1.2.1.2 + title: Ensure gpgcheck is globally activated (Automated) diff --git a/controls/e8.yml b/controls/e8.yml -index dac6a8c85..640cd37c0 100644 +index eecf857ad..4000844eb 100644 --- a/controls/e8.yml +++ b/controls/e8.yml @@ -24,7 +24,7 @@ controls: - - service_avahi-daemon_disabled - - package_squid_removed - - service_squid_disabled -- - ensure_redhat_gpgkey_installed -+ - ensure_almalinux_gpgkey_installed - - ensure_gpgcheck_never_disabled - - ensure_gpgcheck_local_packages - - ensure_gpgcheck_globally_activated + - service_avahi-daemon_disabled + - package_squid_removed + - service_squid_disabled +- - ensure_redhat_gpgkey_installed ++ - ensure_almalinux_gpgkey_installed + - ensure_gpgcheck_never_disabled + - ensure_gpgcheck_local_packages + - ensure_gpgcheck_globally_activated diff --git a/controls/hipaa.yml b/controls/hipaa.yml -index 27895b700..a34683373 100644 +index 0f5470740..f0b1b567a 100644 --- a/controls/hipaa.yml +++ b/controls/hipaa.yml -@@ -167,7 +167,7 @@ controls: - - ensure_gpgcheck_local_packages - - ensure_gpgcheck_never_disabled - - ensure_gpgcheck_repo_metadata -- - ensure_redhat_gpgkey_installed -+ - ensure_almalinux_gpgkey_installed - - ensure_suse_gpgkey_installed - - ensure_almalinux_gpgkey_installed - status: automated +@@ -170,7 +170,7 @@ controls: + - ensure_gpgcheck_local_packages + - ensure_gpgcheck_never_disabled + - ensure_gpgcheck_repo_metadata +- - ensure_redhat_gpgkey_installed ++ - ensure_almalinux_gpgkey_installed + - ensure_suse_gpgkey_installed + - ensure_almalinux_gpgkey_installed + status: automated @@ -1388,7 +1388,7 @@ controls: - - ensure_gpgcheck_local_packages - - ensure_gpgcheck_never_disabled - - ensure_gpgcheck_repo_metadata -- - ensure_redhat_gpgkey_installed -+ - ensure_almalinux_gpgkey_installed - - ensure_suse_gpgkey_installed - - ensure_almalinux_gpgkey_installed - status: automated + - ensure_gpgcheck_local_packages + - ensure_gpgcheck_never_disabled + - ensure_gpgcheck_repo_metadata +- - ensure_redhat_gpgkey_installed ++ - ensure_almalinux_gpgkey_installed + - ensure_suse_gpgkey_installed + - ensure_almalinux_gpgkey_installed + status: automated @@ -1419,7 +1419,7 @@ controls: - - ensure_gpgcheck_local_packages - - ensure_gpgcheck_never_disabled - - ensure_gpgcheck_repo_metadata -- - ensure_redhat_gpgkey_installed -+ - ensure_almalinux_gpgkey_installed - - ensure_suse_gpgkey_installed - - ensure_almalinux_gpgkey_installed - status: automated + - ensure_gpgcheck_local_packages + - ensure_gpgcheck_never_disabled + - ensure_gpgcheck_repo_metadata +- - ensure_redhat_gpgkey_installed ++ - ensure_almalinux_gpgkey_installed + - ensure_suse_gpgkey_installed + - ensure_almalinux_gpgkey_installed + status: automated @@ -1439,7 +1439,7 @@ controls: - - ensure_gpgcheck_local_packages - - ensure_gpgcheck_never_disabled - - ensure_gpgcheck_repo_metadata -- - ensure_redhat_gpgkey_installed -+ - ensure_almalinux_gpgkey_installed - - ensure_suse_gpgkey_installed - - ensure_almalinux_gpgkey_installed - status: automated + - ensure_gpgcheck_local_packages + - ensure_gpgcheck_never_disabled + - ensure_gpgcheck_repo_metadata +- - ensure_redhat_gpgkey_installed ++ - ensure_almalinux_gpgkey_installed + - ensure_suse_gpgkey_installed + - ensure_almalinux_gpgkey_installed + status: automated @@ -1720,7 +1720,7 @@ controls: - - ensure_gpgcheck_local_packages - - ensure_gpgcheck_never_disabled - - ensure_gpgcheck_repo_metadata -- - ensure_redhat_gpgkey_installed -+ - ensure_almalinux_gpgkey_installed - - ensure_suse_gpgkey_installed - - ensure_almalinux_gpgkey_installed - status: automated + - ensure_gpgcheck_local_packages + - ensure_gpgcheck_never_disabled + - ensure_gpgcheck_repo_metadata +- - ensure_redhat_gpgkey_installed ++ - ensure_almalinux_gpgkey_installed + - ensure_suse_gpgkey_installed + - ensure_almalinux_gpgkey_installed + status: automated diff --git a/controls/ospp.yml b/controls/ospp.yml -index 505f7b2a7..e67bf76d1 100644 +index e89695d35..2b7ca819f 100644 --- a/controls/ospp.yml +++ b/controls/ospp.yml -@@ -447,7 +447,7 @@ controls: - - ensure_gpgcheck_globally_activated - - ensure_gpgcheck_local_packages - - ensure_gpgcheck_never_disabled -- - ensure_redhat_gpgkey_installed -+ - ensure_almalinux_gpgkey_installed - status: automated +@@ -446,7 +446,7 @@ controls: + - ensure_gpgcheck_globally_activated + - ensure_gpgcheck_local_packages + - ensure_gpgcheck_never_disabled +- - ensure_redhat_gpgkey_installed ++ - ensure_almalinux_gpgkey_installed + status: automated - - id: FPT_TUD_EXT.2 -@@ -461,7 +461,7 @@ controls: - - ensure_gpgcheck_globally_activated - - ensure_gpgcheck_local_packages - - ensure_gpgcheck_never_disabled -- - ensure_redhat_gpgkey_installed -+ - ensure_almalinux_gpgkey_installed - status: automated + - id: FPT_TUD_EXT.2 +@@ -460,7 +460,7 @@ controls: + - ensure_gpgcheck_globally_activated + - ensure_gpgcheck_local_packages + - ensure_gpgcheck_never_disabled +- - ensure_redhat_gpgkey_installed ++ - ensure_almalinux_gpgkey_installed + status: automated - - id: FPT_TST_EXT.1 + - id: FPT_TST_EXT.1 diff --git a/controls/pcidss_4.yml b/controls/pcidss_4.yml -index 1bdd27a73..111e3a773 100644 +index 93fd91189..eb1661cf7 100644 --- a/controls/pcidss_4.yml +++ b/controls/pcidss_4.yml @@ -1555,7 +1555,7 @@ controls: - - base - status: automated + - base + status: automated + rules: +- - ensure_redhat_gpgkey_installed ++ - ensure_almalinux_gpgkey_installed + - ensure_suse_gpgkey_installed + - ensure_almalinux_gpgkey_installed + - ensure_gpgcheck_globally_activated +diff --git a/controls/stig_rhel8.yml b/controls/stig_rhel8.yml +index f2a86329b..c34f4155e 100644 +--- a/controls/stig_rhel8.yml ++++ b/controls/stig_rhel8.yml +@@ -3171,7 +3171,7 @@ controls: + - medium + title: RHEL 8 must ensure cryptographic verification of vendor software packages. rules: -- - ensure_redhat_gpgkey_installed -+ - ensure_almalinux_gpgkey_installed - - ensure_suse_gpgkey_installed - - ensure_almalinux_gpgkey_installed - - ensure_gpgcheck_globally_activated +- - ensure_redhat_gpgkey_installed ++ - ensure_almalinux_gpgkey_installed + status: automated + + - id: RHEL-08-010358 diff --git a/controls/stig_rhel9.yml b/controls/stig_rhel9.yml -index f66299e6f..5448dee70 100644 +index b250bbd3b..dc81aa6bb 100644 --- a/controls/stig_rhel9.yml +++ b/controls/stig_rhel9.yml -@@ -382,7 +382,7 @@ controls: - - medium - title: RHEL 9 must ensure cryptographic verification of vendor software packages. - rules: -- - ensure_redhat_gpgkey_installed -+ - ensure_almalinux_gpgkey_installed - status: automated +@@ -362,7 +362,7 @@ controls: + - medium + title: RHEL 9 must ensure cryptographic verification of vendor software packages. + rules: +- - ensure_redhat_gpgkey_installed ++ - ensure_almalinux_gpgkey_installed + 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 8a54d4697..6abfb9de5 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 -@@ -58,7 +58,7 @@ references: - 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-000064-GPOS-00033,SRG-OS-000466-GPOS-00210,SRG-OS-000458-GPOS-00203,SRG-APP-000091-CTR-000160,SRG-APP-000492-CTR-001220,SRG-APP-000493-CTR-001225,SRG-APP-000494-CTR-001230,SRG-APP-000500-CTR-001260,SRG-APP-000507-CTR-001295,SRG-APP-000495-CTR-001235,SRG-APP-000499-CTR-001255 - stigid@ol7: OL07-00-030410 - stigid@ol8: OL08-00-030490 -- 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 e94eb91e5..377410917 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 -@@ -58,7 +58,7 @@ references: - 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-000064-GPOS-00033,SRG-OS-000466-GPOS-00210,SRG-OS-000458-GPOS-00203,SRG-OS-000474-GPOS-00219,SRG-APP-000091-CTR-000160,SRG-APP-000492-CTR-001220,SRG-APP-000493-CTR-001225,SRG-APP-000494-CTR-001230,SRG-APP-000500-CTR-001260,SRG-APP-000507-CTR-001295,SRG-APP-000495-CTR-001235,SRG-APP-000499-CTR-001255 - stigid@ol7: OL07-00-030370 - stigid@ol8: OL08-00-030480 -- 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 ed9ccaa76..02f8ffca8 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 -@@ -55,7 +55,7 @@ references: - 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-000064-GPOS-00033,SRG-OS-000466-GPOS-00210,SRG-OS-000458-GPOS-00203,SRG-APP-000091-CTR-000160,SRG-APP-000492-CTR-001220,SRG-APP-000493-CTR-001225,SRG-APP-000494-CTR-001230,SRG-APP-000500-CTR-001260,SRG-APP-000507-CTR-001295,SRG-APP-000495-CTR-001235,SRG-APP-000499-CTR-001255 - stigid@ol7: OL07-00-030410 - stigid@ol8: OL08-00-030490 -- 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_fchmodat/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchmodat/rule.yml -index f80d38457..2fd6f46d2 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 -@@ -55,7 +55,7 @@ references: - 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-000064-GPOS-00033,SRG-OS-000466-GPOS-00210,SRG-OS-000458-GPOS-00203,SRG-APP-000091-CTR-000160,SRG-APP-000492-CTR-001220,SRG-APP-000493-CTR-001225,SRG-APP-000494-CTR-001230,SRG-APP-000500-CTR-001260,SRG-APP-000507-CTR-001295,SRG-APP-000495-CTR-001235,SRG-APP-000499-CTR-001255 - stigid@ol7: OL07-00-030410 - stigid@ol8: OL08-00-030490 -- 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_fchown/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchown/rule.yml -index fd22549ec..209c4c7e7 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 -@@ -58,7 +58,7 @@ references: - 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-000064-GPOS-00033,SRG-OS-000466-GPOS-00210,SRG-OS-000458-GPOS-00203,SRG-OS-000474-GPOS-00219,SRG-APP-000091-CTR-000160,SRG-APP-000492-CTR-001220,SRG-APP-000493-CTR-001225,SRG-APP-000494-CTR-001230,SRG-APP-000500-CTR-001260,SRG-APP-000507-CTR-001295,SRG-APP-000495-CTR-001235,SRG-APP-000499-CTR-001255 - stigid@ol7: OL07-00-030370 - stigid@ol8: OL08-00-030480 -- 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_fchownat/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fchownat/rule.yml -index 2a85939aa..13daa8af2 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 -@@ -55,7 +55,7 @@ references: - 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-000064-GPOS-00033,SRG-OS-000466-GPOS-00210,SRG-OS-000458-GPOS-00203,SRG-OS-000474-GPOS-00219,SRG-APP-000091-CTR-000160,SRG-APP-000492-CTR-001220,SRG-APP-000493-CTR-001225,SRG-APP-000494-CTR-001230,SRG-APP-000500-CTR-001260,SRG-APP-000507-CTR-001295,SRG-APP-000495-CTR-001235,SRG-APP-000499-CTR-001255 - stigid@ol7: OL07-00-030370 - stigid@ol8: OL08-00-030480 -- 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_fremovexattr/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_fremovexattr/rule.yml -index ec82c00b2..2cf8f93c2 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 -@@ -72,7 +72,7 @@ references: - srg: SRG-OS-000037-GPOS-00015,SRG-OS-000042-GPOS-00020,SRG-OS-000062-GPOS-00031,SRG-OS-000392-GPOS-00172,SRG-OS-000458-GPOS-00203,SRG-OS-000462-GPOS-00206,SRG-OS-000463-GPOS-00207,SRG-OS-000471-GPOS-00215,SRG-OS-000474-GPOS-00219,SRG-OS-000466-GPOS-00210,SRG-OS-000468-GPOS-00212,SRG-OS-000064-GPOS-00033,SRG-APP-000091-CTR-000160,SRG-APP-000492-CTR-001220,SRG-APP-000493-CTR-001225,SRG-APP-000494-CTR-001230,SRG-APP-000500-CTR-001260,SRG-APP-000507-CTR-001295,SRG-APP-000495-CTR-001235,SRG-APP-000496-CTR-001240,SRG-APP-000497-CTR-001245,SRG-APP-000498-CTR-001250,SRG-APP-000499-CTR-001255 - stigid@ol7: OL07-00-030440 - stigid@ol8: OL08-00-030200 -- 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 d67e6540a..538c1ac54 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 -@@ -67,7 +67,7 @@ references: - srg: SRG-OS-000037-GPOS-00015,SRG-OS-000042-GPOS-00020,SRG-OS-000062-GPOS-00031,SRG-OS-000392-GPOS-00172,SRG-OS-000458-GPOS-00203,SRG-OS-000462-GPOS-00206,SRG-OS-000463-GPOS-00207,SRG-OS-000466-GPOS-00210,SRG-OS-000468-GPOS-00212,SRG-OS-000471-GPOS-00215,SRG-OS-000474-GPOS-00219,SRG-OS-000064-GPOS-00033,SRG-APP-000091-CTR-000160,SRG-APP-000492-CTR-001220,SRG-APP-000493-CTR-001225,SRG-APP-000494-CTR-001230,SRG-APP-000500-CTR-001260,SRG-APP-000507-CTR-001295,SRG-APP-000495-CTR-001235,SRG-APP-000496-CTR-001240,SRG-APP-000497-CTR-001245,SRG-APP-000498-CTR-001250,SRG-APP-000501-CTR-001265,SRG-APP-000502-CTR-001270 - stigid@ol7: OL07-00-030440 - stigid@ol8: OL08-00-030200 -- 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 cad1fe481..600f7c63c 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 -@@ -58,7 +58,7 @@ references: - 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-000064-GPOS-00033,SRG-OS-000466-GPOS-00210,SRG-OS-000458-GPOS-00203,SRG-OS-000474-GPOS-00219,SRG-APP-000091-CTR-000160,SRG-APP-000492-CTR-001220,SRG-APP-000493-CTR-001225,SRG-APP-000494-CTR-001230,SRG-APP-000500-CTR-001260,SRG-APP-000507-CTR-001295,SRG-APP-000495-CTR-001235,SRG-APP-000499-CTR-001255 - stigid@ol7: OL07-00-030370 - stigid@ol8: OL08-00-030480 -- 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_lremovexattr/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_dac_actions/audit_rules_dac_modification_lremovexattr/rule.yml -index 4ee5f6e63..98a3e1acb 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 -@@ -72,7 +72,7 @@ references: - srg: SRG-OS-000037-GPOS-00015,SRG-OS-000042-GPOS-00020,SRG-OS-000062-GPOS-00031,SRG-OS-000392-GPOS-00172,SRG-OS-000458-GPOS-00203,SRG-OS-000462-GPOS-00206,SRG-OS-000463-GPOS-00207,SRG-OS-000468-GPOS-00212,SRG-OS-000471-GPOS-00215,SRG-OS-000474-GPOS-00219,SRG-OS-000466-GPOS-00210,SRG-OS-000064-GPOS-00033,SRG-APP-000091-CTR-000160,SRG-APP-000492-CTR-001220,SRG-APP-000493-CTR-001225,SRG-APP-000494-CTR-001230,SRG-APP-000500-CTR-001260,SRG-APP-000507-CTR-001295,SRG-APP-000495-CTR-001235,SRG-APP-000496-CTR-001240,SRG-APP-000497-CTR-001245,SRG-APP-000498-CTR-001250,SRG-APP-000499-CTR-001255,SRG-APP-000501-CTR-001265,SRG-APP-000502-CTR-001270 - stigid@ol7: OL07-00-030440 - stigid@ol8: OL08-00-030200 -- 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 cb73837d1..fcac4c289 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 -@@ -67,7 +67,7 @@ references: - srg: SRG-OS-000037-GPOS-00015,SRG-OS-000042-GPOS-00020,SRG-OS-000062-GPOS-00031,SRG-OS-000392-GPOS-00172,SRG-OS-000458-GPOS-00203,SRG-OS-000462-GPOS-00206,SRG-OS-000463-GPOS-00207,SRG-OS-000466-GPOS-00210,SRG-OS-000468-GPOS-00212,SRG-OS-000471-GPOS-00215,SRG-OS-000474-GPOS-00219,SRG-OS-000064-GPOS-00033,SRG-APP-000091-CTR-000160,SRG-APP-000492-CTR-001220,SRG-APP-000493-CTR-001225,SRG-APP-000494-CTR-001230,SRG-APP-000500-CTR-001260,SRG-APP-000507-CTR-001295,SRG-APP-000495-CTR-001235,SRG-APP-000496-CTR-001240,SRG-APP-000497-CTR-001245,SRG-APP-000498-CTR-001250,SRG-APP-000501-CTR-001265,SRG-APP-000502-CTR-001270 - stigid@ol7: OL07-00-030440 - stigid@ol8: OL08-00-030200 -- 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 5047f8dbb..cc7ef99c9 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 -@@ -71,7 +71,7 @@ references: - srg: SRG-OS-000037-GPOS-00015,SRG-OS-000042-GPOS-00020,SRG-OS-000062-GPOS-00031,SRG-OS-000392-GPOS-00172,SRG-OS-000458-GPOS-00203,SRG-OS-000462-GPOS-00206,SRG-OS-000463-GPOS-00207,SRG-OS-000468-GPOS-00212,SRG-OS-000471-GPOS-00215,SRG-OS-000474-GPOS-00219,SRG-OS-000466-GPOS-00210,SRG-OS-000064-GPOS-00033,SRG-APP-000091-CTR-000160,SRG-APP-000492-CTR-001220,SRG-APP-000493-CTR-001225,SRG-APP-000494-CTR-001230,SRG-APP-000500-CTR-001260,SRG-APP-000507-CTR-001295,SRG-APP-000495-CTR-001235,SRG-APP-000496-CTR-001240,SRG-APP-000497-CTR-001245,SRG-APP-000498-CTR-001250,SRG-APP-000499-CTR-001255,SRG-APP-000501-CTR-001265,SRG-APP-000502-CTR-001270 - stigid@ol7: OL07-00-030440 - stigid@ol8: OL08-00-030200 -- 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 ced035028..295a0bde4 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 -@@ -67,7 +67,7 @@ references: - 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-000466-GPOS-00210,SRG-OS-000471-GPOS-00215,SRG-OS-000064-GPOS-00033,SRG-OS-000458-GPOS-00203,SRG-APP-000091-CTR-000160,SRG-APP-000492-CTR-001220,SRG-APP-000493-CTR-001225,SRG-APP-000494-CTR-001230,SRG-APP-000500-CTR-001260,SRG-APP-000507-CTR-001295,SRG-APP-000495-CTR-001235 - stigid@ol7: OL07-00-030440 - stigid@ol8: OL08-00-030200 -- 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 1ad9716de..101e985d2 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 -@@ -29,7 +29,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 283887b06..d21cac99d 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 -@@ -28,7 +28,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 d856df92b..893d7c84d 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 -@@ -44,7 +44,7 @@ references: - 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-000468-GPOS-00212,SRG-OS-000471-GPOS-00215,SRG-OS-000463-GPOS-00207,SRG-OS-000465-GPOS-00209,SRG-APP-000495-CTR-001235,SRG-APP-000496-CTR-001240,SRG-APP-000497-CTR-001245,SRG-APP-000498-CTR-001250,SRG-APP-000501-CTR-001265,SRG-APP-000502-CTR-001270 - stigid@ol7: OL07-00-030580 - stigid@ol8: OL08-00-030260 -- 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_semanage/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_execution_selinux_commands/audit_rules_execution_semanage/rule.yml -index 3d2d16cbf..bbff02dba 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 -@@ -41,7 +41,7 @@ references: - 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-000463-GPOS-00207,SRG-OS-000465-GPOS-00209,SRG-APP-000495-CTR-001235,SRG-APP-000496-CTR-001240,SRG-APP-000497-CTR-001245,SRG-APP-000498-CTR-001250 - stigid@ol7: OL07-00-030560 - stigid@ol8: OL08-00-030313 -- 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 96d7cc39f..9f17b86c4 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 -@@ -31,7 +31,7 @@ references: - 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-000463-GPOS-00207,SRG-OS-000465-GPOS-00209,SRG-APP-000495-CTR-001235,SRG-APP-000496-CTR-001240,SRG-APP-000497-CTR-001245,SRG-APP-000498-CTR-001250 - stigid@ol7: OL07-00-030590 - stigid@ol8: OL08-00-030314 -- 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 64b708da8..ae0fdbb9d 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 -@@ -40,7 +40,7 @@ references: - 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-000463-GPOS-00207,SRG-OS-000465-GPOS-00209,SRG-APP-000495-CTR-001235,SRG-APP-000496-CTR-001240,SRG-APP-000497-CTR-001245,SRG-APP-000498-CTR-001250 - stigid@ol7: OL07-00-030570 - stigid@ol8: OL08-00-030316 -- 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_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 d5ea2c39d..0fb547f36 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 -@@ -53,7 +53,7 @@ references: - 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-OS-000467-GPOS-00211,SRG-OS-000468-GPOS-00212,SRG-APP-000495-CTR-001235,SRG-APP-000499-CTR-001255,SRG-APP-000501-CTR-001265,SRG-APP-000502-CTR-001270 - stigid@ol7: OL07-00-030910 - stigid@ol8: OL08-00-030361 -- 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 1e6abacb0..ee116dee4 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 -@@ -50,7 +50,7 @@ references: - 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-OS-000467-GPOS-00211,SRG-OS-000468-GPOS-00212,SRG-APP-000495-CTR-001235,SRG-APP-000499-CTR-001255,SRG-APP-000501-CTR-001265,SRG-APP-000502-CTR-001270 - stigid@ol7: OL07-00-030910 - stigid@ol8: OL08-00-030361 -- 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 355f08fbc..1d3df69df 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 -@@ -48,7 +48,7 @@ references: - 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-OS-000467-GPOS-00211,SRG-OS-000468-GPOS-00212,SRG-APP-000495-CTR-001235,SRG-APP-000499-CTR-001255,SRG-APP-000501-CTR-001265,SRG-APP-000502-CTR-001270 - stigid@ol7: OL07-00-030910 - stigid@ol8: OL08-00-030361 -- 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 b53d4ac72..d7815a931 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 -@@ -53,7 +53,7 @@ references: - 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-OS-000467-GPOS-00211,SRG-OS-000468-GPOS-00212,SRG-APP-000495-CTR-001235,SRG-APP-000499-CTR-001255,SRG-APP-000501-CTR-001265,SRG-APP-000502-CTR-001270 - stigid@ol7: OL07-00-030910 - stigid@ol8: OL08-00-030361 -- 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 d3d204917..c4035be9a 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 -@@ -50,7 +50,7 @@ references: - 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-OS-000467-GPOS-00211,SRG-OS-000468-GPOS-00212,SRG-APP-000495-CTR-001235,SRG-APP-000499-CTR-001255,SRG-APP-000501-CTR-001265,SRG-APP-000502-CTR-001270 - stigid@ol7: OL07-00-030910 - stigid@ol8: OL08-00-030361 -- 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_creat/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_creat/rule.yml -index a53d5291d..ef6abb9c6 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 -@@ -62,7 +62,7 @@ references: - 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-000064-GPOS-00033,SRG-OS-000458-GPOS-00203,SRG-OS-000461-GPOS-00205,SRG-APP-000495-CTR-001235 - stigid@ol7: OL07-00-030510 - stigid@ol8: OL08-00-030420 -- 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_ftruncate/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_ftruncate/rule.yml -index aa15c9920..c4d0813a3 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 -@@ -62,7 +62,7 @@ references: - 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-000064-GPOS-00033,SRG-OS-000458-GPOS-00203,SRG-OS-000461-GPOS-00205,SRG-APP-000495-CTR-001235 - stigid@ol7: OL07-00-030510 - stigid@ol8: OL08-00-030420 -- 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/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open/rule.yml -index ab4461cd1..b5e215743 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 -@@ -65,7 +65,7 @@ references: - 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-000064-GPOS-00033,SRG-OS-000458-GPOS-00203,SRG-OS-000461-GPOS-00205,SRG-APP-000495-CTR-001235 - stigid@ol7: OL07-00-030510 - stigid@ol8: OL08-00-030420 -- 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 cb5d26e07..d7a3d6d9e 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 -@@ -54,7 +54,7 @@ references: - 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-000064-GPOS-00033,SRG-OS-000458-GPOS-00203,SRG-OS-000461-GPOS-00205,SRG-APP-000495-CTR-001235 - stigid@ol7: OL07-00-030510 - stigid@ol8: OL08-00-030420 -- 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_openat/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat/rule.yml -index 8ef8b4976..fff4ac288 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 -@@ -62,7 +62,7 @@ references: - 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-000064-GPOS-00033,SRG-OS-000458-GPOS-00203,SRG-OS-000461-GPOS-00205,SRG-APP-000495-CTR-001235 - stigid@ol7: OL07-00-030510 - stigid@ol8: OL08-00-030420 -- 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_truncate/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_truncate/rule.yml -index 24e9792b5..8c5731cfc 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 -@@ -61,7 +61,7 @@ references: - 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-000064-GPOS-00033,SRG-OS-000458-GPOS-00203,SRG-OS-000461-GPOS-00205,SRG-APP-000495-CTR-001235 - stigid@ol7: OL07-00-030510 - stigid@ol8: OL08-00-030420 -- 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 + - id: RHEL-09-214015 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 @@ -666,19 +267,6 @@ index 7c8e520c1..e5c1d9d93 100644 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 e50407102..d7042e140 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 -@@ -54,7 +54,7 @@ references: - 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-000471-GPOS-00216,SRG-OS-000477-GPOS-00222,SRG-APP-000495-CTR-001235,SRG-APP-000504-CTR-001280 - stigid@ol7: OL07-00-030830 - stigid@ol8: OL08-00-030390 -- 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..e709c4daf 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 @@ -701,19 +289,6 @@ index 639d76a21..7f4d463d6 100644 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 ba283b1a9..0caadc56b 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 -@@ -53,7 +53,7 @@ references: - 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-000471-GPOS-00216,SRG-OS-000477-GPOS-00222,SRG-APP-000495-CTR-001235,SRG-APP-000504-CTR-001280 - stigid@ol7: OL07-00-030820 - stigid@ol8: OL08-00-030360 -- 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..8605337d4 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 @@ -736,19 +311,6 @@ index 083a612a0..3228b89b7 100644 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 e75ff68de..9e5917632 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 -@@ -54,7 +54,7 @@ references: - 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-000471-GPOS-00216,SRG-OS-000477-GPOS-00222,SRG-APP-000495-CTR-001235,SRG-APP-000504-CTR-001280 - stigid@ol7: OL07-00-030820 - stigid@ol8: OL08-00-030360 -- 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..02be3e6f2 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 @@ -771,19 +333,6 @@ index 009564309..35ad01a74 100644 # 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_faillock/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/rule.yml -index f86edca7e..71f59dc4a 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 -@@ -39,7 +39,7 @@ references: - srg: SRG-OS-000392-GPOS-00172,SRG-OS-000470-GPOS-00214,SRG-OS-000473-GPOS-00218,SRG-APP-000503-CTR-001275,SRG-APP-000506-CTR-001290 - stigid@ol7: OL07-00-030610 - stigid@ol8: OL08-00-030590 -- 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 536e45f3a..6fc5182e2 100644 --- a/linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_cis.pass.sh @@ -928,19 +477,6 @@ index b15a095da..44c6a0115 100644 # variables = var_accounts_passwords_pam_faillock_dir=/var/run/faillock 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 5a6250df8..a51eb6d98 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 -@@ -41,7 +41,7 @@ references: - 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-000470-GPOS-00214,SRG-APP-000495-CTR-001235,SRG-APP-000503-CTR-001275,SRG-APP-000506-CTR-001290 - stigid@ol7: OL07-00-030620 - stigid@ol8: OL08-00-030600 -- 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/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 48bf48bd2..0c9d7c81e 100644 --- a/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/auditctl_default.fail.sh @@ -1153,60 +689,8 @@ index 2dba37605..c9684121a 100644 +# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Oracle Linux 7,Oracle Linux 8,multi_platform_ubuntu ./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_chage/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_chage/rule.yml -index e639a5125..73420f9ff 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 -@@ -44,7 +44,7 @@ references: - 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-000468-GPOS-00212,SRG-OS-000471-GPOS-00215,SRG-APP-000029-CTR-000085,SRG-APP-000495-CTR-001235,SRG-APP-000501-CTR-001265,SRG-APP-000502-CTR-001270 - stigid@ol7: OL07-00-030660 - stigid@ol8: OL08-00-030250 -- 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 fb79534fb..c3e97c421 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 -@@ -44,7 +44,7 @@ references: - 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@ol7: OL07-00-030720 - stigid@ol8: OL08-00-030410 -- 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 624cea581..794e22fdf 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 -@@ -43,7 +43,7 @@ references: - 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@ol7: OL07-00-030800 - stigid@ol8: OL08-00-030400 -- 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_gpasswd/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_gpasswd/rule.yml -index 4389958b9..a61089411 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 -@@ -44,7 +44,7 @@ references: - 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-000029-CTR-000085,SRG-APP-000495-CTR-001235 - stigid@ol7: OL07-00-030650 - stigid@ol8: OL08-00-030370 -- 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_insmod/ansible/shared.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_insmod/ansible/shared.yml -index 6c114c13c..5c5f7185c 100644 +index f0ea21841..6f744d05b 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 @@ @@ -1225,214 +709,6 @@ index f4fff8181..6c379ca01 100644 # 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 2ff20d0f5..6946a0aa8 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 -@@ -29,7 +29,7 @@ references: - 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-000471-GPOS-00216,SRG-OS-000477-GPOS-00222,SRG-APP-000495-CTR-001235,SRG-APP-000504-CTR-001280 - stigid@ol7: OL07-00-030840 - stigid@ol8: OL08-00-030580 -- 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_mount/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_mount/rule.yml -index 4ea1447b8..3099b843b 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 -@@ -33,7 +33,7 @@ references: - 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-000029-CTR-000085 - stigid@ol7: OL07-00-030740 - stigid@ol8: OL08-00-030300 -- 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_newgrp/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_newgrp/rule.yml -index 54d57f16f..3b190cb6e 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 -@@ -44,7 +44,7 @@ references: - 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-000029-CTR-000085,SRG-APP-000495-CTR-001235 - stigid@ol7: OL07-00-030710 - stigid@ol8: OL08-00-030350 -- 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_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 96c78b0cd..4c75b5bb6 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 -@@ -47,7 +47,7 @@ references: - 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-000029-CTR-000085,SRG-APP-000495-CTR-001235 - stigid@ol7: OL07-00-030810 - stigid@ol8: OL08-00-030340 -- 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 e484c2ab9..dc9fd0d0a 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 -@@ -42,7 +42,7 @@ references: - 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-000029-CTR-000085,SRG-APP-000495-CTR-001235 - stigid@ol7: OL07-00-030630 - stigid@ol8: OL08-00-030290 -- 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_postdrop/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_postdrop/rule.yml -index 0648bd704..d97263043 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 -@@ -41,7 +41,7 @@ references: - 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@ol7: OL07-00-030760 - stigid@ol8: OL08-00-030311 -- 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 737e2e757..2af34b992 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 -@@ -41,7 +41,7 @@ references: - 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@ol7: OL07-00-030770 - stigid@ol8: OL08-00-030312 -- 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_ssh_agent/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_ssh_agent/rule.yml -index 9f240785c..1976e8d19 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 -@@ -31,7 +31,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 ec3847394..8377f7a4d 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 -@@ -52,7 +52,7 @@ references: - 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-000029-CTR-000085,SRG-APP-000495-CTR-001235 - stigid@ol7: OL07-00-030780 - stigid@ol8: OL08-00-030320 -- 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_su/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_su/rule.yml -index 9c0cf28e1..b0a648750 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 -@@ -43,7 +43,7 @@ references: - 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-OS-000466-GPOS-00210,SRG-APP-000029-CTR-000085,SRG-APP-000495-CTR-001235,SRG-APP-000499-CTR-001255,SRG-OS-000755-GPOS-00220 - stigid@ol7: OL07-00-030680 - stigid@ol8: OL08-00-030190 -- 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 53462f837..f0bb13d88 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 -@@ -43,7 +43,7 @@ references: - 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-000029-CTR-000085,SRG-APP-000495-CTR-001235,SRG-APP-000499-CTR-001255,SRG-OS-000755-GPOS-00220 - stigid@ol7: OL07-00-030690 - stigid@ol8: OL08-00-030550 -- 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_umount/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_umount/rule.yml -index c394bccca..92abd6cf9 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 -@@ -42,7 +42,7 @@ references: - 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-000029-CTR-000085 - stigid@ol7: OL07-00-030750 - stigid@ol8: OL08-00-030301 -- 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 8ad16ded9..d383f8bc3 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 -@@ -50,7 +50,7 @@ references: - 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-000029-CTR-000085,SRG-APP-000495-CTR-001235 - stigid@ol7: OL07-00-030640 - stigid@ol8: OL08-00-030317 -- 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 58e79855e..1528edc4e 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 -@@ -28,7 +28,7 @@ identifiers: - references: - 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 ac93594cd..78144fc87 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 -@@ -39,7 +39,7 @@ references: - 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@ol7: OL07-00-030670 - stigid@ol8: OL08-00-030315 -- 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 deb5e11e2..9a558e0c8 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 -@@ -33,7 +33,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_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 @@ -1444,32 +720,6 @@ index 26d02c24e..28daa9106 100644 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 c6a7a6d5b..906e2cf00 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/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/audit_rules_immutable_login_uids/rule.yml -index 2bf61cdeb..1cc70952a 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 -@@ -31,7 +31,7 @@ identifiers: - references: - 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/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 @@ -1481,19 +731,6 @@ index 889f83178..7896d4cb1 100644 # reboot = true # strategy = restrict # complexity = low -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 bdaefe847..70f8cd70d 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 -@@ -53,7 +53,7 @@ references: - 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@ol7: OL07-00-030740 - stigid@ol8: OL08-00-030302 -- 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_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 @@ -1505,32 +742,6 @@ index 8b2377d44..39c2bba69 100644 # 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 755ca7cc0..ebb74f2ff 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 -@@ -25,7 +25,7 @@ identifiers: - references: - 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 6b62132f1..cb6f8397d 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 -@@ -25,7 +25,7 @@ identifiers: - references: - 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 9c5b7d2eb..cae43ea29 100644 --- a/linux_os/guide/auditing/auditd_configure_rules/audit_rules_suid_auid_privilege_function/ansible/shared.yml @@ -1542,12 +753,12 @@ index 9c5b7d2eb..cae43ea29 100644 # 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 d0626b7aa..71cc2ea03 100644 +index dd0efe72d..c3e8fc990 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,multi_platform_ubuntu -+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_ubuntu +-# platform = multi_platform_rhel,multi_platform_ubuntu,multi_platform_debian ++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_ubuntu,multi_platform_debian # First perform the remediation of the syscall rule # Retrieve hardware architecture of the underlying system @@ -1562,19 +773,6 @@ index 323a798b1..46fad7416 100644 # 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 c3c11058b..69d23bb71 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 -@@ -54,7 +54,7 @@ references: - srg: SRG-OS-000326-GPOS-00126,SRG-OS-000327-GPOS-00127,SRG-APP-000343-CTR-000780,SRG-APP-000381-CTR-000905,SRG-OS-000755-GPOS-00220 - stigid@ol7: OL07-00-030360 - stigid@ol8: OL08-00-030000 -- 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/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 @@ -1586,71 +784,6 @@ index 336beb2b7..26c47e462 100644 # reboot = true # strategy = restrict # complexity = low -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 d580edfe8..ac09998e1 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 -@@ -42,7 +42,7 @@ references: - 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@ol7: OL07-00-030871 - stigid@ol8: OL08-00-030170 -- 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 8eace6ca8..c47e005ba 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 -@@ -42,7 +42,7 @@ references: - 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@ol7: OL07-00-030872 - stigid@ol8: OL08-00-030160 -- 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 609cb0029..2c250d9ea 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 -@@ -43,7 +43,7 @@ references: - 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-000496-CTR-001240,SRG-APP-000497-CTR-001245,SRG-APP-000498-CTR-001250,SRG-APP-000503-CTR-001275 - stigid@ol7: OL07-00-030874 - stigid@ol8: OL08-00-030140 -- 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 488adbfd4..c5050080a 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 -@@ -42,7 +42,7 @@ references: - 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-000304-GPOS-00121,SRG-OS-000466-GPOS-00210,SRG-OS-000476-GPOS-00221,SRG-OS-000274-GPOS-00104,SRG-OS-000275-GPOS-00105,SRG-OS-000276-GPOS-00106,SRG-OS-000277-GPOS-00107,SRG-APP-000495-CTR-001235,SRG-APP-000499-CTR-001255,SRG-APP-000503-CTR-001275 - stigid@ol7: OL07-00-030870 - stigid@ol8: OL08-00-030150 -- 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 db94ab154..64e7e2b24 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 -@@ -42,7 +42,7 @@ references: - 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@ol7: OL07-00-030873 - stigid@ol8: OL08-00-030130 -- 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/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 @@ -1695,19 +828,6 @@ index 8a58bbc38..1a73014dc 100644 # reboot = true # 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 cee24a320..b38be8e70 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 @@ -1720,21 +840,8 @@ index 09d4e8ff5..6a8e8bdab 100644 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 c854a2105..4d0c81ab6 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/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/directory_permissions_var_log_audit/rule.yml -index ea887e926..6b83d3b6b 100644 +index b82e0f518..02f6a86b0 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 @@ -1746,16 +853,7 @@ index ea887e926..6b83d3b6b 100644 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: 
$ sudo grep -iw log_file /etc/audit/auditd.conf
-@@ -44,7 +44,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
- 
-@@ -69,7 +69,7 @@ ocil: |-
+@@ -65,7 +65,7 @@ ocil: |-
  
      Replace "[audit_log_directory]" to the correct audit log directory path, by default this location is "/var/log/audit".
  
@@ -1764,7 +862,7 @@ index ea887e926..6b83d3b6b 100644
      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.
-@@ -82,7 +82,7 @@ fixtext: |-
+@@ -78,7 +78,7 @@ fixtext: |-
  
      $ sudo grep "^log_file" /etc/audit/auditd.conf
  
@@ -1773,19 +871,6 @@ index ea887e926..6b83d3b6b 100644
      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/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 d06c3f256..a2e1d5b76 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
-@@ -39,7 +39,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
@@ -1810,19 +895,6 @@ index cf4b02b90..cd69f17c2 100644
  
  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/rule.yml b/linux_os/guide/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/rule.yml
-index ffa92db48..d8802af47 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
-@@ -34,7 +34,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/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
@@ -1836,19 +908,6 @@ index d597ca07f..75a41c4fd 100644
  touch $FILE
  chown testuser_123 $FILE
  {{% else %}}
-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 2e7c2a583..d491fcb64 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
-@@ -49,7 +49,7 @@ references:
-     srg: SRG-OS-000057-GPOS-00027,SRG-OS-000058-GPOS-00028,SRG-OS-000059-GPOS-00029,SRG-OS-000206-GPOS-00084,SRG-APP-000118-CTR-000240
-     stigid@ol7: OL07-00-910055
-     stigid@ol8: OL08-00-030070
--    stigid@rhel8: RHEL-08-030070
-+    stigid@almalinux8: RHEL-08-030070
-     stigid@ubuntu2004: UBTU-20-010122
- 
- ocil_clause: 'any permissions are more permissive'
 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..b425902e2 100644
 --- a/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_configure_remote_server/tests/audit_remote_server_hostname.pass.sh
@@ -1873,21 +932,8 @@ index 0bfa82083..6ad184b90 100644
  
  . $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 f2e15ff51..42a638118 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
-@@ -47,7 +47,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_encrypt_sent_records/bash/shared.sh b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_encrypt_sent_records/bash/shared.sh
-index 5e49158b5..e365ecf5f 100644
+index 276c4a3e1..2528f59d1 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 @@
@@ -1900,7 +946,7 @@ index 5e49158b5..e365ecf5f 100644
  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 f5932e35a..b5c0dd6d6 100644
+index d7f67ae08..712f85fb2 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 @@
@@ -1909,9 +955,9 @@ index f5932e35a..b5c0dd6d6 100644
    
 -    {{% if product in ["rhel8", "fedora", "ol8", "rhv4", "sle15"] %}}
 +    {{% if product in ["rhel8", "almalinux8", "fedora", "ol8", "rhv4", "sle15"] %}}
-     {{{ oval_metadata("transport setting in " + audisp_config_file_path + " is set to 'KRB5'") }}}
+     {{{ oval_metadata("transport setting in " + audisp_config_file_path + " is set to 'KRB5'", rule_title=rule_title) }}}
      {{% else %}}
-     {{{ oval_metadata("enable_krb5 setting in " + audisp_config_file_path + " is set to 'yes'") }}}
+     {{{ oval_metadata("enable_krb5 setting in " + audisp_config_file_path + " is set to 'yes'", rule_title=rule_title) }}}
 @@ -22,7 +22,7 @@
      {{{ audisp_config_file_path }}}
      
@@ -1922,7 +968,7 @@ index f5932e35a..b5c0dd6d6 100644
  {{% else %}}
      ^[ ]*enable_krb5[ ]+=[ ]+yes[ ]*$
 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 54f63944c..1f5d7a5c9 100644
+index 392f1d108..2104e305d 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'
@@ -1934,7 +980,7 @@ index 54f63944c..1f5d7a5c9 100644
      Set the transport option in 
{{{ audisp_conf_path }}}/audisp-remote.conf

      to KRB5.
  {{% else %}}
-@@ -42,7 +42,7 @@ ocil_clause: 'audispd is not encrypting audit records when sent over the network
+@@ -43,7 +43,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:
@@ -1992,38 +1038,38 @@ index 864e97b31..ee1a0f679 100644
  . $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 daceead28..c40548882 100644
+index 0a5e51c3f..cdd3f7fe3 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 OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
+-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
++# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
  
  . $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_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..306dcfbce 100644
+index 028fbc3f9..9dc662dc7 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 OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
+-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
++# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux OS 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..dbd9e99ab 100644
+index 91b198fad..131893bd4 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 OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
+-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
++# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
  # remediation = bash
  
  . $SHARED/auditd_utils.sh
@@ -2038,19 +1084,6 @@ index 55f407e01..b9084af21 100644
  # 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 375c0c064..b1eaa97f3 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
-@@ -42,7 +42,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/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
@@ -2073,19 +1106,6 @@ index 55f407e01..b9084af21 100644
  # 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 106865c39..f21baac16 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
-@@ -48,7 +48,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/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
@@ -2097,19 +1117,6 @@ index 55f407e01..b9084af21 100644
  # reboot = true
  # strategy = restrict
  # complexity = low
-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 b713fd1f3..6ee35dd27 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
-@@ -45,7 +45,7 @@ references:
-     srg: SRG-OS-000046-GPOS-00022,SRG-OS-000343-GPOS-00134
-     stigid@ol7: OL07-00-030350
-     stigid@ol8: OL08-00-030020
--    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/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
@@ -2198,32 +1205,6 @@ index 55f407e01..b9084af21 100644
  # 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 80fe2e195..270d67ddc 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
-@@ -56,7 +56,7 @@ references:
-     srg: SRG-OS-000343-GPOS-00134
-     stigid@ol7: OL07-00-030340
-     stigid@ol8: OL08-00-030731
--    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 fa227b1e2..3e1908da0 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
-@@ -36,7 +36,7 @@ references:
-     srg: SRG-OS-000343-GPOS-00134
-     stigid@ol7: OL07-00-030330
-     stigid@ol8: OL08-00-030730
--    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
@@ -2246,19 +1227,6 @@ index 55f407e01..b9084af21 100644
  # 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 47c85d958..273b947ce 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
-@@ -23,7 +23,7 @@ references:
-     nist: CM-6
-     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
@@ -2270,19 +1238,6 @@ index 55f407e01..b9084af21 100644
  # 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 b68991fb0..5efeaa2d1 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
-@@ -25,7 +25,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/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
@@ -2294,32 +1249,6 @@ index 55f407e01..b9084af21 100644
  # 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 8d2ade1f0..01df8dc2d 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
-@@ -28,7 +28,7 @@ references:
-     srg: SRG-OS-000039-GPOS-00017,SRG-OS-000342-GPOS-00133,SRG-OS-000479-GPOS-00224
-     stigid@ol7: OL07-00-030211
-     stigid@ol8: OL08-00-030062
--    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/rule.yml b/linux_os/guide/auditing/configure_auditd_data_retention/auditd_overflow_action/rule.yml
-index 24fd62ec9..76099c32d 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
-@@ -30,7 +30,7 @@ references:
-     srg: SRG-OS-000342-GPOS-00133,SRG-OS-000479-GPOS-00224
-     stigid@ol7: OL07-00-030210
-     stigid@ol8: OL08-00-030700
--    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
@@ -2331,58 +1260,6 @@ index 55f407e01..b9084af21 100644
  # 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/file_permissions_auditd/file_permissions_etc_audit_auditd/rule.yml b/linux_os/guide/auditing/file_permissions_auditd/file_permissions_etc_audit_auditd/rule.yml
-index b7a7425db..b7f5fe021 100644
---- a/linux_os/guide/auditing/file_permissions_auditd/file_permissions_etc_audit_auditd/rule.yml
-+++ b/linux_os/guide/auditing/file_permissions_auditd/file_permissions_etc_audit_auditd/rule.yml
-@@ -27,7 +27,7 @@ references:
-     nist: AU-12(b)
-     srg: SRG-OS-000063-GPOS-00032
-     stigid@ol8: OL08-00-030610
--    stigid@rhel8: RHEL-08-030610
-+    stigid@almalinux8: RHEL-08-030610
-     stigid@ubuntu2004: UBTU-20-010133
-     stigid@ubuntu2204: UBTU-22-653065
- 
-diff --git a/linux_os/guide/auditing/file_permissions_auditd/file_permissions_etc_audit_rulesd/rule.yml b/linux_os/guide/auditing/file_permissions_auditd/file_permissions_etc_audit_rulesd/rule.yml
-index 13839f9d4..42c127bf4 100644
---- a/linux_os/guide/auditing/file_permissions_auditd/file_permissions_etc_audit_rulesd/rule.yml
-+++ b/linux_os/guide/auditing/file_permissions_auditd/file_permissions_etc_audit_rulesd/rule.yml
-@@ -27,7 +27,7 @@ references:
-     nist: AU-12(b)
-     srg: SRG-OS-000063-GPOS-00032
-     stigid@ol8: OL08-00-030610
--    stigid@rhel8: RHEL-08-030610
-+    stigid@almalinux8: RHEL-08-030610
-     stigid@ubuntu2004: UBTU-20-010133
-     stigid@ubuntu2204: UBTU-22-653065
- 
-diff --git a/linux_os/guide/auditing/grub2_audit_argument/rule.yml b/linux_os/guide/auditing/grub2_audit_argument/rule.yml
-index aa6e2fd46..396d74ba7 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/double_value_rhel8.fail.sh b/linux_os/guide/auditing/grub2_audit_argument/tests/double_value_rhel8.fail.sh
 index 065c1d459..3915234ff 100644
 --- a/linux_os/guide/auditing/grub2_audit_argument/tests/double_value_rhel8.fail.sh
@@ -2394,32 +1271,6 @@ index 065c1d459..3915234ff 100644
  
  # 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 b9e9d9fee..77a5843bf 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/package_audit_installed/rule.yml b/linux_os/guide/auditing/package_audit_installed/rule.yml
-index d7e7d5882..1ac81775f 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
@@ -2706,47 +1557,8 @@ index 23940aca3..8775144da 100644
  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 70100ca64..985020423 100644
---- a/linux_os/guide/auditing/service_auditd_enabled/rule.yml
-+++ b/linux_os/guide/auditing/service_auditd_enabled/rule.yml
-@@ -54,7 +54,7 @@ references:
-     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,SRG-APP-000095-CTR-000170,SRG-APP-000409-CTR-000990,SRG-APP-000508-CTR-001300,SRG-APP-000510-CTR-001310
-     stigid@ol7: OL07-00-030000
-     stigid@ol8: OL08-00-030181
--    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 c06c5a45f..b06d38ab3 100644
---- a/linux_os/guide/services/base/package_abrt_removed/rule.yml
-+++ b/linux_os/guide/services/base/package_abrt_removed/rule.yml
-@@ -25,7 +25,7 @@ identifiers:
- references:
-     srg: SRG-OS-000095-GPOS-00049
-     stigid@ol8: OL08-00-040001
--    stigid@rhel8: RHEL-08-040001
-+    stigid@almalinux8: RHEL-08-040001
- 
- {{{ complete_ocil_entry_package(package="abrt") }}}
- 
-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 8ee783afd..98ede1a6f 100644
---- a/linux_os/guide/services/base/service_kdump_disabled/rule.yml
-+++ b/linux_os/guide/services/base/service_kdump_disabled/rule.yml
-@@ -44,7 +44,7 @@ references:
-     srg: SRG-OS-000269-GPOS-00103,SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-021300
-     stigid@ol8: OL08-00-010670
--    stigid@rhel8: RHEL-08-010670
-+    stigid@almalinux8: RHEL-08-010670
-     stigid@sle12: SLES-12-010840
-     stigid@sle15: SLES-15-040190
-     stigid@ubuntu2004: UBTU-20-010413
 diff --git a/linux_os/guide/services/cron_and_at/package_cron_installed/rule.yml b/linux_os/guide/services/cron_and_at/package_cron_installed/rule.yml
-index 1e53d881f..9f512382c 100644
+index 1e575a03c..abe4f7e2b 100644
 --- a/linux_os/guide/services/cron_and_at/package_cron_installed/rule.yml
 +++ b/linux_os/guide/services/cron_and_at/package_cron_installed/rule.yml
 @@ -1,4 +1,4 @@
@@ -2756,7 +1568,7 @@ index 1e53d881f..9f512382c 100644
  {{% else %}}
  {{% set package_name = "cron" %}}
 diff --git a/linux_os/guide/services/cron_and_at/service_cron_enabled/rule.yml b/linux_os/guide/services/cron_and_at/service_cron_enabled/rule.yml
-index 7977cba9f..2f6eb4edf 100644
+index d54589c84..f9f395e31 100644
 --- a/linux_os/guide/services/cron_and_at/service_cron_enabled/rule.yml
 +++ b/linux_os/guide/services/cron_and_at/service_cron_enabled/rule.yml
 @@ -1,4 +1,4 @@
@@ -2766,19 +1578,10 @@ index 7977cba9f..2f6eb4edf 100644
  {{% else %}}
  {{% set service_name = "cron" %}}
 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 04032738f..2e8afbf93 100644
+index 9e58dea05..3a4e1abf5 100644
 --- a/linux_os/guide/services/fapolicyd/fapolicy_default_deny/rule.yml
 +++ b/linux_os/guide/services/fapolicyd/fapolicy_default_deny/rule.yml
-@@ -25,7 +25,7 @@ references:
-   nist: CM-7 (2),CM-7 (5) (b),CM-6 b
-   srg: SRG-OS-000368-GPOS-00154,SRG-OS-000370-GPOS-00155,SRG-OS-000480-GPOS-00232
-   stigid@ol8: OL08-00-040137
--  stigid@rhel8: RHEL-08-040137
-+  stigid@almalinux8: RHEL-08-040137
- 
- ocil_clause: 'fapolicyd is not running in enforcement mode with a deny-all, permit-by-exception policy'
- 
-@@ -40,7 +40,7 @@ ocil: |-
+@@ -39,7 +39,7 @@ ocil: |-
  
      Check that fapolicyd employs a deny-all policy on system mounts with the following commands:
  
@@ -2787,7 +1590,7 @@ index 04032738f..2e8afbf93 100644
      {{% set product_short_name = "OL" if "ol" in product else "RHEL" %}}
      For {{{ product_short_name }}} 8.5 systems and older:
      $ sudo tail /etc/fapolicyd/fapolicyd.rules
-@@ -60,7 +60,7 @@ fixtext: |-
+@@ -59,7 +59,7 @@ fixtext: |-
  
      permissive = 1
  
@@ -2796,112 +1599,8 @@ index 04032738f..2e8afbf93 100644
      For {{{ product_short_name }}} 8.5 systems and older:
      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 1cd3362af..da9359f9a 100644
---- a/linux_os/guide/services/fapolicyd/package_fapolicyd_installed/rule.yml
-+++ b/linux_os/guide/services/fapolicyd/package_fapolicyd_installed/rule.yml
-@@ -23,7 +23,7 @@ references:
-     ospp: FMT_SMF_EXT.1
-     srg: SRG-OS-000370-GPOS-00155,SRG-OS-000368-GPOS-00154,SRG-OS-000480-GPOS-00230
-     stigid@ol8: OL08-00-040135
--    stigid@rhel8: RHEL-08-040135
-+    stigid@almalinux8: RHEL-08-040135
- 
- 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 0103276fa..9b6a98b60 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:
-     ospp: FMT_SMF_EXT.1
-     srg: SRG-OS-000370-GPOS-00155,SRG-OS-000368-GPOS-00154,SRG-OS-000480-GPOS-00230
-     stigid@ol8: OL08-00-040136
--    stigid@rhel8: RHEL-08-040136
-+    stigid@almalinux8: RHEL-08-040136
- 
- 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 04137daf7..f6493dc07 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
-@@ -34,7 +34,7 @@ references:
-     srg: SRG-OS-000074-GPOS-00042,SRG-OS-000095-GPOS-00049,SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040690
-     stigid@ol8: OL08-00-040360
--    stigid@rhel8: RHEL-08-040360
-+    stigid@almalinux8: RHEL-08-040360
-     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 afb4c4283..074514570 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
-@@ -24,7 +24,7 @@ references:
-     ism: 0418,1055,1402
-     srg: SRG-OS-000120-GPOS-00061
-     stigid@ol8: OL08-00-010161
--    stigid@rhel8: RHEL-08-010161
-+    stigid@almalinux8: RHEL-08-010161
- 
- 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 a05bf0ab7..6fe35f2ab 100644
---- a/linux_os/guide/services/kerberos/package_krb5-server_removed/rule.yml
-+++ b/linux_os/guide/services/kerberos/package_krb5-server_removed/rule.yml
-@@ -28,7 +28,7 @@ references:
-     nist: IA-7,IA-7.1
-     srg: SRG-OS-000120-GPOS-00061
-     stigid@ol8: OL08-00-010163
--    stigid@rhel8: RHEL-08-010163
-+    stigid@almalinux8: RHEL-08-010163
- 
- platforms:
-     - krb5_server_older_than_1_17-18
-diff --git a/linux_os/guide/services/mail/package_mailx_installed/rule.yml b/linux_os/guide/services/mail/package_mailx_installed/rule.yml
-index 6813cbd04..b253e2d71 100644
---- a/linux_os/guide/services/mail/package_mailx_installed/rule.yml
-+++ b/linux_os/guide/services/mail/package_mailx_installed/rule.yml
-@@ -23,7 +23,7 @@ references:
-     srg: SRG-OS-000363-GPOS-00150
-     stigid@ol7: OL07-00-020028
-     stigid@ol8: OL08-00-010358
--    stigid@rhel8: RHEL-08-010358
-+    stigid@almalinux8: RHEL-08-010358
-     stigid@sle12: SLES-12-010498
-     stigid@sle15: SLES-15-010418
- 
-diff --git a/linux_os/guide/services/mail/package_postfix_installed/rule.yml b/linux_os/guide/services/mail/package_postfix_installed/rule.yml
-index a2b8325d2..1b7a24e1f 100644
---- a/linux_os/guide/services/mail/package_postfix_installed/rule.yml
-+++ b/linux_os/guide/services/mail/package_postfix_installed/rule.yml
-@@ -18,7 +18,7 @@ identifiers:
- 
- references:
-     srg: SRG-OS-000046-GPOS-00022
--    stigid@rhel8: RHEL-08-030030
-+    stigid@almalinux8: RHEL-08-030030
- 
- 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 e8a1d74e8..e3a36fed3 100644
---- a/linux_os/guide/services/mail/package_sendmail_removed/rule.yml
-+++ b/linux_os/guide/services/mail/package_sendmail_removed/rule.yml
-@@ -32,7 +32,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
- 
- {{{ 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 a0330236a..89efc61e4 100644
+index 697e200ec..7c55af618 100644
 --- 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
 @@ -1,4 +1,4 @@
@@ -2911,7 +1610,7 @@ index a0330236a..89efc61e4 100644
  # strategy = configure
  # complexity = low
 diff --git a/linux_os/guide/services/mail/postfix_client/postfix_client_configure_mail_alias/bash/shared.sh b/linux_os/guide/services/mail/postfix_client/postfix_client_configure_mail_alias/bash/shared.sh
-index 001ead7d6..1fc220d8a 100644
+index 43e16c187..b2af04b32 100644
 --- a/linux_os/guide/services/mail/postfix_client/postfix_client_configure_mail_alias/bash/shared.sh
 +++ b/linux_os/guide/services/mail/postfix_client/postfix_client_configure_mail_alias/bash/shared.sh
 @@ -1,4 +1,4 @@
@@ -2920,71 +1619,6 @@ index 001ead7d6..1fc220d8a 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 5e8bccde0..80f2add37 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:
-     nist: AU-5(a),AU-5.1(ii)
-     srg: SRG-OS-000046-GPOS-00022
-     stigid@ol8: OL08-00-030030
--    stigid@rhel8: RHEL-08-030030
-+    stigid@almalinux8: RHEL-08-030030
- 
- ocil_clause: 'the alias is not set or is not root'
- 
-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 a2bdd6f43..21f0b5b77 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
-@@ -25,7 +25,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040680
-     stigid@ol8: OL08-00-040290
--    stigid@rhel8: RHEL-08-040290
-+    stigid@almalinux8: RHEL-08-040290
- 
- 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 481dc9e6a..29172bde0 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
-@@ -26,7 +26,7 @@ references:
-     nist-csf: PR.IP-1,PR.PT-2,PR.PT-3
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol8: OL08-00-010640
--    stigid@rhel8: RHEL-08-010640
-+    stigid@almalinux8: RHEL-08-010640
- 
- 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 75ce5867c..2e17f1cb5 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
-@@ -32,7 +32,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-021021
-     stigid@ol8: OL08-00-010630
--    stigid@rhel8: RHEL-08-010630
-+    stigid@almalinux8: RHEL-08-010630
-     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 1c8d98fcb..0a6f42ea6 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
-@@ -30,7 +30,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-021020
-     stigid@ol8: OL08-00-010650
--    stigid@rhel8: RHEL-08-010650
-+    stigid@almalinux8: RHEL-08-010650
-     stigid@sle12: SLES-12-010810
-     stigid@sle15: SLES-15-040160
- 
 diff --git a/linux_os/guide/services/ntp/chrony_set_nts/tests/chrony_d_one_pool_missing.fail.sh b/linux_os/guide/services/ntp/chrony_set_nts/tests/chrony_d_one_pool_missing.fail.sh
 index 4963780f8..c3bc5b0de 100644
 --- a/linux_os/guide/services/ntp/chrony_set_nts/tests/chrony_d_one_pool_missing.fail.sh
@@ -3020,19 +1654,6 @@ index c435df983..b80ffbf7b 100644
  # reboot = true
  # 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 2c0c6ea89..5e7d1c16b 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:
-     ospp: FMT_SMF_EXT.1
-     srg: SRG-OS-000096-GPOS-00050,SRG-OS-000095-GPOS-00049
-     stigid@ol8: OL08-00-030741
--    stigid@rhel8: RHEL-08-030741
-+    stigid@almalinux8: RHEL-08-030741
- 
- 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/kubernetes/shared.yml b/linux_os/guide/services/ntp/chronyd_no_chronyc_network/kubernetes/shared.yml
 index c435df983..b80ffbf7b 100644
 --- a/linux_os/guide/services/ntp/chronyd_no_chronyc_network/kubernetes/shared.yml
@@ -3044,19 +1665,6 @@ index c435df983..b80ffbf7b 100644
  # reboot = true
  # 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 74f052e77..7c9bf38dc 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
-@@ -26,7 +26,7 @@ references:
-     nist: CM-7(1)
-     srg: SRG-OS-000096-GPOS-00050,SRG-OS-000095-GPOS-00049
-     stigid@ol8: OL08-00-030742
--    stigid@rhel8: RHEL-08-030742
-+    stigid@almalinux8: RHEL-08-030742
- 
- 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
@@ -3068,19 +1676,6 @@ index c435df983..b80ffbf7b 100644
  # reboot = true
  # 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 36dfcb701..184fd87bc 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
-@@ -92,7 +92,7 @@ references:
-     srg: SRG-OS-000355-GPOS-00143,SRG-OS-000356-GPOS-00144,SRG-OS-000359-GPOS-00146
-     stigid@ol7: OL07-00-040500
-     stigid@ol8: OL08-00-030740
--    stigid@rhel8: RHEL-08-030740
-+    stigid@almalinux8: RHEL-08-030740
-     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_set_maxpoll/tests/chrony_d_one_pool_misconfigured.fail.sh b/linux_os/guide/services/ntp/chronyd_or_ntpd_set_maxpoll/tests/chrony_d_one_pool_misconfigured.fail.sh
 index a7d291916..c1802d791 100644
 --- a/linux_os/guide/services/ntp/chronyd_or_ntpd_set_maxpoll/tests/chrony_d_one_pool_misconfigured.fail.sh
@@ -3139,34 +1734,8 @@ index c435df983..b80ffbf7b 100644
  # reboot = true
  # strategy = restrict
  # complexity = low
-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 55ade0342..524ebff75 100644
---- a/linux_os/guide/services/ntp/chronyd_server_directive/rule.yml
-+++ b/linux_os/guide/services/ntp/chronyd_server_directive/rule.yml
-@@ -24,7 +24,7 @@ identifiers:
- references:
-     srg: SRG-OS-000355-GPOS-00143,SRG-OS-000356-GPOS-00144,SRG-OS-000359-GPOS-00146
-     stigid@ol8: OL08-00-030740
--    stigid@rhel8: RHEL-08-030740
-+    stigid@almalinux8: RHEL-08-030740
- 
- ocil_clause: 'an authoritative remote time server is not configured or configured with pool directive'
- 
-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 08a94cbe4..34e23459b 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/service_chronyd_or_ntpd_enabled/ansible/shared.yml b/linux_os/guide/services/ntp/service_chronyd_or_ntpd_enabled/ansible/shared.yml
-index 752528317..35c2e162b 100644
+index 047775477..fbe658c99 100644
 --- a/linux_os/guide/services/ntp/service_chronyd_or_ntpd_enabled/ansible/shared.yml
 +++ b/linux_os/guide/services/ntp/service_chronyd_or_ntpd_enabled/ansible/shared.yml
 @@ -1,4 +1,4 @@
@@ -3186,10 +1755,10 @@ index e2af37ad2..2a3ab74f5 100644
  # strategy = enable
  # complexity = low
 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 722c975d6..e171b138c 100644
+index d41c69ef3..b72d6337a 100644
 --- a/linux_os/guide/services/ntp/service_ntpd_enabled/rule.yml
 +++ b/linux_os/guide/services/ntp/service_ntpd_enabled/rule.yml
-@@ -48,7 +48,7 @@ template:
+@@ -50,7 +50,7 @@ template:
  
  platform: package[ntp]
  
@@ -3198,46 +1767,11 @@ index 722c975d6..e171b138c 100644
  warnings:
      - general:
          The 
ntp
 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 51d236af8..bf0d9c0ec 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
-@@ -28,7 +28,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040550
-     stigid@ol8: OL08-00-010460
--    stigid@rhel8: RHEL-08-010460
-+    stigid@almalinux8: RHEL-08-010460
-     stigid@sle12: SLES-12-010410
-     stigid@sle15: SLES-15-040030
- 
-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 40d562c8b..3ca683178 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
-@@ -31,7 +31,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040540
-     stigid@ol8: OL08-00-010470
--    stigid@rhel8: RHEL-08-010470
-+    stigid@almalinux8: RHEL-08-010470
-     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 417b18c5f..06188458a 100644
+index 925223e63..ce01c60f6 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
-@@ -35,7 +35,7 @@ references:
-     srg: SRG-OS-000095-GPOS-00049
-     stigid@ol7: OL07-00-020000
-     stigid@ol8: OL08-00-040010
--    stigid@rhel8: RHEL-08-040010
-+    stigid@almalinux8: RHEL-08-040010
-     stigid@ubuntu2004: UBTU-20-010406
-     stigid@ubuntu2204: UBTU-22-215030
- 
-@@ -46,7 +46,7 @@ template:
+@@ -43,7 +43,7 @@ template:
      vars:
          pkgname: rsh-server
  
@@ -3247,10 +1781,10 @@ index 417b18c5f..06188458a 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 725bde26d..b28992711 100644
+index 8b8cc3406..167502389 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:
+@@ -53,7 +53,7 @@ template:
          pkgname@ubuntu2204: rsh-client
          pkgname@ubuntu2404: rsh-client
  
@@ -3273,10 +1807,10 @@ index a820ba060..2b38dc61f 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 c64a7a41a..8e56b0fa3 100644
+index 3004f7fda..1571337de 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
-@@ -39,7 +39,7 @@ template:
+@@ -37,7 +37,7 @@ template:
      vars:
          pkgname: talk
  
@@ -3285,42 +1819,6 @@ index c64a7a41a..8e56b0fa3 100644
  warnings:
      - 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 6a75cc624..4e5df259d 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
-@@ -46,7 +46,7 @@ references:
-     srg: SRG-OS-000095-GPOS-00049
-     stigid@ol7: OL07-00-021710
-     stigid@ol8: OL08-00-040000
--    stigid@rhel8: RHEL-08-040000
-+    stigid@almalinux8: RHEL-08-040000
-     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 af692d8b8..8e67c7591 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
-@@ -39,7 +39,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040700
-     stigid@ol8: OL08-00-040190
--    stigid@rhel8: RHEL-08-040190
-+    stigid@almalinux8: RHEL-08-040190
- 
- {{{ complete_ocil_entry_package(package=package_name) }}}
- 
-diff --git a/linux_os/guide/services/obsolete/tftp/tftp_uses_secure_mode_systemd/rule.yml b/linux_os/guide/services/obsolete/tftp/tftp_uses_secure_mode_systemd/rule.yml
-index 8cad348d7..7b726486f 100644
---- a/linux_os/guide/services/obsolete/tftp/tftp_uses_secure_mode_systemd/rule.yml
-+++ b/linux_os/guide/services/obsolete/tftp/tftp_uses_secure_mode_systemd/rule.yml
-@@ -46,4 +46,4 @@ identifiers:
- references:
-     nist: IA-5 (1) (c)
-     srg: SRG-OS-000074-GPOS-00042
--    stigid@rhel8: RHEL-08-040350
-+    stigid@almalinux8: RHEL-08-040350
 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 ae4633025..fd77672ef 100644
 --- a/linux_os/guide/services/obsolete/tftp/tftpd_uses_secure_mode/rule.yml
@@ -3370,21 +1868,8 @@ index ae4633025..fd77672ef 100644
      Configure the TFTP daemon to operate in secure mode by adding the following line to "/etc/xinetd.d/tftp" (or modify the line to have the required value):
  
      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 6e3b6bce2..56a4eb7eb 100644
---- a/linux_os/guide/services/rng/service_rngd_enabled/rule.yml
-+++ b/linux_os/guide/services/rng/service_rngd_enabled/rule.yml
-@@ -22,7 +22,7 @@ identifiers:
- references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol8: OL08-00-010473
--    stigid@rhel8: RHEL-08-010471
-+    stigid@almalinux8: RHEL-08-010471
- 
- {{% 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
+index a10c4daa1..bfb3121f4 100644
 --- 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
 @@ -1,4 +1,4 @@
@@ -3414,7 +1899,7 @@ index a869e7ad6..2e9609296 100644
  if grep -s "rwuser" /etc/snmp/snmpd.conf | grep -qv "^#"; then
  	sed -i "/^\s*#/b;/rwuser/ s/^/#/" /etc/snmp/snmpd.conf
 diff --git a/linux_os/guide/services/snmp/snmp_configure_server/snmpd_not_default_password/ansible/shared.yml b/linux_os/guide/services/snmp/snmp_configure_server/snmpd_not_default_password/ansible/shared.yml
-index ca07eef0e..9a56d0833 100644
+index 2ea6b4821..e9398b913 100644
 --- a/linux_os/guide/services/snmp/snmp_configure_server/snmpd_not_default_password/ansible/shared.yml
 +++ b/linux_os/guide/services/snmp/snmp_configure_server/snmpd_not_default_password/ansible/shared.yml
 @@ -1,4 +1,4 @@
@@ -3433,60 +1918,8 @@ index c54b259d0..78a682cc8 100644
  
  {{{ bash_instantiate_variables("var_snmpd_ro_string", "var_snmpd_rw_string") }}}
  
-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 b84a52d6f..ab1bbf555 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
-@@ -52,7 +52,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040420
-     stigid@ol8: OL08-00-010490
--    stigid@rhel8: RHEL-08-010490
-+    stigid@almalinux8: RHEL-08-010490
-     stigid@sle12: SLES-12-030220
-     stigid@sle15: SLES-15-040250
- 
-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 36d0e74f9..febf1a858 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
-@@ -36,7 +36,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040410
-     stigid@ol8: OL08-00-010480
--    stigid@rhel8: RHEL-08-010480
-+    stigid@almalinux8: RHEL-08-010480
-     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 d4198b6bf..002f6ab65 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
-@@ -30,7 +30,7 @@ references:
-     srg: SRG-OS-000423-GPOS-00187,SRG-OS-000424-GPOS-00188,SRG-OS-000425-GPOS-00189,SRG-OS-000426-GPOS-00190
-     stigid@ol7: OL07-00-040300
-     stigid@ol8: OL08-00-040159
--    stigid@rhel8: RHEL-08-040159
-+    stigid@almalinux8: RHEL-08-040159
-     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 9abc9978b..5d0dd8ce0 100644
---- a/linux_os/guide/services/ssh/service_sshd_enabled/rule.yml
-+++ b/linux_os/guide/services/ssh/service_sshd_enabled/rule.yml
-@@ -39,7 +39,7 @@ references:
-     srg: SRG-OS-000423-GPOS-00187,SRG-OS-000424-GPOS-00188,SRG-OS-000425-GPOS-00189,SRG-OS-000426-GPOS-00190
-     stigid@ol7: OL07-00-040310
-     stigid@ol8: OL08-00-040160
--    stigid@rhel8: RHEL-08-040160
-+    stigid@almalinux8: RHEL-08-040160
-     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..41d44a72c 100644
+index a3823299a..c9add57a6 100644
 --- 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
 @@ -1,4 +1,4 @@
@@ -3506,7 +1939,7 @@ index 3df859f35..cc0dd4f11 100644
  # put line into the file
  echo "setenv SSH_USE_STRONG_RNG 32" > /etc/profile.d/cc-ssh-strong-rng.csh
 diff --git a/linux_os/guide/services/ssh/ssh_client/ssh_client_use_strong_rng_sh/ansible/shared.yml b/linux_os/guide/services/ssh/ssh_client/ssh_client_use_strong_rng_sh/ansible/shared.yml
-index 29c646020..b8ff04b70 100644
+index 35d1987eb..49a76a29c 100644
 --- a/linux_os/guide/services/ssh/ssh_client/ssh_client_use_strong_rng_sh/ansible/shared.yml
 +++ b/linux_os/guide/services/ssh/ssh_client/ssh_client_use_strong_rng_sh/ansible/shared.yml
 @@ -1,4 +1,4 @@
@@ -3525,19 +1958,6 @@ index 13306db45..22d8b4ee0 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 2b759401c..c522d36a4 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
-@@ -25,7 +25,7 @@ identifiers:
- references:
-     srg: SRG-OS-000067-GPOS-00035
-     stigid@ol8: OL08-00-010100
--    stigid@rhel8: RHEL-08-010100
-+    stigid@almalinux8: RHEL-08-010100
- 
- 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
@@ -3549,149 +1969,6 @@ index 5a97f74df..104b27f3f 100644
  apiVersion: machineconfiguration.openshift.io/v1
  kind: MachineConfig
  spec:
-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 253ab5b5f..31dc2b85d 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
-@@ -51,7 +51,7 @@ references:
-     srg: SRG-OS-000106-GPOS-00053,SRG-OS-000480-GPOS-00229,SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-010300
-     stigid@ol8: OL08-00-020330
--    stigid@rhel8: RHEL-08-020330
-+    stigid@almalinux8: RHEL-08-020330
-     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 c6b99c6d1..5f1367e5c 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
-@@ -41,7 +41,7 @@ references:
-     srg: SRG-OS-000364-GPOS-00151,SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040430
-     stigid@ol8: OL08-00-010522
--    stigid@rhel8: RHEL-08-010522
-+    stigid@almalinux8: RHEL-08-010522
- 
- {{{ 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 bc9ed8989..8003a519d 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
-@@ -42,7 +42,7 @@ references:
-     srg: SRG-OS-000364-GPOS-00151,SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040440
-     stigid@ol8: OL08-00-010521
--    stigid@rhel8: RHEL-08-010521
-+    stigid@almalinux8: RHEL-08-010521
- 
- {{{ complete_ocil_entry_sshd_option(default="yes", option="KerberosAuthentication", value="no") }}}
- 
-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 bcd1f8664..a8e444e01 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
-@@ -48,7 +48,7 @@ references:
-     srg: SRG-OS-000109-GPOS-00056,SRG-OS-000480-GPOS-00227,SRG-APP-000148-CTR-000335,SRG-APP-000190-CTR-000500
-     stigid@ol7: OL07-00-040370
-     stigid@ol8: OL08-00-010550
--    stigid@rhel8: RHEL-08-010550
-+    stigid@almalinux8: RHEL-08-010550
-     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 cb85e9b9f..ea32f0ddc 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
-@@ -38,7 +38,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040380
-     stigid@ol8: OL08-00-010520
--    stigid@rhel8: RHEL-08-010520
-+    stigid@almalinux8: RHEL-08-010520
-     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 0348c8fa8..5048e8d2d 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
-@@ -42,7 +42,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040710
-     stigid@ol8: OL08-00-040340
--    stigid@rhel8: RHEL-08-040340
-+    stigid@almalinux8: RHEL-08-040340
-     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 30fb39d46..09a484514 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
-@@ -46,7 +46,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00229
-     stigid@ol7: OL07-00-010460
-     stigid@ol8: OL08-00-010830
--    stigid@rhel8: RHEL-08-010830
-+    stigid@almalinux8: RHEL-08-010830
-     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 41813a145..5f623c635 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
-@@ -42,7 +42,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040450
-     stigid@ol8: OL08-00-010500
--    stigid@rhel8: RHEL-08-010500
-+    stigid@almalinux8: RHEL-08-010500
-     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 3dc5d4b69..e1e9d1c00 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
-@@ -44,7 +44,7 @@ references:
-     srg: SRG-OS-000023-GPOS-00006,SRG-OS-000228-GPOS-00088
-     stigid@ol7: OL07-00-040170
-     stigid@ol8: OL08-00-010040
--    stigid@rhel8: RHEL-08-010040
-+    stigid@almalinux8: RHEL-08-010040
-     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 c50e74d6a..f2b911a88 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
-@@ -37,7 +37,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040360
-     stigid@ol8: OL08-00-020350
--    stigid@rhel8: RHEL-08-020350
-+    stigid@almalinux8: RHEL-08-020350
-     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 0c5cee4d3..a15692234 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:
-     ospp: FCS_SSH_EXT.1.8
-     srg: SRG-OS-000480-GPOS-00227,SRG-OS-000033-GPOS-00014
-     stigid@ol8: OL08-00-040161
--    stigid@rhel8: RHEL-08-040161
-+    stigid@almalinux8: RHEL-08-040161
- 
- 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 d2d6b5cdc..8bbe0381b 100644
 --- a/linux_os/guide/services/ssh/ssh_server/sshd_rekey_limit/tests/rhel8_ospp_ok.pass.sh
@@ -3703,45 +1980,6 @@ index d2d6b5cdc..8bbe0381b 100644
  # profiles = xccdf_org.ssgproject.content_profile_ospp
  
  mkdir -p /etc/ssh/sshd_config.d
-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 1f5a8ad84..6e04908e9 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
-@@ -52,7 +52,7 @@ references:
-     srg: SRG-OS-000126-GPOS-00066,SRG-OS-000163-GPOS-00072,SRG-OS-000279-GPOS-00109,SRG-OS-000395-GPOS-00175
-     stigid@ol7: OL07-00-040320
-     stigid@ol8: OL08-00-010201
--    stigid@rhel8: RHEL-08-010201
-+    stigid@almalinux8: RHEL-08-010201
-     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/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_set_keepalive/rule.yml
-index c070ef735..877addf58 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
-@@ -51,7 +51,7 @@ references:
-     pcidss: Req-8.1.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@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_use_approved_kex_ordered_stig/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_kex_ordered_stig/rule.yml
-index 474574c71..f46a68fbf 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
-@@ -46,7 +46,7 @@ references:
-     srg: SRG-OS-000250-GPOS-00093
-     stigid@ol7: OL07-00-040712
-     stigid@ol8: OL08-00-040342
--    stigid@rhel8: RHEL-08-040342
-+    stigid@almalinux8: RHEL-08-040342
-     stigid@sle12: SLES-12-030270
-     stigid@sle15: SLES-15-040450
-     stigid@ubuntu2004: UBTU-20-010045
 diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_kex_ordered_stig/tests/default_fips.pass.sh b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_kex_ordered_stig/tests/default_fips.pass.sh
 index 3fd2901a9..82981db09 100644
 --- a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_kex_ordered_stig/tests/default_fips.pass.sh
@@ -3753,60 +1991,8 @@ index 3fd2901a9..82981db09 100644
  
  source common.sh
  
-diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_use_strong_rng/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_use_strong_rng/rule.yml
-index d14c9a95a..49dd4c6b9 100644
---- a/linux_os/guide/services/ssh/ssh_server/sshd_use_strong_rng/rule.yml
-+++ b/linux_os/guide/services/ssh/ssh_server/sshd_use_strong_rng/rule.yml
-@@ -28,7 +28,7 @@ identifiers:
- references:
-     srg: SRG-OS-000480-GPOS-00232,SRG-OS-000480-GPOS-00227
-     stigid@ol8: OL08-00-010292
--    stigid@rhel8: RHEL-08-010292
-+    stigid@almalinux8: RHEL-08-010292
- 
- 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 6ad7267d4..ce0943438 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
-@@ -36,7 +36,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040711
-     stigid@ol8: OL08-00-040341
--    stigid@rhel8: RHEL-08-040341
-+    stigid@almalinux8: RHEL-08-040341
-     stigid@sle12: SLES-12-030261
-     stigid@ubuntu2004: UBTU-20-010049
-     stigid@ubuntu2204: UBTU-22-255045
-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 72fef8496..2b1f36863 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:
-     nist: IA-2(11)
-     srg: SRG-OS-000375-GPOS-00160,SRG-OS-000377-GPOS-00162
-     stigid@ol8: OL08-00-010400
--    stigid@rhel8: RHEL-08-010400
-+    stigid@almalinux8: RHEL-08-010400
- 
- 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 a789a2154..fca2acf51 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:
-    nist: IA-5 (2) (c)
-    srg: SRG-OS-000068-GPOS-00036
-    stigid@ol8: OL08-00-020090
--   stigid@rhel8: RHEL-08-020090
-+   stigid@almalinux8: RHEL-08-020090
- 
- warnings:
-     - general: |-
 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 b8ebf0eb5..b6ce47ea9 100644
+index 91916fa1c..fd99ba665 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
 @@ -9,7 +9,7 @@
@@ -3828,7 +2014,7 @@ index b8ebf0eb5..b6ce47ea9 100644
    comment="tests the presence of try_cert_auth or require_cert_auth in /etc/pam.d/system-auth"
    id="test_sssd_enable_smartcards_cert_auth_system_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 261bbb8ff..80517bddf 100644
+index 11f858d7c..5d523c22a 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: |-
@@ -3840,15 +2026,6 @@ index 261bbb8ff..80517bddf 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:
      
-@@ -49,7 +49,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
- 
- ocil_clause: 'smart cards are not enabled in SSSD'
- 
 diff --git a/linux_os/guide/services/sssd/sssd_enable_smartcards/tests/authselect_modified_pam.fail.sh b/linux_os/guide/services/sssd/sssd_enable_smartcards/tests/authselect_modified_pam.fail.sh
 index 20d721658..2a4422daf 100644
 --- a/linux_os/guide/services/sssd/sssd_enable_smartcards/tests/authselect_modified_pam.fail.sh
@@ -3957,21 +2134,8 @@ index 456f06484..e6fb4c857 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 c9ea75be4..da9d57791 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:
-   nist: IA-5 (2) (a)
-   srg: SRG-OS-000066-GPOS-00034,SRG-OS-000384-GPOS-00167
-   stigid@ol8: OL08-00-010090
--  stigid@rhel8: RHEL-08-010090
-+  stigid@almalinux8: RHEL-08-010090
- 
- warnings:
-     - general: |-
 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 aa18d4e35..0cb6f4880 100644
+index 8acb5361f..826b08ff4 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'
@@ -3983,16 +2147,7 @@ index aa18d4e35..0cb6f4880 100644
      Check if SSSD allows cached authentications with the following command:
      
      $ sudo grep cache_credentials /etc/sssd/sssd.conf
-@@ -44,7 +44,7 @@ references:
-     nist-csf: PR.AC-1,PR.AC-6,PR.AC-7
-     srg: SRG-OS-000383-GPOS-00166
-     stigid@ol8: OL08-00-020290
--    stigid@rhel8: RHEL-08-020290
-+    stigid@almalinux8: RHEL-08-020290
-     stigid@sle12: SLES-12-010680
-     stigid@sle15: SLES-15-010500
-     stigid@ubuntu2004: UBTU-20-010441
-@@ -53,7 +53,7 @@ references:
+@@ -51,7 +51,7 @@ references:
  ocil_clause: 'it does not exist or is not configured properly'
  
  ocil: |-
@@ -4047,60 +2202,8 @@ index eab3590a9..f9b8c15de 100644
  # platform = Not Applicable
  {{%- endif %}}
  # packages = sssd
-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 8a770f083..d8ee4b792 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:
-     ospp: FMT_SMF_EXT.1
-     srg: SRG-OS-000062-GPOS-00031,SRG-OS-000471-GPOS-00215,SRG-APP-000141-CTR-000315
-     stigid@ol8: OL08-00-030603
--    stigid@rhel8: RHEL-08-030603
-+    stigid@almalinux8: RHEL-08-030603
- 
- platform: package[usbguard]
- 
-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 8db664879..453c9b916 100644
---- a/linux_os/guide/services/usbguard/package_usbguard_installed/rule.yml
-+++ b/linux_os/guide/services/usbguard/package_usbguard_installed/rule.yml
-@@ -49,7 +49,7 @@ references:
-     ospp: FMT_SMF_EXT.1
-     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
- 
- ocil_clause: 'the package is not installed'
- 
-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 429bf35a0..265f33eb4 100644
---- a/linux_os/guide/services/usbguard/service_usbguard_enabled/rule.yml
-+++ b/linux_os/guide/services/usbguard/service_usbguard_enabled/rule.yml
-@@ -25,7 +25,7 @@ references:
-     ospp: FMT_SMF_EXT.1
-     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
- 
- ocil_clause: 'the service is not enabled'
- 
-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 c645bb0b2..0eb2b1f56 100644
---- a/linux_os/guide/services/usbguard/usbguard_generate_policy/rule.yml
-+++ b/linux_os/guide/services/usbguard/usbguard_generate_policy/rule.yml
-@@ -24,7 +24,7 @@ references:
-     nist: CM-8(3)(a),IA-3
-     srg: SRG-OS-000378-GPOS-00163
-     stigid@ol8: OL08-00-040140
--    stigid@rhel8: RHEL-08-040140
-+    stigid@almalinux8: RHEL-08-040140
- 
- 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 58d9ff9dc..6ac924253 100644
+index 424bcca02..90218e55e 100644
 --- 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
 @@ -1,4 +1,4 @@
@@ -4109,70 +2212,44 @@ index 58d9ff9dc..6ac924253 100644
  # reboot = true
  # 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 35b8388e2..a4e603bc6 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
-@@ -33,7 +33,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040730
-     stigid@ol8: OL08-00-040320
--    stigid@rhel8: RHEL-08-040320
-+    stigid@almalinux8: RHEL-08-040320
- 
- 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 1d7d94ae3..02b34e53c 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
-@@ -35,7 +35,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
- 
- 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 e0bdca6be..9ce5132f6 100644
+index 780c4d1a5..ccec13d45 100644
 --- 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
 @@ -1,4 +1,4 @@
  #!/bin/bash
--# platform = Oracle Linux 8,multi_platform_fedora,multi_platform_rhv,multi_platform_rhel,multi_platform_sle
-+# platform = Oracle Linux 8,multi_platform_fedora,multi_platform_rhv,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
+-# platform = multi_platform_ol,multi_platform_fedora,multi_platform_rhv,multi_platform_rhel,multi_platform_sle
++# platform = multi_platform_ol,multi_platform_fedora,multi_platform_rhv,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
  
  systemctl set-default multi-user.target
 diff --git a/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_runlevel_target/tests/correct_target_under_lib.pass.sh b/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_runlevel_target/tests/correct_target_under_lib.pass.sh
-index 9ec0cae93..4487412e5 100644
+index fd3c4a48d..c79a3a43f 100644
 --- a/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_runlevel_target/tests/correct_target_under_lib.pass.sh
 +++ b/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_runlevel_target/tests/correct_target_under_lib.pass.sh
 @@ -1,4 +1,4 @@
  #!/bin/bash
--# platform = Oracle Linux 8,multi_platform_fedora,multi_platform_rhv,multi_platform_rhel,multi_platform_sle
-+# platform = Oracle Linux 8,multi_platform_fedora,multi_platform_rhv,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
+-# platform = multi_platform_ol,multi_platform_fedora,multi_platform_rhv,multi_platform_rhel,multi_platform_sle
++# platform = multi_platform_ol,multi_platform_fedora,multi_platform_rhv,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle
  
  ln -sf /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 diff --git a/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_runlevel_target/tests/wrong_target.fail.sh b/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_runlevel_target/tests/wrong_target.fail.sh
-index 3df966d45..25eb0ca24 100644
+index 5ffb26956..f1af96866 100644
 --- a/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_runlevel_target/tests/wrong_target.fail.sh
 +++ b/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_runlevel_target/tests/wrong_target.fail.sh
 @@ -1,4 +1,4 @@
  #!/bin/bash
--# platform = Oracle Linux 8,multi_platform_fedora,multi_platform_rhel,multi_platform_rhv,multi_platform_sle
-+# platform = Oracle Linux 8,multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhv,multi_platform_sle
+-# platform = multi_platform_ol,multi_platform_fedora,multi_platform_rhel,multi_platform_rhv,multi_platform_sle
++# platform = multi_platform_ol,multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhv,multi_platform_sle
  
  systemctl set-default graphical.target
 diff --git a/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_runlevel_target/tests/wrong_target_under_lib.fail.sh b/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_runlevel_target/tests/wrong_target_under_lib.fail.sh
-index d3da2f113..a90d73d4b 100644
+index 99a85d26d..33cdca2f3 100644
 --- a/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_runlevel_target/tests/wrong_target_under_lib.fail.sh
 +++ b/linux_os/guide/services/xwindows/disabling_xwindows/xwindows_runlevel_target/tests/wrong_target_under_lib.fail.sh
 @@ -1,4 +1,4 @@
  #!/bin/bash
--# platform = Oracle Linux 8,multi_platform_fedora,multi_platform_rhel,multi_platform_rhv,multi_platform_sle
-+# platform = Oracle Linux 8,multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhv,multi_platform_sle
+-# platform = multi_platform_ol,multi_platform_fedora,multi_platform_rhel,multi_platform_rhv,multi_platform_sle
++# platform = multi_platform_ol,multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_rhv,multi_platform_sle
  
  ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target
 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
@@ -4186,45 +2263,6 @@ index c2feb1fbc..116c6cde5 100644
  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 7a84cd09a..1abcaefdb 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
-@@ -119,7 +119,7 @@ references:
-     srg: SRG-OS-000023-GPOS-00006,SRG-OS-000228-GPOS-00088
-     stigid@ol7: OL07-00-010050
-     stigid@ol8: OL08-00-010060
--    stigid@rhel8: RHEL-08-010060
-+    stigid@almalinux8: RHEL-08-010060
-     stigid@sle12: SLES-12-010030
-     stigid@sle15: SLES-15-010020
- 
-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 5220efa10..8bcc08af3 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
-@@ -52,7 +52,7 @@ references:
-     srg: SRG-OS-000023-GPOS-00006,SRG-OS-000228-GPOS-00088
-     stigid@ol7: OL07-00-010030
-     stigid@ol8: OL08-00-010049
--    stigid@rhel8: RHEL-08-010049
-+    stigid@almalinux8: RHEL-08-010049
-     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/rule.yml b/linux_os/guide/system/accounts/accounts-banners/gui_login_banner/dconf_gnome_login_banner_text/rule.yml
-index 73a117135..0b809f579 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
-@@ -56,7 +56,7 @@ references:
-     srg: SRG-OS-000023-GPOS-00006,SRG-OS-000228-GPOS-00088
-     stigid@ol7: OL07-00-010040
-     stigid@ol8: OL08-00-010050
--    stigid@rhel8: RHEL-08-010050
-+    stigid@almalinux8: RHEL-08-010050
-     stigid@sle12: SLES-12-010050
-     stigid@sle15: SLES-15-010090
-     stigid@ubuntu2004: UBTU-20-010003
 diff --git a/linux_os/guide/system/accounts/accounts-banners/gui_login_banner/dconf_gnome_login_banner_text/tests/correct_value.pass.sh b/linux_os/guide/system/accounts/accounts-banners/gui_login_banner/dconf_gnome_login_banner_text/tests/correct_value.pass.sh
 index 6a271415e..db0169ab1 100644
 --- a/linux_os/guide/system/accounts/accounts-banners/gui_login_banner/dconf_gnome_login_banner_text/tests/correct_value.pass.sh
@@ -4269,32 +2307,6 @@ index 7c4c9bb29..477057df2 100644
  # profiles = xccdf_org.ssgproject.content_profile_stig
  # 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 6b5b1a246..45eb0c5dc 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
-@@ -28,7 +28,7 @@ references:
-     srg: SRG-OS-000373-GPOS-00156,SRG-OS-000373-GPOS-00157,SRG-OS-000373-GPOS-00158
-     stigid@ol7: OL07-00-010344
-     stigid@ol8: OL08-00-010385
--    stigid@rhel8: RHEL-08-010385
-+    stigid@almalinux8: RHEL-08-010385
-     stigid@sle12: SLES-12-010114
-     stigid@sle15: SLES-15-020104
- 
-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 380448538..aee22f515 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
-@@ -53,7 +53,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040530
-     stigid@ol8: OL08-00-020340
--    stigid@rhel8: RHEL-08-020340
-+    stigid@almalinux8: RHEL-08-020340
-     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 2cd897b71..ac95c2535 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/display_login_attempts/tests/authselect_correct_options.pass.sh
@@ -4331,19 +2343,6 @@ index 325d5860a..68371758c 100644
  
  if authselect list-features sssd | grep -q with-silent-lastlog; then
      authselect select sssd --force
-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 3b21d8cfd..af684690b 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:
-     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
- 
- 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 4abed18e2..609a92b7e 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_password_auth/tests/correct_value.pass.sh
@@ -4368,19 +2367,6 @@ index 077479b8a..7be653143 100644
  
  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 de067ad49..b98fb378d 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:
-     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
- 
- 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 4abed18e2..609a92b7e 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_password_pam_faillock_system_auth/tests/correct_value.pass.sh
@@ -4405,19 +2391,6 @@ index 077479b8a..7be653143 100644
  
  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 4ee5fd8dc..1d411a7ac 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:
-     nist: AC-7 (a)
-     srg: SRG-OS-000021-GPOS-00005
-     stigid@ol8: OL08-00-020027,OL08-00-020028
--    stigid@rhel8: RHEL-08-020027,RHEL-08-020028
-+    stigid@almalinux8: RHEL-08-020027,RHEL-08-020028
- 
- platform: system_with_kernel
- 
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_passwords_pam_faillock_audit/tests/conflicting_settings_authselect.fail.sh b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_passwords_pam_faillock_audit/tests/conflicting_settings_authselect.fail.sh
 index d805aa018..e8fe8823a 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/account_passwords_pam_faillock_audit/tests/conflicting_settings_authselect.fail.sh
@@ -4801,19 +2774,6 @@ index 253d50de1..44cb00aed 100644
  # variables = var_password_pam_remember=5,var_password_pam_remember_control_flag=requisite
  
  remember_cnt=3
-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 b3cd63014..81e021cdd 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:
-     nist: AC-7 (a)
-     srg: SRG-OS-000021-GPOS-00005
-     stigid@ol8: OL08-00-020020,OL08-00-020021
--    stigid@rhel8: RHEL-08-020021
-+    stigid@almalinux8: RHEL-08-020021
-     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 2ba38d0ad..bdd471cdc 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_audit/tests/conflicting_settings_authselect.fail.sh
@@ -4838,32 +2798,6 @@ index bcfa1a721..2cb77dd13 100644
  
  source common.sh
  
-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 b71608c90..62730a33d 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
-@@ -48,7 +48,7 @@ references:
-     srg: SRG-OS-000329-GPOS-00128,SRG-OS-000021-GPOS-00005
-     stigid@ol7: OL07-00-010320
-     stigid@ol8: OL08-00-020010,OL08-00-020011
--    stigid@rhel8: RHEL-08-020011
-+    stigid@almalinux8: RHEL-08-020011
-     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_root/rule.yml b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_deny_root/rule.yml
-index 381b1d893..67dba184b 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
-@@ -38,7 +38,7 @@ references:
-     srg: SRG-OS-000329-GPOS-00128,SRG-OS-000021-GPOS-00005
-     stigid@ol7: OL07-00-010330
-     stigid@ol8: OL08-00-020022,OL08-00-020023
--    stigid@rhel8: RHEL-08-020023
-+    stigid@almalinux8: RHEL-08-020023
- 
- {{% 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..c5f163ad5 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
@@ -4923,19 +2857,6 @@ index 7c702d669..c362b825c 100644
  # remediation = none
  
  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 98e77d7a8..8759c2f04 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
-@@ -36,7 +36,7 @@ references:
-     nist: AC-7(b),AC-7(a),AC-7.1(ii)
-     srg: SRG-OS-000021-GPOS-00005,SRG-OS-000329-GPOS-00128
-     stigid@ol8: OL08-00-020016,OL08-00-020017
--    stigid@rhel8: RHEL-08-020016,RHEL-08-020017
-+    stigid@almalinux8: RHEL-08-020016,RHEL-08-020017
- 
- 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..d2b79007b 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_dir/tests/conflicting_settings_authselect.fail.sh
@@ -5021,7 +2942,7 @@ index 45724e5e1..bef66604a 100644
  source common.sh
  
 diff --git a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_enforce_local/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_enforce_local/ansible/shared.yml
-index fd8e44443..0ee343e12 100644
+index 9ec4d6697..b81da685f 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_enforce_local/ansible/shared.yml
 +++ b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_enforce_local/ansible/shared.yml
 @@ -1,4 +1,4 @@
@@ -5088,32 +3009,6 @@ index 053f91100..d707b423b 100644
  # remediation = none
  
  # This test scenario manually modify the pam_faillock.so entries in auth section from
-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 04eb9926d..3eac3dc24 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
-@@ -44,7 +44,7 @@ references:
-     srg: SRG-OS-000329-GPOS-00128,SRG-OS-000021-GPOS-00005
-     stigid@ol7: OL07-00-010320
-     stigid@ol8: OL08-00-020012,OL08-00-020013
--    stigid@rhel8: RHEL-08-020012,RHEL-08-020013
-+    stigid@almalinux8: RHEL-08-020012,RHEL-08-020013
-     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_silent/rule.yml b/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_silent/rule.yml
-index e0eaa73dd..3df3ee14a 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
-@@ -28,7 +28,7 @@ identifiers:
- references:
-     srg: SRG-OS-000329-GPOS-00128,SRG-OS-000021-GPOS-00005
-     stigid@ol8: OL08-00-020018,OL08-00-020019
--    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
- 
 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..2b5882f42 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_silent/tests/expected_faillock_conf.pass.sh
@@ -5150,19 +3045,6 @@ index 514b2bb37..96c299dca 100644
  
  source common.sh
  
-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 c9e7ad8fb..3812ab2f1 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
-@@ -49,7 +49,7 @@ references:
-     srg: SRG-OS-000329-GPOS-00128,SRG-OS-000021-GPOS-00005
-     stigid@ol7: OL07-00-010320
-     stigid@ol8: OL08-00-020014,OL08-00-020015
--    stigid@rhel8: RHEL-08-020014,RHEL-08-020015
-+    stigid@almalinux8: RHEL-08-020014,RHEL-08-020015
-     stigid@ubuntu2004: UBTU-20-010072
-     stigid@ubuntu2204: UBTU-22-411045
- 
 diff --git a/linux_os/guide/system/accounts/accounts-pam/package_pam_pwquality_installed/tests/custom-package-removed.fail.sh b/linux_os/guide/system/accounts/accounts-pam/package_pam_pwquality_installed/tests/custom-package-removed.fail.sh
 index e82ecb7f5..7386d3217 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/package_pam_pwquality_installed/tests/custom-package-removed.fail.sh
@@ -5174,136 +3056,6 @@ index e82ecb7f5..7386d3217 100644
  
  # Package libpwquality cannot be uninstalled normally
  # as it would cause removal of sudo package which is
-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 f9427f397..ba502d6e2 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
-@@ -47,7 +47,7 @@ references:
-     srg: SRG-OS-000071-GPOS-00039
-     stigid@ol7: OL07-00-010140
-     stigid@ol8: OL08-00-020130
--    stigid@rhel8: RHEL-08-020130
-+    stigid@almalinux8: RHEL-08-020130
-     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 37e664bf5..7e9ead14b 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
-@@ -29,7 +29,7 @@ references:
-     nist: IA-5(c),IA-5(1)(a),CM-6(a),IA-5(4)
-     srg: SRG-OS-000480-GPOS-00225,SRG-OS-000072-GPOS-00040
-     stigid@ol8: OL08-00-020300
--    stigid@rhel8: RHEL-08-020300
-+    stigid@almalinux8: RHEL-08-020300
-     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 2f6f53281..af98c217a 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
-@@ -45,7 +45,7 @@ references:
-     srg: SRG-OS-000072-GPOS-00040
-     stigid@ol7: OL07-00-010160
-     stigid@ol8: OL08-00-020170
--    stigid@rhel8: RHEL-08-020170
-+    stigid@almalinux8: RHEL-08-020170
-     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 73c72410e..257eac0b8 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
-@@ -47,7 +47,7 @@ references:
-     srg: SRG-OS-000070-GPOS-00038
-     stigid@ol7: OL07-00-010130
-     stigid@ol8: OL08-00-020120
--    stigid@rhel8: RHEL-08-020120
-+    stigid@almalinux8: RHEL-08-020120
-     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 19557a54f..d94d2da10 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
-@@ -37,7 +37,7 @@ references:
-     srg: SRG-OS-000072-GPOS-00040,SRG-OS-000730-GPOS-00190
-     stigid@ol7: OL07-00-010190
-     stigid@ol8: OL08-00-020140
--    stigid@rhel8: RHEL-08-020140
-+    stigid@almalinux8: RHEL-08-020140
- 
- 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 ca0b15bd5..f1d047e63 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
-@@ -39,7 +39,7 @@ references:
-     srg: SRG-OS-000072-GPOS-00040
-     stigid@ol7: OL07-00-010180
-     stigid@ol8: OL08-00-020150
--    stigid@rhel8: RHEL-08-020150
-+    stigid@almalinux8: RHEL-08-020150
- 
- 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 846188050..284dfc230 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
-@@ -54,7 +54,7 @@ references:
-     srg: SRG-OS-000072-GPOS-00040
-     stigid@ol7: OL07-00-010170
-     stigid@ol8: OL08-00-020160
--    stigid@rhel8: RHEL-08-020160
-+    stigid@almalinux8: RHEL-08-020160
- 
- 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 5b73e03f9..4bc36643c 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
-@@ -47,7 +47,7 @@ references:
-     srg: SRG-OS-000078-GPOS-00046
-     stigid@ol7: OL07-00-010280
-     stigid@ol8: OL08-00-020230
--    stigid@rhel8: RHEL-08-020230
-+    stigid@almalinux8: RHEL-08-020230
-     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 15f7dd546..b65ccdfb7 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
-@@ -48,7 +48,7 @@ references:
-     srg: SRG-OS-000266-GPOS-00101
-     stigid@ol7: OL07-00-010150
-     stigid@ol8: OL08-00-020280
--    stigid@rhel8: RHEL-08-020280
-+    stigid@almalinux8: RHEL-08-020280
-     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/rule.yml b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_pwquality_password_auth/rule.yml
-index 5798e3c0d..e44e5b113 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
-@@ -28,7 +28,7 @@ identifiers:
- references:
-     srg: SRG-OS-000069-GPOS-00037,SRG-OS-000070-GPOS-00038,SRG-OS-000480-GPOS-00227
-     stigid@ol8: OL08-00-020100
--    stigid@rhel8: RHEL-08-020100
-+    stigid@almalinux8: RHEL-08-020100
- 
- 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..6ace9a2c9 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
@@ -5364,19 +3116,6 @@ index 61c28f2d6..5b42939c5 100644
  
  authselect create-profile hardening -b sssd
  CUSTOM_PROFILE="custom/hardening"
-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 879fc68ec..d0801dd7f 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
-@@ -28,7 +28,7 @@ identifiers:
- references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol8: OL08-00-020101
--    stigid@rhel8: RHEL-08-020101
-+    stigid@almalinux8: RHEL-08-020101
- 
- 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..441bcc209 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
@@ -5437,19 +3176,6 @@ index 60ebfdeba..83086ac66 100644
  
  authselect create-profile hardening -b sssd
  CUSTOM_PROFILE="custom/hardening"
-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 54992b9af..108b11e5c 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
-@@ -46,7 +46,7 @@ references:
-     srg: SRG-OS-000069-GPOS-00037,SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-010119
-     stigid@ol8: OL08-00-020102,OL08-00-020103,OL08-00-020104
--    stigid@rhel8: RHEL-08-020104
-+    stigid@almalinux8: RHEL-08-020104
-     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/pwquality_conf_commented.fail.sh b/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_commented.fail.sh
 index c61f9b6d5..e7cccaed5 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/password_quality/password_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_commented.fail.sh
@@ -5510,45 +3236,6 @@ index dc7fe32d1..3313d5dea 100644
  # variables = var_password_pam_retry=3
  
  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 23db94fa1..66340188d 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
-@@ -44,7 +44,7 @@ references:
-     srg: SRG-OS-000069-GPOS-00037,SRG-OS-000070-GPOS-00038
-     stigid@ol7: OL07-00-010120
-     stigid@ol8: OL08-00-020110
--    stigid@rhel8: RHEL-08-020110
-+    stigid@almalinux8: RHEL-08-020110
-     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_logindefs/rule.yml b/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_logindefs/rule.yml
-index fb1111dfe..e1f6dc2a1 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
-@@ -43,7 +43,7 @@ references:
-     srg: SRG-OS-000073-GPOS-00041
-     stigid@ol7: OL07-00-010210
-     stigid@ol8: OL08-00-010110
--    stigid@rhel8: RHEL-08-010110
-+    stigid@almalinux8: RHEL-08-010110
-     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/rule.yml b/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_passwordauth/rule.yml
-index d09169119..8abf507e1 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
-@@ -49,7 +49,7 @@ references:
-     srg: SRG-OS-000073-GPOS-00041,SRG-OS-000120-GPOS-00061
-     stigid@ol7: OL07-00-010200
-     stigid@ol8: OL08-00-010160
--    stigid@rhel8: RHEL-08-010160
-+    stigid@almalinux8: RHEL-08-010160
- 
- 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 ee1213c2d..c2aca7ae1 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_passwordauth/tests/authselect_correct_value.pass.sh
@@ -5621,19 +3308,6 @@ index 10a02eb86..77029c277 100644
  # variables = var_password_hashing_algorithm_pam=sha512
  
  authselect create-profile hardening -b sssd
-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 d273c009b..224ff9e93 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
-@@ -64,7 +64,7 @@ references:
-     srg: SRG-OS-000073-GPOS-00041,SRG-OS-000120-GPOS-00061
-     stigid@ol7: OL07-00-010200
-     stigid@ol8: OL08-00-010159
--    stigid@rhel8: RHEL-08-010159
-+    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 264df72f1..725cd27ab 100644
 --- a/linux_os/guide/system/accounts/accounts-pam/set_password_hashing_algorithm/set_password_hashing_algorithm_systemauth/tests/authselect_correct_value.pass.sh
@@ -5706,19 +3380,6 @@ index a1a9ec1ec..c273c78f4 100644
  # variables = var_password_hashing_algorithm_pam=sha512
  
  authselect create-profile hardening -b sssd
-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 379cc1410..eedf81885 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:
-     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@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
@@ -5730,19 +3391,6 @@ index 3045574e5..7ce6bb466 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 809c41946..97a8d4c1e 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
-@@ -70,7 +70,7 @@ references:
-     ospp: FAU_GEN.1.2
-     srg: SRG-OS-000324-GPOS-00125,SRG-OS-000480-GPOS-00227
-     stigid@ol8: OL08-00-040172
--    stigid@rhel8: RHEL-08-040172
-+    stigid@almalinux8: RHEL-08-040172
-     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
@@ -5754,67 +3402,32 @@ index 517c83c6e..041e9a29c 100644
  # reboot = true
  # 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 b80e9dd72..cb7fadc80 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
-@@ -75,7 +75,7 @@ references:
-     srg: SRG-OS-000324-GPOS-00125,SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-020230
-     stigid@ol8: OL08-00-040170
--    stigid@rhel8: RHEL-08-040170
-+    stigid@almalinux8: RHEL-08-040170
-     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 f8c47e96a..d0aaabaf7 100644
+index ed94337e6..318ed9da3 100644
 --- 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
 @@ -1,5 +1,5 @@
  #!/bin/bash
--# platform = Oracle Linux 7,Oracle Linux 8,multi_platform_rhel,multi_platform_fedora,multi_platform_ubuntu
-+# platform = Oracle Linux 7,Oracle Linux 8,multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ubuntu
+-# platform = multi_platform_ol,multi_platform_rhel,multi_platform_fedora,multi_platform_ubuntu
++# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ubuntu
  
  systemctl disable --now ctrl-alt-del.target
  systemctl mask --now ctrl-alt-del.target
 diff --git a/linux_os/guide/system/accounts/accounts-physical/disable_ctrlaltdel_reboot/tests/not_masked.fail.sh b/linux_os/guide/system/accounts/accounts-physical/disable_ctrlaltdel_reboot/tests/not_masked.fail.sh
-index 41eed9737..992dc2304 100644
+index 3e37419e8..029e44c9d 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/disable_ctrlaltdel_reboot/tests/not_masked.fail.sh
 +++ b/linux_os/guide/system/accounts/accounts-physical/disable_ctrlaltdel_reboot/tests/not_masked.fail.sh
 @@ -1,4 +1,4 @@
  #!/bin/bash
--# platform = Oracle Linux 7,Oracle Linux 8,multi_platform_rhel,multi_platform_fedora,multi_platform_ubuntu
-+# platform = Oracle Linux 7,Oracle Linux 8,multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ubuntu
+-# platform = multi_platform_ol,multi_platform_rhel,multi_platform_fedora,multi_platform_ubuntu
++# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_fedora,multi_platform_ubuntu
  
  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 38e49c15d..41bd95b7d 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:
-     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
- 
- ocil_clause: "the option is not configured"
- 
 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 3da668880..b87bbc285 100644
+index 64fe758e3..8010569a1 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
-@@ -42,7 +42,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
- 
- ocil_clause: 'the output is different'
- 
-@@ -50,7 +50,7 @@ ocil: |-
+@@ -49,7 +49,7 @@ ocil: |-
      To check if authentication is required for emergency mode, run the following command:
      
$ grep sulogin /usr/lib/systemd/system/emergency.service

      The output should be similar to the following, and the line must begin with
@@ -5823,7 +3436,7 @@ index 3da668880..b87bbc285 100644
          ExecStart and /usr/lib/systemd/systemd-sulogin-shell.
          
ExecStart=-/usr/lib/systemd/systemd-sulogin-shell emergency

      {{%- else -%}}
-@@ -78,7 +78,7 @@ fixtext: |-
+@@ -77,7 +77,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":
@@ -5844,48 +3457,35 @@ index bce932b72..1975adea7 100644
  service_file="/usr/lib/systemd/system/emergency.service"
  sulogin="/usr/lib/systemd/systemd-sulogin-shell"
 diff --git a/linux_os/guide/system/accounts/accounts-physical/require_emergency_target_auth/tests/correct_value_dropin.pass.sh b/linux_os/guide/system/accounts/accounts-physical/require_emergency_target_auth/tests/correct_value_dropin.pass.sh
-index 19345cfcf..374e76ec6 100644
+index 31c41fba2..c1729abbc 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/require_emergency_target_auth/tests/correct_value_dropin.pass.sh
 +++ b/linux_os/guide/system/accounts/accounts-physical/require_emergency_target_auth/tests/correct_value_dropin.pass.sh
 @@ -1,5 +1,5 @@
  #!/bin/bash
--# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_sle,multi_platform_slmicro
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_slmicro
+-# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_slmicro
++# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_slmicro
  rm -f /etc/systemd/system/emergency.service
  mkdir -p /etc/systemd/system/emergency.service.d/
  cat << EOF > /etc/systemd/system/emergency.service.d/10-automatus.conf
 diff --git a/linux_os/guide/system/accounts/accounts-physical/require_emergency_target_auth/tests/wrong_value_dropin.fail.sh b/linux_os/guide/system/accounts/accounts-physical/require_emergency_target_auth/tests/wrong_value_dropin.fail.sh
-index da0d857f6..a7d75247c 100644
+index 8fb2960e0..57568d8cb 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/require_emergency_target_auth/tests/wrong_value_dropin.fail.sh
 +++ b/linux_os/guide/system/accounts/accounts-physical/require_emergency_target_auth/tests/wrong_value_dropin.fail.sh
 @@ -1,5 +1,5 @@
  #!/bin/bash
--# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_sle,multi_platform_slmicro
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_slmicro
+-# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_sle,multi_platform_slmicro
++# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_slmicro
  rm -f /etc/systemd/system/emergency.service
  mkdir -p /etc/systemd/system/emergency.service.d/
  cat << EOF > /etc/systemd/system/emergency.service.d/10-oscap.conf
-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 11b455051..8e459f0b2 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
-@@ -45,7 +45,7 @@ references:
-     srg: SRG-OS-000080-GPOS-00048
-     stigid@ol7: OL07-00-010481
-     stigid@ol8: OL08-00-010151
--    stigid@rhel8: RHEL-08-010151
-+    stigid@almalinux8: RHEL-08-010151
- 
- ocil_clause: 'the output is different'
- 
 diff --git a/linux_os/guide/system/accounts/accounts-physical/require_singleuser_auth/tests/correct_dropin.pass.sh b/linux_os/guide/system/accounts/accounts-physical/require_singleuser_auth/tests/correct_dropin.pass.sh
-index 07b8e331a..850cd60d9 100644
+index c15034231..01fbc0695 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/require_singleuser_auth/tests/correct_dropin.pass.sh
 +++ b/linux_os/guide/system/accounts/accounts-physical/require_singleuser_auth/tests/correct_dropin.pass.sh
 @@ -1,5 +1,5 @@
  #!/bin/bash
--# platform = multi_platform_fedora,multi_platform_rhel
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux
+-# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel
++# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
  rm -rf /etc/systemd/system/rescue.service.d
  mkdir -p /etc/systemd/system/rescue.service.d
  cat << EOF > /etc/systemd/system/rescue.service.d/10-automatus.conf
@@ -5901,13 +3501,13 @@ index f735f3270..027fbbe3d 100644
  service_file="/usr/lib/systemd/system/rescue.service"
  sulogin="/usr/lib/systemd/systemd-sulogin-shell"
 diff --git a/linux_os/guide/system/accounts/accounts-physical/require_singleuser_auth/tests/wrong_dropin.fail.sh b/linux_os/guide/system/accounts/accounts-physical/require_singleuser_auth/tests/wrong_dropin.fail.sh
-index 4557b0512..043753f03 100644
+index 01701eefb..a3b846c14 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/require_singleuser_auth/tests/wrong_dropin.fail.sh
 +++ b/linux_os/guide/system/accounts/accounts-physical/require_singleuser_auth/tests/wrong_dropin.fail.sh
 @@ -1,5 +1,5 @@
  #!/bin/bash
--# platform = multi_platform_fedora,multi_platform_rhel
-+# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux
+-# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel
++# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
  
  rm -rf /etc/systemd/system/rescue.service.d
  mkdir -p /etc/systemd/system/rescue.service.d
@@ -5932,7 +3532,7 @@ index f47326940..42d591752 100644
  # strategy = configure
  # complexity = low
 diff --git a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_after_time/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_after_time/ansible/shared.yml
-index dc63eb653..dc6931307 100644
+index 6eb24c8ef..718f8cb2e 100644
 --- a/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_after_time/ansible/shared.yml
 +++ b/linux_os/guide/system/accounts/accounts-physical/screen_locking/console_screen_locking/configure_tmux_lock_after_time/ansible/shared.yml
 @@ -1,4 +1,4 @@
@@ -6059,34 +3659,8 @@ index 6b2d6cd5e..c20712c9f 100644
  apiVersion: machineconfiguration.openshift.io/v1
  kind: MachineConfig
  spec:
-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 6410036a5..ee9a40b1e 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
-@@ -54,7 +54,7 @@ references:
-     srg: SRG-OS-000105-GPOS-00052,SRG-OS-000375-GPOS-00160,SRG-OS-000375-GPOS-00161,SRG-OS-000377-GPOS-00162
-     stigid@ol7: OL07-00-041001
-     stigid@ol8: OL08-00-010390
--    stigid@rhel8: RHEL-08-010390
-+    stigid@almalinux8: RHEL-08-010390
-     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 0eb85d5fc..cd2b02c71 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
-@@ -34,7 +34,7 @@ references:
-     nist: CM-6(a)
-     srg: SRG-OS-000375-GPOS-00160,SRG-OS-000376-GPOS-00161
-     stigid@ol8: OL08-00-010410
--    stigid@rhel8: RHEL-08-010410
-+    stigid@almalinux8: RHEL-08-010410
-     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 08b89bf8f..cea27ab4d 100644
+index 2cbb501f6..27700c4b4 100644
 --- 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
 @@ -1,4 +1,4 @@
@@ -6116,112 +3690,8 @@ index 8d59d36d3..526165afe 100644
  # packages = openssl-pkcs11,libpam-pkcs11
  
  if [ ! -f /etc/pam_pkcs11/pam_pkcs11.conf ]; then
-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 f3afea3e2..b1672d15b 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
-@@ -35,7 +35,7 @@ references:
-     ospp: FIA_UAU.1
-     srg: SRG-OS-000324-GPOS-00125,SRG-OS-000480-GPOS-00227
-     stigid@ol8: OL08-00-040180
--    stigid@rhel8: RHEL-08-040180
-+    stigid@almalinux8: RHEL-08-040180
- 
- 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/rule.yml b/linux_os/guide/system/accounts/accounts-restrictions/account_expiration/account_disable_post_pw_expiration/rule.yml
-index 917fc304d..02504b964 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
-@@ -51,7 +51,7 @@ references:
-     srg: SRG-OS-000118-GPOS-00060
-     stigid@ol7: OL07-00-010310
-     stigid@ol8: OL08-00-020260
--    stigid@rhel8: RHEL-08-020260
-+    stigid@almalinux8: RHEL-08-020260
-     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 52238d37b..7fff90e39 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
-@@ -44,7 +44,7 @@ references:
-     srg: SRG-OS-000123-GPOS-00064,SRG-OS-000002-GPOS-00002
-     stigid@ol7: OL07-00-010271
-     stigid@ol8: OL08-00-020000,OL08-00-020270
--    stigid@rhel8: RHEL-08-020000,RHEL-08-020270
-+    stigid@almalinux8: RHEL-08-020000,RHEL-08-020270
-     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 ea00038a1..c44c6c01e 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
-@@ -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@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 d1909d635..e1f5e2dbb 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
-@@ -37,7 +37,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-020270
-     stigid@ol8: OL08-00-020320
--    stigid@rhel8: RHEL-08-020320
-+    stigid@almalinux8: RHEL-08-020320
-     stigid@sle12: SLES-12-010630
-     stigid@sle15: SLES-15-020090
- 
-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 5055fc114..374a3d115 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
-@@ -51,7 +51,7 @@ references:
-     srg: SRG-OS-000076-GPOS-00044
-     stigid@ol7: OL07-00-010250
-     stigid@ol8: OL08-00-020200
--    stigid@rhel8: RHEL-08-020200
-+    stigid@almalinux8: RHEL-08-020200
-     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/rule.yml b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_minimum_age_login_defs/rule.yml
-index 2ca3febf0..2368d03ac 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
-@@ -50,7 +50,7 @@ references:
-     srg: SRG-OS-000075-GPOS-00043
-     stigid@ol7: OL07-00-010230
-     stigid@ol8: OL08-00-020190
--    stigid@rhel8: RHEL-08-020190
-+    stigid@almalinux8: RHEL-08-020190
-     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/rule.yml b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/rule.yml
-index 9d672d1ac..5bc8f6038 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
-@@ -45,7 +45,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
- 
- 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..7165ee165 100644
+index e8cf6ab2f..513e6a40c 100644
 --- 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
 @@ -1,7 +1,7 @@
@@ -6231,10 +3701,10 @@ index cb388dd9b..7165ee165 100644
 -# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,multi_platform_fedora
 +# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux OS 8,multi_platform_fedora
  
- if grep -q "^PASS_MIN_LEN" /etc/login.defs; then
- 	sed -i "s/^PASS_MIN_LEN.*/PASS_MIN_LEN 10/" /etc/login.defs
+ if grep -q "^PASS_MIN_LEN" {{{ login_defs_path }}}; then
+ 	sed -i "s/^PASS_MIN_LEN.*/PASS_MIN_LEN 10/" {{{ login_defs_path }}}
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/tests/password_minlen_12.pass.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/tests/password_minlen_12.pass.sh
-index 7aaac8c68..f04bf9a1f 100644
+index 8cb77a3bf..5e21fedbb 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/tests/password_minlen_12.pass.sh
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/tests/password_minlen_12.pass.sh
 @@ -1,7 +1,7 @@
@@ -6244,10 +3714,10 @@ index 7aaac8c68..f04bf9a1f 100644
 -# platform = Oracle Linux 8,Red Hat Enterprise Linux 8
 +# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux OS 8
  
- if grep -q "^PASS_MIN_LEN" /etc/login.defs; then
- 	sed -i "s/^PASS_MIN_LEN.*/PASS_MIN_LEN 12/" /etc/login.defs
+ if grep -q "^PASS_MIN_LEN" {{{ login_defs_path }}}; then
+ 	sed -i "s/^PASS_MIN_LEN.*/PASS_MIN_LEN 12/" {{{ login_defs_path }}}
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/tests/password_minlen_15.pass.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/tests/password_minlen_15.pass.sh
-index 89ab4795b..f054cf4dc 100644
+index 03b2e4b0d..fb8cdebbd 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/tests/password_minlen_15.pass.sh
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/tests/password_minlen_15.pass.sh
 @@ -1,7 +1,7 @@
@@ -6257,10 +3727,10 @@ index 89ab4795b..f054cf4dc 100644
 -# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,multi_platform_fedora
 +# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux OS 8,multi_platform_fedora
  
- if grep -q "^PASS_MIN_LEN" /etc/login.defs; then
- 	sed -i "s/^PASS_MIN_LEN.*/PASS_MIN_LEN 15/" /etc/login.defs
+ if grep -q "^PASS_MIN_LEN" {{{ login_defs_path }}}; then
+ 	sed -i "s/^PASS_MIN_LEN.*/PASS_MIN_LEN 15/" {{{ login_defs_path }}}
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/tests/password_minlen_commented.fail.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/tests/password_minlen_commented.fail.sh
-index 00649b0bf..3f79a8312 100644
+index 7f6ed618c..1fc0deb91 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/tests/password_minlen_commented.fail.sh
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/tests/password_minlen_commented.fail.sh
 @@ -1,6 +1,6 @@
@@ -6270,9 +3740,9 @@ index 00649b0bf..3f79a8312 100644
 -# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,multi_platform_fedora
 +# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux OS 8,multi_platform_fedora
  
- sed -i "s/.*PASS_MIN_LEN.*/#PASS_MIN_LEN 12/" /etc/login.defs
+ sed -i "s/.*PASS_MIN_LEN.*/#PASS_MIN_LEN 12/" {{{ login_defs_path }}}
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/tests/password_minlen_not_there.fail.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/tests/password_minlen_not_there.fail.sh
-index 3772aee13..543968f0c 100644
+index 57ce0b08f..ca1015d90 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/tests/password_minlen_not_there.fail.sh
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_minlen_login_defs/tests/password_minlen_not_there.fail.sh
 @@ -1,6 +1,6 @@
@@ -6282,20 +3752,7 @@ index 3772aee13..543968f0c 100644
 -# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,multi_platform_fedora
 +# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux OS 8,multi_platform_fedora
  
- 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/rule.yml b/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_set_max_life_existing/rule.yml
-index 5a63d42b4..deab64ae2 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
-@@ -34,7 +34,7 @@ references:
-     srg: SRG-OS-000076-GPOS-00044
-     stigid@ol7: OL07-00-010260
-     stigid@ol8: OL08-00-020210
--    stigid@rhel8: RHEL-08-020210
-+    stigid@almalinux8: RHEL-08-020210
-     stigid@sle12: SLES-12-010290
-     stigid@sle15: SLES-15-020230
- 
+ sed -i "/^PASS_MIN_LEN.*/d" {{{ login_defs_path }}}
 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 ebcb5ac04..674369a42 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_expiration/accounts_password_set_max_life_root/ansible/shared.yml
@@ -6316,189 +3773,150 @@ index 7bdb759f6..dd157f1e3 100644
  # 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 06465d05d..f8c8d3726 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
-@@ -35,7 +35,7 @@ references:
-     srg: SRG-OS-000075-GPOS-00043
-     stigid@ol7: OL07-00-010240
-     stigid@ol8: OL08-00-020180
--    stigid@rhel8: RHEL-08-020180
-+    stigid@almalinux8: RHEL-08-020180
-     stigid@sle12: SLES-12-010270
-     stigid@sle15: SLES-15-020210
- 
-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 374a37dba..8d8fc938e 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
-@@ -38,7 +38,7 @@ references:
-     nist: 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-010120
--    stigid@rhel8: RHEL-08-010120
-+    stigid@almalinux8: RHEL-08-010120
-     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/tests/authselect_argument_missing.fail.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_password_auth/tests/authselect_argument_missing.fail.sh
-index 3e24ba16a..288476511 100644
+index ac786351d..138fe352a 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_password_auth/tests/authselect_argument_missing.fail.sh
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_password_auth/tests/authselect_argument_missing.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 OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
+-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
++# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
  # variables = var_password_pam_unix_rounds=65536
  
  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_correct_value.pass.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_password_auth/tests/authselect_correct_value.pass.sh
-index 39690d88d..6e467c55d 100644
+index f65671afe..e9e8479ef 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_password_auth/tests/authselect_correct_value.pass.sh
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_password_auth/tests/authselect_correct_value.pass.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 OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
+-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
++# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
  # 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..c9bc404b0 100644
+index 0c026fce2..b8fe5a279 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 OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
+-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
++# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux OS 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..c1683d3ba 100644
+index fefaf2f5a..dc264897a 100644
 --- 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
 @@ -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 OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
+-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
++# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
  # remediation = none
  # variables = var_password_pam_unix_rounds=65536
  
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_password_auth/tests/authselect_wrong_control.fail.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_password_auth/tests/authselect_wrong_control.fail.sh
-index dc8b11e2d..ab25779d7 100644
+index 6638d849a..249116a24 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_password_auth/tests/authselect_wrong_control.fail.sh
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_password_auth/tests/authselect_wrong_control.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 OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
+-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
++# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
  # 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_wrong_value.fail.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_password_auth/tests/authselect_wrong_value.fail.sh
-index 96bcc3e23..916696231 100644
+index 91da77a25..73886c9f6 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_password_auth/tests/authselect_wrong_value.fail.sh
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_password_auth/tests/authselect_wrong_value.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 OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
+-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
++# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
  # variables = var_password_pam_unix_rounds=65536
  
  ROUNDS=4000
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_system_auth/tests/authselect_argument_missing.fail.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_system_auth/tests/authselect_argument_missing.fail.sh
-index 3da866412..4f0f07d9c 100644
+index 1a1cf9ad7..d28bf4a54 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_system_auth/tests/authselect_argument_missing.fail.sh
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_system_auth/tests/authselect_argument_missing.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 OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
+-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
++# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
  # variables = var_password_pam_unix_rounds=65536
  
  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_correct_value.pass.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_system_auth/tests/authselect_correct_value.pass.sh
-index 67a052f98..bfc9776b9 100644
+index 1acecb5ba..ca50493ae 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_system_auth/tests/authselect_correct_value.pass.sh
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_system_auth/tests/authselect_correct_value.pass.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 OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
+-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
++# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
  # 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..879540c6c 100644
+index 539b033f7..21a4f38da 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 OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
+-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
++# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux OS 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..1ed7daf81 100644
+index 3f0dac513..2990276a7 100644
 --- 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
 @@ -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 OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
+-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
++# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
  # remediation = none
  # variables = var_password_pam_unix_rounds=65536
  
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_system_auth/tests/authselect_wrong_control.fail.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_system_auth/tests/authselect_wrong_control.fail.sh
-index 85bbbdb7f..63159c408 100644
+index 8a39a24a4..911f90952 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_system_auth/tests/authselect_wrong_control.fail.sh
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_system_auth/tests/authselect_wrong_control.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 OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
+-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
++# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
  # 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_wrong_value.fail.sh b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_system_auth/tests/authselect_wrong_value.fail.sh
-index 244799045..9757a3ee8 100644
+index dc454dff4..223b2c8c7 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_system_auth/tests/authselect_wrong_value.fail.sh
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/password_storage/accounts_password_pam_unix_rounds_system_auth/tests/authselect_wrong_value.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 OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
+-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
++# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux OS 8,Red Hat Enterprise Linux 9,multi_platform_fedora
  # variables = var_password_pam_unix_rounds=65536
  
  ROUNDS=4000
-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 f9ed55768..77ff08b42 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
-@@ -52,7 +52,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-010290
-     stigid@ol8: OL08-00-020331,OL08-00-020332
--    stigid@rhel8: RHEL-08-020331,RHEL-08-020332
-+    stigid@almalinux8: RHEL-08-020331,RHEL-08-020332
-     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..ccb3e92aa 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/password_storage/no_empty_passwords/tests/authselect_modified_pam.fail.sh
@@ -6535,32 +3953,6 @@ index 9dc5d7677..337522d82 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 67a77d00a..296e74f32 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
-@@ -37,7 +37,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-010291
-     stigid@ol8: OL08-00-010121
--    stigid@rhel8: RHEL-08-010121
-+    stigid@almalinux8: RHEL-08-010121
-     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 b7b00fbfc..2570ccdc7 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
-@@ -50,7 +50,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-020310
-     stigid@ol8: OL08-00-040200
--    stigid@rhel8: RHEL-08-040200
-+    stigid@almalinux8: RHEL-08-040200
-     stigid@sle12: SLES-12-010650
-     stigid@sle15: SLES-15-020100
- 
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/root_logins/accounts_root_gid_zero/tests/other_user_uid_0.fail.sh b/linux_os/guide/system/accounts/accounts-restrictions/root_logins/accounts_root_gid_zero/tests/other_user_uid_0.fail.sh
 index ba82e5ddb..ddbac0bcf 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/root_logins/accounts_root_gid_zero/tests/other_user_uid_0.fail.sh
@@ -6583,12 +3975,12 @@ index 987fb5d8b..8b5d81151 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/root_logins/ensure_pam_wheel_group_empty/bash/shared.sh b/linux_os/guide/system/accounts/accounts-restrictions/root_logins/ensure_pam_wheel_group_empty/bash/shared.sh
-index df4c8338b..481ceb571 100644
+index b4e23e24b..944921420 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/root_logins/ensure_pam_wheel_group_empty/bash/shared.sh
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/root_logins/ensure_pam_wheel_group_empty/bash/shared.sh
 @@ -1,4 +1,4 @@
--# platform = multi_platform_rhel,multi_platform_sle,multi_platform_slmicro,multi_platform_ubuntu
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_slmicro,multi_platform_ubuntu
+-# platform = multi_platform_rhel,multi_platform_sle,multi_platform_slmicro,multi_platform_ubuntu,multi_platform_debian
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_slmicro,multi_platform_ubuntu,multi_platform_debian
  
  {{{ bash_instantiate_variables("var_pam_wheel_group_for_su") }}}
  
@@ -6614,56 +4006,17 @@ index 9bbbb9585..766df9993 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/system/accounts/accounts-restrictions/root_logins/use_pam_wheel_group_for_su/bash/shared.sh b/linux_os/guide/system/accounts/accounts-restrictions/root_logins/use_pam_wheel_group_for_su/bash/shared.sh
-index cb7530b38..c33fd385c 100644
+index 981e15a27..95e86e821 100644
 --- a/linux_os/guide/system/accounts/accounts-restrictions/root_logins/use_pam_wheel_group_for_su/bash/shared.sh
 +++ b/linux_os/guide/system/accounts/accounts-restrictions/root_logins/use_pam_wheel_group_for_su/bash/shared.sh
 @@ -1,4 +1,4 @@
--# platform = multi_platform_rhel,multi_platform_sle,multi_platform_slmicro,multi_platform_ubuntu
-+# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_slmicro,multi_platform_ubuntu
+-# platform = multi_platform_rhel,multi_platform_sle,multi_platform_slmicro,multi_platform_ubuntu,multi_platform_debian
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_sle,multi_platform_slmicro,multi_platform_ubuntu,multi_platform_debian
  {{{ bash_instantiate_variables("var_pam_wheel_group_for_su") }}}
  
  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 2e307c76d..e93883e93 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
-@@ -29,7 +29,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-020610
-     stigid@ol8: OL08-00-010760
--    stigid@rhel8: RHEL-08-010760
-+    stigid@almalinux8: RHEL-08-010760
-     stigid@sle12: SLES-12-010720
-     stigid@sle15: SLES-15-020110
- 
-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 0edacb272..07845d6d5 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
-@@ -31,7 +31,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00226
-     stigid@ol7: OL07-00-010430
-     stigid@ol8: OL08-00-020310
--    stigid@rhel8: RHEL-08-020310
-+    stigid@almalinux8: RHEL-08-020310
-     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/rule.yml b/linux_os/guide/system/accounts/accounts-session/accounts_max_concurrent_login_sessions/rule.yml
-index 1c9f0b0ad..1a1f1f553 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
-@@ -38,7 +38,7 @@ references:
-     srg: SRG-OS-000027-GPOS-00008
-     stigid@ol7: OL07-00-040000
-     stigid@ol8: OL08-00-020024
--    stigid@rhel8: RHEL-08-020024
-+    stigid@almalinux8: RHEL-08-020024
-     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 d3798de62..19761e09d 100644
+index 4d08bb696..febed69bb 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 @@
@@ -6673,7 +4026,7 @@ index d3798de62..19761e09d 100644
  # 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 da628bc5e..90f23cb90 100644
+index 12a861bb1..d16d24b51 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 @@
@@ -6682,136 +4035,6 @@ index da628bc5e..90f23cb90 100644
  # 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 84a8060c6..cedad6e9f 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
-@@ -32,7 +32,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-020730
-     stigid@ol8: OL08-00-010660
--    stigid@rhel8: RHEL-08-010660
-+    stigid@almalinux8: RHEL-08-010660
-     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 e6e284cdf..396344224 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
-@@ -33,7 +33,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-020720
-     stigid@ol8: OL08-00-010690
--    stigid@rhel8: RHEL-08-010690
-+    stigid@almalinux8: RHEL-08-010690
-     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 e0909e308..d021fd23b 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
-@@ -29,7 +29,7 @@ identifiers:
- references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol8: OL08-00-010720
--    stigid@rhel8: RHEL-08-010720
-+    stigid@almalinux8: RHEL-08-010720
-     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 b77a2f227..60ac0a5e2 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
-@@ -34,7 +34,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-020620
-     stigid@ol8: OL08-00-010750
--    stigid@rhel8: RHEL-08-010750
-+    stigid@almalinux8: RHEL-08-010750
-     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 549ecb72f..e86593cb9 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
-@@ -31,7 +31,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-020670
-     stigid@ol8: OL08-00-010741
--    stigid@rhel8: RHEL-08-010741
-+    stigid@almalinux8: RHEL-08-010741
- 
- 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 7c3afdd2e..f84f0371a 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:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-020680
-     stigid@ol8: OL08-00-010731
--    stigid@rhel8: RHEL-08-010731
-+    stigid@almalinux8: RHEL-08-010731
- 
- 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 887d86eeb..d0c823da9 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
-@@ -38,7 +38,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-020650
-     stigid@ol8: OL08-00-010740
--    stigid@rhel8: RHEL-08-010740
-+    stigid@almalinux8: RHEL-08-010740
-     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_root/rule.yml b/linux_os/guide/system/accounts/accounts-session/file_permission_user_init_files_root/rule.yml
-index fa1807425..15cf9b391 100644
---- a/linux_os/guide/system/accounts/accounts-session/file_permission_user_init_files_root/rule.yml
-+++ b/linux_os/guide/system/accounts/accounts-session/file_permission_user_init_files_root/rule.yml
-@@ -24,7 +24,7 @@ identifiers:
- 
- references:
-     srg: SRG-OS-000480-GPOS-00227
--    stigid@rhel8: RHEL-08-010770
-+    stigid@almalinux8: RHEL-08-010770
- 
- ocil_clause: 'they are not 0740 or more permissive'
- 
-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 54dc785f5..090e97440 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
-@@ -31,7 +31,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-020630
-     stigid@ol8: OL08-00-010730
--    stigid@rhel8: RHEL-08-010730
-+    stigid@almalinux8: RHEL-08-010730
-     stigid@sle12: SLES-12-010740
-     stigid@sle15: SLES-15-040090
- 
-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 5ce2ccf7a..f96d468ef 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
-@@ -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
- 
- 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..7e31e6291 100644
 --- a/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_bashrc/tests/stig_correct.pass.sh
@@ -6824,19 +4047,6 @@ index 5dac9eec3..7e31e6291 100644
  # packages = bash
  
  sed -i '/umask/d' /etc/bashrc
-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 e49569122..65803d2ff 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
-@@ -32,7 +32,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
- 
- 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..c81ef7ee7 100644
 --- a/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_etc_csh_cshrc/tests/stig_correct.pass.sh
@@ -6849,45 +4059,6 @@ index 04f6247a8..c81ef7ee7 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 f350abfe6..71ac555b5 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
-@@ -38,7 +38,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00228
-     stigid@ol7: OL07-00-020240
-     stigid@ol8: OL08-00-020351
--    stigid@rhel8: RHEL-08-020351
-+    stigid@almalinux8: RHEL-08-020351
-     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 9abf1e488..a0945232f 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
-@@ -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
- 
- 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/rule.yml b/linux_os/guide/system/accounts/accounts-session/user_umask/accounts_umask_interactive_users/rule.yml
-index a7a0370fd..b1dc8fea5 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
-@@ -26,7 +26,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227,SRG-OS-000480-GPOS-00228
-     stigid@ol7: OL07-00-021040
-     stigid@ol8: OL08-00-020352
--    stigid@rhel8: RHEL-08-020352
-+    stigid@almalinux8: RHEL-08-020352
- 
- 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/enable_authselect/ansible/shared.yml b/linux_os/guide/system/accounts/enable_authselect/ansible/shared.yml
 index 7f399477a..0c427d51c 100644
 --- a/linux_os/guide/system/accounts/enable_authselect/ansible/shared.yml
@@ -6920,19 +4091,6 @@ index 15a64d147..e1c3c4680 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/bootloader-grub2/grub2_init_on_free/rule.yml b/linux_os/guide/system/bootloader-grub2/grub2_init_on_free/rule.yml
-index a897008f7..ad34afed0 100644
---- a/linux_os/guide/system/bootloader-grub2/grub2_init_on_free/rule.yml
-+++ b/linux_os/guide/system/bootloader-grub2/grub2_init_on_free/rule.yml
-@@ -21,7 +21,7 @@ references:
-     nist: SC-3
-     srg: SRG-OS-000134-GPOS-00068
-     stigid@ol8: OL08-00-010423
--    stigid@rhel8: RHEL-08-010423
-+    stigid@almalinux8: RHEL-08-010423
- 
- platform: grub2
- 
 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..06507fba6 100644
 --- a/linux_os/guide/system/bootloader-grub2/grub2_kernel_trust_cpu_rng/tests/arg_not_there.fail.sh
@@ -6968,51 +4126,12 @@ index c4213caf8..2248a137c 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 0a49dc260..bbade243a 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
-@@ -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
- 
- 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 c71431c29..c2778763e 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
-@@ -25,7 +25,7 @@ references:
-     ospp: FPT_ASLR_EXT.1
-     srg: SRG-OS-000480-GPOS-00227,SRG-OS-000134-GPOS-00068
-     stigid@ol8: OL08-00-010422
--    stigid@rhel8: RHEL-08-010422
-+    stigid@almalinux8: RHEL-08-010422
- 
- 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 652423d95..e475b99bb 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
-@@ -52,7 +52,7 @@ references:
-     srg: SRG-OS-000080-GPOS-00048
-     stigid@ol7: OL07-00-010483
-     stigid@ol8: OL08-00-010149
--    stigid@rhel8: RHEL-08-010149
-+    stigid@almalinux8: RHEL-08-010149
- 
- 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
+index ade584e5f..c92104a58 100644
 --- 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
 @@ -3,7 +3,7 @@
-     {{{ oval_metadata("The grub2 boot loader should have password protection enabled.") }}}
+     {{{ oval_metadata("The grub2 boot loader should have password protection enabled.", rule_title=rule_title) }}}
  
      
 -      {{% if product in ["ol7", "ol8", "ol9", "rhel8"] %}}
@@ -7020,45 +4139,6 @@ index f5b957e88..b678a4e70 100644
        
        {{% else %}}
        
-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 477129bc4..6aac4770a 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
-@@ -68,7 +68,7 @@ references:
-     srg: SRG-OS-000080-GPOS-00048
-     stigid@ol7: OL07-00-010482
-     stigid@ol8: OL08-00-010150
--    stigid@rhel8: RHEL-08-010150
-+    stigid@almalinux8: RHEL-08-010150
-     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 686370abc..45d712cf4 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
-@@ -53,7 +53,7 @@ references:
-     srg: SRG-OS-000080-GPOS-00048
-     stigid@ol7: OL07-00-010492
-     stigid@ol8: OL08-00-010141
--    stigid@rhel8: RHEL-08-010141
-+    stigid@almalinux8: RHEL-08-010141
- 
- 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 24f45e8a8..1a3cb0b84 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
-@@ -69,7 +69,7 @@ references:
-     srg: SRG-OS-000080-GPOS-00048
-     stigid@ol7: OL07-00-010491
-     stigid@ol8: OL08-00-010140
--    stigid@rhel8: RHEL-08-010140
-+    stigid@almalinux8: RHEL-08-010140
-     stigid@sle12: SLES-12-010440
-     stigid@sle15: SLES-15-010200
-     stigid@ubuntu2004: UBTU-20-010009
 diff --git a/linux_os/guide/system/bootloader-zipl/zipl_audit_argument/tests/correct_option.pass.sh b/linux_os/guide/system/bootloader-zipl/zipl_audit_argument/tests/correct_option.pass.sh
 index 7a828837f..87f430c10 100644
 --- a/linux_os/guide/system/bootloader-zipl/zipl_audit_argument/tests/correct_option.pass.sh
@@ -7181,7 +4261,7 @@ index 9d330c919..235a05e16 100644
  # Remove init_on_alloc=1 from all boot entries
  sed -Ei 's/(^options.*\s)init_on_alloc=1(.*?)$/\1\2/' /boot/loader/entries/*
 diff --git a/linux_os/guide/system/bootloader-zipl/zipl_systemd_debug-shell_argument_absent/ansible/shared.yml b/linux_os/guide/system/bootloader-zipl/zipl_systemd_debug-shell_argument_absent/ansible/shared.yml
-index 5585e0eaf..a298acf01 100644
+index b36aca3cf..6f39b67ec 100644
 --- a/linux_os/guide/system/bootloader-zipl/zipl_systemd_debug-shell_argument_absent/ansible/shared.yml
 +++ b/linux_os/guide/system/bootloader-zipl/zipl_systemd_debug-shell_argument_absent/ansible/shared.yml
 @@ -1,4 +1,4 @@
@@ -7244,71 +4324,6 @@ index 0c2febb03..5b5dbf360 100644
  
  # Make sure boot loader entries doesn't contain systemd.debug-shell
  sed -Ei 's/(^options.*)\s\bsystemd.debug-shell\b\S*(.*?)$/\1\2/' /boot/loader/entries/*
-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 26fdf83a0..16d8d4693 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:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-021100
-     stigid@ol8: OL08-00-030010
--    stigid@rhel8: RHEL-08-030010
-+    stigid@almalinux8: RHEL-08-030010
- 
- 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/rule.yml b/linux_os/guide/system/logging/ensure_rsyslog_log_file_configuration/rsyslog_encrypt_offload_actionsendstreamdriverauthmode/rule.yml
-index 0c307a545..0c5f4197f 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
-@@ -32,7 +32,7 @@ references:
-     nist: AU-4(1)
-     srg: SRG-OS-000342-GPOS-00133,SRG-OS-000479-GPOS-00224
-     stigid@ol8: OL08-00-030720
--    stigid@rhel8: RHEL-08-030720
-+    stigid@almalinux8: RHEL-08-030720
- 
- 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 dc188c60b..31afcc4dc 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
-@@ -33,7 +33,7 @@ references:
-     nist: AU-4(1)
-     srg: SRG-OS-000342-GPOS-00133,SRG-OS-000479-GPOS-00224
-     stigid@ol8: OL08-00-030710
--    stigid@rhel8: RHEL-08-030710
-+    stigid@almalinux8: RHEL-08-030710
- 
- 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 4e83436a9..6d6117637 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
-@@ -33,7 +33,7 @@ references:
-     nist: AU-4(1)
-     srg: SRG-OS-000342-GPOS-00133,SRG-OS-000479-GPOS-00224
-     stigid@ol8: OL08-00-030710
--    stigid@rhel8: RHEL-08-030710
-+    stigid@almalinux8: RHEL-08-030710
- 
- 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 bea3d658d..08c9d75d2 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
-@@ -34,7 +34,7 @@ references:
-     nist: AC-17(1)
-     srg: SRG-OS-000032-GPOS-00013
-     stigid@ol8: OL08-00-010070
--    stigid@rhel8: RHEL-08-010070
-+    stigid@almalinux8: RHEL-08-010070
-     stigid@ubuntu2004: UBTU-20-010403
-     stigid@ubuntu2204: UBTU-22-652015
- 
 diff --git a/linux_os/guide/system/logging/journald/journald_disable_forward_to_syslog/rule.yml b/linux_os/guide/system/logging/journald/journald_disable_forward_to_syslog/rule.yml
 index 78cbee326..30b54f1eb 100644
 --- a/linux_os/guide/system/logging/journald/journald_disable_forward_to_syslog/rule.yml
@@ -7346,112 +4361,8 @@ index 03353d5fa..e768443cb 100644
  warnings:
      - general:
          The Systemd unit logrotate.timer 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 d1a844fab..95b823e82 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
-@@ -27,7 +27,7 @@ identifiers:
- references:
-     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
- 
- 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 45dab8d41..e9d176369 100644
---- a/linux_os/guide/system/logging/package_rsyslog_installed/rule.yml
-+++ b/linux_os/guide/system/logging/package_rsyslog_installed/rule.yml
-@@ -32,7 +32,7 @@ references:
-     nist-csf: PR.PT-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
- 
- ocil_clause: 'the package is not installed'
- 
-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 c8620ef65..288d3df2f 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
-@@ -69,7 +69,7 @@ references:
-     srg: SRG-OS-000479-GPOS-00224,SRG-OS-000480-GPOS-00227,SRG-OS-000342-GPOS-00133
-     stigid@ol7: OL07-00-031000
-     stigid@ol8: OL08-00-030690
--    stigid@rhel8: RHEL-08-030690
-+    stigid@almalinux8: RHEL-08-030690
-     stigid@sle12: SLES-12-030340
-     stigid@sle15: SLES-15-010580
- 
-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 50c27e2b4..28b036eb1 100644
---- a/linux_os/guide/system/logging/service_rsyslog_enabled/rule.yml
-+++ b/linux_os/guide/system/logging/service_rsyslog_enabled/rule.yml
-@@ -34,7 +34,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@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 0748fbe6a..2eba9d806 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
-@@ -26,7 +26,7 @@ references:
-     nist: SC-5
-     srg: SRG-OS-000420-GPOS-00186
-     stigid@ol8: OL08-00-040150
--    stigid@rhel8: RHEL-08-040150
-+    stigid@almalinux8: RHEL-08-040150
- 
- 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 53457370a..3c7cdbc6c 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
-@@ -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@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 5df3a9f7e..0bb8677d4 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
-@@ -40,7 +40,7 @@ references:
-     srg: SRG-OS-000096-GPOS-00050,SRG-OS-000297-GPOS-00115,SRG-OS-000480-GPOS-00227,SRG-OS-000480-GPOS-00231,SRG-OS-000480-GPOS-00232
-     stigid@ol7: OL07-00-040520
-     stigid@ol8: OL08-00-040101
--    stigid@rhel8: RHEL-08-040101
-+    stigid@almalinux8: RHEL-08-040101
-     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 385ae418d..3f736e882 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
-@@ -48,7 +48,7 @@ references:
-     srg: SRG-OS-000096-GPOS-00050,SRG-OS-000297-GPOS-00115
-     stigid@ol7: OL07-00-040100
-     stigid@ol8: OL08-00-040030
--    stigid@rhel8: RHEL-08-040030
-+    stigid@almalinux8: RHEL-08-040030
- 
- 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 9dcd519ae..b1d824cfa 100644
+index 2cd2dedb0..208802dad 100644
 --- 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
 @@ -1,4 +1,4 @@
@@ -7460,32 +4371,6 @@ index 9dcd519ae..b1d824cfa 100644
  # reboot = false
  # 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 9dab45fda..67a7b329e 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:
-     nist: AC-17 (1)
-     srg: SRG-OS-000297-GPOS-00115
-     stigid@ol8: OL08-00-040090
--    stigid@rhel8: RHEL-08-040090
-+    stigid@almalinux8: RHEL-08-040090
- 
- 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 735302bf1..f1141827a 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
-@@ -42,7 +42,7 @@ references:
-     nist-csf: PR.IP-1,PR.PT-3
-     pcidss: Req-1.4
-     srg: SRG-OS-000480-GPOS-00227
--    stigid@rhel8: RHEL-08-040090
-+    stigid@almalinux8: RHEL-08-040090
- 
- 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 94cb0e893..d13183224 100644
 --- a/linux_os/guide/system/network/network-iptables/iptables_ruleset_modifications/ip6tables_rules_for_open_ports/sce/shared.sh
@@ -7552,19 +4437,6 @@ index 87306fedb..88e2884bc 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 06c00495b..5e8c30e9b 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
-@@ -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
- 
- {{{ 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
@@ -7576,19 +4448,6 @@ index 8792fc668..2c7c4b025 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 50feb8ea8..be6135293 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
-@@ -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@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
@@ -7600,32 +4459,6 @@ index e222b1c88..85b92ce90 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 af9d2bae0..3d22faf8e 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
-@@ -42,7 +42,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040830
-     stigid@ol8: OL08-00-040240
--    stigid@rhel8: RHEL-08-040240
-+    stigid@almalinux8: RHEL-08-040240
-     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 98f028634..a490e7986 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
-@@ -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@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
@@ -7637,19 +4470,6 @@ index 4ed2c480c..f59b6d7c3 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 765c117ea..29b6e394a 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
-@@ -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
- 
- {{{ 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
@@ -7661,19 +4481,6 @@ index 845b013ed..063776b85 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 253504442..b70ac8cd3 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
-@@ -36,7 +36,7 @@ references:
-     nist@slmicro5: 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@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
@@ -7685,19 +4492,6 @@ index e2951d845..0335df123 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 40faa8c90..3e38e3bb1 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
-@@ -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@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..4ed7925d6 100644
 --- a/linux_os/guide/system/network/network-ipv6/disabling_ipv6/grub2_ipv6_disable_argument/tests/arg_not_there_rhel8.fail.sh
@@ -7741,19 +4535,6 @@ index 6bb6de134..1f0664a02 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 606b45f2a..3e09ff541 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
-@@ -42,7 +42,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040641
-     stigid@ol8: OL08-00-040279
--    stigid@rhel8: RHEL-08-040279
-+    stigid@almalinux8: RHEL-08-040279
-     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
@@ -7765,32 +4546,6 @@ index b3d72bb4a..b89b8a35a 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 444427b88..6e82f0da6 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
-@@ -43,7 +43,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040610
-     stigid@ol8: OL08-00-040239
--    stigid@rhel8: RHEL-08-040239
-+    stigid@almalinux8: RHEL-08-040239
-     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 039b2fc1a..3bb95737f 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
-@@ -21,7 +21,7 @@ references:
-     nist: CM-6(b)
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol8: OL08-00-040259
--    stigid@rhel8: RHEL-08-040259
-+    stigid@almalinux8: RHEL-08-040259
- 
- 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
@@ -7813,19 +4568,17 @@ index c64da37a3..08535e5a1 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 3a119705f..339db5a6d 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
-@@ -40,7 +40,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040611
-     stigid@ol8: OL08-00-040285
--    stigid@rhel8: RHEL-08-040285
-+    stigid@almalinux8: RHEL-08-040285
+diff --git a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_rp_filter/tests/value_2.pass.sh b/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_rp_filter/tests/value_2.pass.sh
+index 60e461321..510253deb 100644
+--- a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_rp_filter/tests/value_2.pass.sh
++++ b/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_rp_filter/tests/value_2.pass.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+-# platform = Oracle Linux 7,Oracle Linux 8,Red Hat Enterprise Linux 8,multi_platform_almalinux
++# platform = Oracle Linux 7,Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux OS 8,multi_platform_almalinux
  
- ocil: |-
-     The runtime status of the net.ipv4.conf.all.rp_filter parameter can be queried
+ # Clean sysctl config directories
+ rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
 diff --git a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_secure_redirects/kubernetes/shared.yml b/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_secure_redirects/kubernetes/shared.yml
 index 8b075d55e..0dd17a34b 100644
 --- a/linux_os/guide/system/network/network-kernel/network_host_and_router_parameters/sysctl_net_ipv4_conf_all_secure_redirects/kubernetes/shared.yml
@@ -7848,19 +4601,6 @@ index 2bfbd9e46..8ea37100a 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 013604800..ecabe0cdb 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
-@@ -42,7 +42,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040640
-     stigid@ol8: OL08-00-040209
--    stigid@rhel8: RHEL-08-040209
-+    stigid@almalinux8: RHEL-08-040209
-     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
@@ -7872,19 +4612,6 @@ index aa7d1562b..08668d03c 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 7a8c3f22e..e120e306a 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
-@@ -44,7 +44,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040620
-     stigid@ol8: OL08-00-040249
--    stigid@rhel8: RHEL-08-040249
-+    stigid@almalinux8: RHEL-08-040249
-     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
@@ -7929,19 +4656,6 @@ index 52d74441b..08c8c256d 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 99820e36b..7829b61bf 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
-@@ -42,7 +42,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040630
-     stigid@ol8: OL08-00-040230
--    stigid@rhel8: RHEL-08-040230
-+    stigid@almalinux8: RHEL-08-040230
-     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
@@ -7975,19 +4689,6 @@ index ea1db12fe..5d8b19f68 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 b78553833..2f932ba0d 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
-@@ -41,7 +41,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040660
-     stigid@ol8: OL08-00-040220
--    stigid@rhel8: RHEL-08-040220
-+    stigid@almalinux8: RHEL-08-040220
-     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
@@ -7999,19 +4700,6 @@ index b54e3d12b..125464d7a 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 f7739e381..289522c4a 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
-@@ -41,7 +41,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040650
-     stigid@ol8: OL08-00-040270
--    stigid@rhel8: RHEL-08-040270
-+    stigid@almalinux8: RHEL-08-040270
-     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
@@ -8023,110 +4711,6 @@ index 89d344c4f..1a926adaa 100644
  # check-import = stdout
  
  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 a9117da8f..1f2175950 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
-@@ -25,7 +25,7 @@ references:
-     nist: AC-18
-     srg: SRG-OS-000095-GPOS-00049,SRG-OS-000480-GPOS-00227
-     stigid@ol8: OL08-00-040021
--    stigid@rhel8: RHEL-08-040021
-+    stigid@almalinux8: RHEL-08-040021
- 
- {{{ 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 ffe4cc358..5112b0218 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
-@@ -26,7 +26,7 @@ references:
-     ospp: FMT_SMF_EXT.1
-     srg: SRG-OS-000095-GPOS-00049,SRG-OS-000480-GPOS-00227
-     stigid@ol8: OL08-00-040022
--    stigid@rhel8: RHEL-08-040022
-+    stigid@almalinux8: RHEL-08-040022
- 
- {{{ complete_ocil_entry_module_disable(module="can") }}}
- 
-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 0f149d8b9..443fd3259 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
-@@ -24,7 +24,7 @@ references:
-     nist: AC-18
-     srg: SRG-OS-000095-GPOS-00049
-     stigid@ol8: OL08-00-040026
--    stigid@rhel8: RHEL-08-040026
-+    stigid@almalinux8: RHEL-08-040026
- 
- {{{ 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 4d5256401..5d532c285 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
-@@ -43,7 +43,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
- 
- {{{ 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 9611fd778..e05a2c73e 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
-@@ -40,7 +40,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
- 
- {{{ 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 e83b04eaa..c4c7272e9 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:
-     ospp: FMT_SMF_EXT.1
-     srg: SRG-OS-000095-GPOS-00049,SRG-OS-000300-GPOS-00118
-     stigid@ol8: OL08-00-040111
--    stigid@rhel8: RHEL-08-040111
-+    stigid@almalinux8: RHEL-08-040111
- 
- {{{ 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 b466147d6..029443c1b 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
-@@ -62,7 +62,7 @@ references:
-     srg: SRG-OS-000299-GPOS-00117,SRG-OS-000300-GPOS-00118,SRG-OS-000424-GPOS-00188,SRG-OS-000481-GPOS-00481
-     stigid@ol7: OL07-00-041010
-     stigid@ol8: OL08-00-040110
--    stigid@rhel8: RHEL-08-040110
-+    stigid@almalinux8: RHEL-08-040110
-     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 721dec3f7..ccda3da28 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
-@@ -51,7 +51,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040600
-     stigid@ol8: OL08-00-010680
--    stigid@rhel8: RHEL-08-010680
-+    stigid@almalinux8: RHEL-08-010680
- 
- ocil_clause: 'less than two lines are returned that are not commented out'
- 
 diff --git a/linux_os/guide/system/network/network_disable_zeroconf/bash/shared.sh b/linux_os/guide/system/network/network_disable_zeroconf/bash/shared.sh
 index 7e8b5abc0..63e5790c3 100644
 --- a/linux_os/guide/system/network/network_disable_zeroconf/bash/shared.sh
@@ -8135,279 +4719,116 @@ index 7e8b5abc0..63e5790c3 100644
 -# platform = Red Hat Enterprise Linux 8
 +# platform = Red Hat Enterprise Linux 8,AlmaLinux OS 8
  echo "NOZEROCONF=yes" >> /etc/sysconfig/network
-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 440092fee..3d37f4ff9 100644
---- a/linux_os/guide/system/network/network_sniffer_disabled/rule.yml
-+++ b/linux_os/guide/system/network/network_sniffer_disabled/rule.yml
-@@ -45,7 +45,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-040670
-     stigid@ol8: OL08-00-040330
--    stigid@rhel8: RHEL-08-040330
-+    stigid@almalinux8: RHEL-08-040330
-     stigid@sle12: SLES-12-030440
-     stigid@sle15: SLES-15-040390
+diff --git a/linux_os/guide/system/permissions/files/dir_perms_world_writable_sticky_bits/sce/shared.sh b/linux_os/guide/system/permissions/files/dir_perms_world_writable_sticky_bits/sce/shared.sh
+index 0eee598bf..c3aa51320 100644
+--- a/linux_os/guide/system/permissions/files/dir_perms_world_writable_sticky_bits/sce/shared.sh
++++ b/linux_os/guide/system/permissions/files/dir_perms_world_writable_sticky_bits/sce/shared.sh
+@@ -1,5 +1,5 @@
+ #!/usr/bin/env bash
+-# platform = multi_platform_fedora,multi_platform_rhel
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux
+ # check-import = stdout
  
-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 783653bd4..148ab9d43 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
-@@ -24,7 +24,7 @@ identifiers:
+ {{{ find_directories(find_parameters="\( -perm -0002 -a ! -perm -1000 \)", fail_message="Found directories with writable sticky bits") }}}
+diff --git a/linux_os/guide/system/permissions/files/dir_perms_world_writable_system_owned/sce/shared.sh b/linux_os/guide/system/permissions/files/dir_perms_world_writable_system_owned/sce/shared.sh
+index facc0ad8d..f19540f78 100644
+--- a/linux_os/guide/system/permissions/files/dir_perms_world_writable_system_owned/sce/shared.sh
++++ b/linux_os/guide/system/permissions/files/dir_perms_world_writable_system_owned/sce/shared.sh
+@@ -1,5 +1,5 @@
+ #!/usr/bin/env bash
+-# platform = multi_platform_fedora,multi_platform_rhel
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux
+ # check-import = stdout
  
- references:
-     srg: SRG-OS-000480-GPOS-00227,SRG-OS-000138-GPOS-00069
--    stigid@rhel8: RHEL-08-010700
-+    stigid@almalinux8: RHEL-08-010700
+ {{{ find_directories(find_parameters="-perm -0002 -uid +"~uid_min, fail_message="Found world-writable directories that are not owned by a system account") }}}
+diff --git a/linux_os/guide/system/permissions/files/file_permissions_unauthorized_sgid/sce/shared.sh b/linux_os/guide/system/permissions/files/file_permissions_unauthorized_sgid/sce/shared.sh
+index a6fb2064a..4d8f7030f 100644
+--- a/linux_os/guide/system/permissions/files/file_permissions_unauthorized_sgid/sce/shared.sh
++++ b/linux_os/guide/system/permissions/files/file_permissions_unauthorized_sgid/sce/shared.sh
+@@ -1,5 +1,5 @@
+ #!/usr/bin/env bash
+-# platform = multi_platform_fedora,multi_platform_rhel
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux
+ # check-import = stdout
  
- ocil_clause: 'there are world-writable directories not owned by root'
+ {{{ find_files(find_parameters="-perm -2000", fail_message="Found SGID executables that are unauthorized", skip_rpm_owned_files=True) }}}
+diff --git a/linux_os/guide/system/permissions/files/file_permissions_unauthorized_suid/sce/shared.sh b/linux_os/guide/system/permissions/files/file_permissions_unauthorized_suid/sce/shared.sh
+index d7bb76269..08156544b 100644
+--- a/linux_os/guide/system/permissions/files/file_permissions_unauthorized_suid/sce/shared.sh
++++ b/linux_os/guide/system/permissions/files/file_permissions_unauthorized_suid/sce/shared.sh
+@@ -1,5 +1,5 @@
+ #!/usr/bin/env bash
+-# platform = multi_platform_fedora,multi_platform_rhel
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux
+ # check-import = stdout
  
-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 16bb4555b..60b5b5539 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
-@@ -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@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 9782b2dc0..0a56376ec 100644
---- 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
-@@ -37,7 +37,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-021030
-     stigid@ol8: OL08-00-010710
--    stigid@rhel8: RHEL-08-010710
-+    stigid@almalinux8: RHEL-08-010710
-     stigid@sle12: SLES-12-010830
-     stigid@sle15: SLES-15-040180
+ {{{ find_files(find_parameters="-perm -4000", fail_message="Found SUID executables that are unauthorized", skip_rpm_owned_files=True) }}}
+diff --git a/linux_os/guide/system/permissions/files/file_permissions_unauthorized_world_writable/sce/shared.sh b/linux_os/guide/system/permissions/files/file_permissions_unauthorized_world_writable/sce/shared.sh
+index bca90c8ba..4ed275284 100644
+--- a/linux_os/guide/system/permissions/files/file_permissions_unauthorized_world_writable/sce/shared.sh
++++ b/linux_os/guide/system/permissions/files/file_permissions_unauthorized_world_writable/sce/shared.sh
+@@ -1,5 +1,5 @@
+ #!/usr/bin/env bash
+-# platform = multi_platform_fedora,multi_platform_rhel,Ubuntu 24.04
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Ubuntu 24.04
+ # check-import = stdout
  
-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 3f171b7d9..5e060cca9 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
-@@ -49,7 +49,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-020330
-     stigid@ol8: OL08-00-010790
--    stigid@rhel8: RHEL-08-010790
-+    stigid@almalinux8: RHEL-08-010790
-     stigid@sle12: SLES-12-010700
-     stigid@sle15: SLES-15-040410
+ {{{ find_files(find_parameters="-perm -002", fail_message="Found world-writable files") }}}
+diff --git a/linux_os/guide/system/permissions/files/file_permissions_unauthorized_world_writable/tests/world_writable_tmp.fail.sh b/linux_os/guide/system/permissions/files/file_permissions_unauthorized_world_writable/tests/world_writable_tmp.fail.sh
+index c6b866ea6..392196483 100644
+--- a/linux_os/guide/system/permissions/files/file_permissions_unauthorized_world_writable/tests/world_writable_tmp.fail.sh
++++ b/linux_os/guide/system/permissions/files/file_permissions_unauthorized_world_writable/tests/world_writable_tmp.fail.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+-# platform = multi_platform_rhel,multi_platform_ubuntu
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_ubuntu
  
-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 9b788d56e..795e4d5c3 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
-@@ -46,7 +46,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-020320
-     stigid@ol8: OL08-00-010780
--    stigid@rhel8: RHEL-08-010780
-+    stigid@almalinux8: RHEL-08-010780
-     stigid@sle12: SLES-12-010690
-     stigid@sle15: SLES-15-040400
+ find / -xdev -type f -perm -002 -exec chmod o-w {} \;
  
-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 b4c59242a..cae0931a4 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 @@ identifiers:
- references:
-     srg: SRG-OS-000206-GPOS-00084,SRG-APP-000118-CTR-000240
-     stigid@ol8: OL08-00-010260
--    stigid@rhel8: RHEL-08-010260
-+    stigid@almalinux8: RHEL-08-010260
-     stigid@ubuntu2004: UBTU-20-010417
-     stigid@ubuntu2204: UBTU-22-232125
+diff --git a/linux_os/guide/system/permissions/files/file_permissions_ungroupowned/sce/shared.sh b/linux_os/guide/system/permissions/files/file_permissions_ungroupowned/sce/shared.sh
+index 02e5cd08e..104d1371a 100644
+--- a/linux_os/guide/system/permissions/files/file_permissions_ungroupowned/sce/shared.sh
++++ b/linux_os/guide/system/permissions/files/file_permissions_ungroupowned/sce/shared.sh
+@@ -1,5 +1,5 @@
+ #!/usr/bin/env bash
+-# platform = multi_platform_fedora,multi_platform_rhel,Ubuntu 24.04
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Ubuntu 24.04
+ # check-import = stdout
  
-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 8d2f3da96..1b1633efa 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
-@@ -22,7 +22,7 @@ identifiers:
- references:
-     srg: SRG-OS-000206-GPOS-00084
-     stigid@ol8: OL08-00-010230
--    stigid@rhel8: RHEL-08-010230
-+    stigid@almalinux8: RHEL-08-010230
+ {{{ find_files(find_parameters="-nogroup", fail_message="Found ungroupowned files", exclude_directories="sysroot") }}}
+diff --git a/linux_os/guide/system/permissions/files/file_permissions_ungroupowned/tests/unowned_file_tmp.fail.sh b/linux_os/guide/system/permissions/files/file_permissions_ungroupowned/tests/unowned_file_tmp.fail.sh
+index 44f6c84dd..b37b68810 100644
+--- a/linux_os/guide/system/permissions/files/file_permissions_ungroupowned/tests/unowned_file_tmp.fail.sh
++++ b/linux_os/guide/system/permissions/files/file_permissions_ungroupowned/tests/unowned_file_tmp.fail.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+-# platform = multi_platform_rhel,multi_platform_ubuntu
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_ubuntu
+ # remediation = none
  
- {{%- if product in ['ubuntu2404'] %}}
- ocil_clause: '{{{ ocil_clause_file_group_owner(file="/var/log/messages", group="adm|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 1e8a07187..edcb32528 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 @@ identifiers:
- references:
-     srg: SRG-OS-000206-GPOS-00084,SRG-APP-000118-CTR-000240
-     stigid@ol8: OL08-00-010250
--    stigid@rhel8: RHEL-08-010250
-+    stigid@almalinux8: RHEL-08-010250
-     stigid@ubuntu2004: UBTU-20-010418
-     stigid@ubuntu2204: UBTU-22-232120
+ mount tmpfs /tmp -t tmpfs
+diff --git a/linux_os/guide/system/permissions/files/no_files_unowned_by_user/sce/shared.sh b/linux_os/guide/system/permissions/files/no_files_unowned_by_user/sce/shared.sh
+index 1a134c3c2..2cd9dc9f0 100644
+--- a/linux_os/guide/system/permissions/files/no_files_unowned_by_user/sce/shared.sh
++++ b/linux_os/guide/system/permissions/files/no_files_unowned_by_user/sce/shared.sh
+@@ -1,5 +1,5 @@
+ #!/usr/bin/env bash
+-# platform = multi_platform_fedora,multi_platform_rhel,Ubuntu 24.04
++# platform = multi_platform_fedora,multi_platform_rhel,multi_platform_almalinux,Ubuntu 24.04
+ # check-import = stdout
  
-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 8c79597b0..1430d1b8f 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
-@@ -23,7 +23,7 @@ identifiers:
- references:
-     srg: SRG-OS-000206-GPOS-00084
-     stigid@ol8: OL08-00-010220
--    stigid@rhel8: RHEL-08-010220
-+    stigid@almalinux8: RHEL-08-010220
+ {{{ find_files(find_parameters="-nouser", fail_message="Found unowned files") }}}
+diff --git a/linux_os/guide/system/permissions/files/no_files_unowned_by_user/tests/unowned_file_tmp.fail.sh b/linux_os/guide/system/permissions/files/no_files_unowned_by_user/tests/unowned_file_tmp.fail.sh
+index 44f6c84dd..b37b68810 100644
+--- a/linux_os/guide/system/permissions/files/no_files_unowned_by_user/tests/unowned_file_tmp.fail.sh
++++ b/linux_os/guide/system/permissions/files/no_files_unowned_by_user/tests/unowned_file_tmp.fail.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+-# platform = multi_platform_rhel,multi_platform_ubuntu
++# platform = multi_platform_rhel,multi_platform_almalinux,multi_platform_ubuntu
+ # remediation = none
  
- {{%- if product in ['ubuntu2404'] %}}
- ocil_clause: '{{{ ocil_clause_file_owner(file="/var/log/messages", owner="syslog|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 b5794e3f5..ed95eebe3 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 @@ identifiers:
- references:
-     srg: SRG-OS-000206-GPOS-00084,SRG-APP-000118-CTR-000240
-     stigid@ol8: OL08-00-010240
--    stigid@rhel8: RHEL-08-010240
-+    stigid@almalinux8: RHEL-08-010240
-     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 d6bcde8ff..d6bca6feb 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
-@@ -27,7 +27,7 @@ identifiers:
- references:
-     srg: SRG-OS-000206-GPOS-00084
-     stigid@ol8: OL08-00-010210
--    stigid@rhel8: RHEL-08-010210
-+    stigid@almalinux8: RHEL-08-010210
- 
- ocil_clause: '{{{ ocil_clause_file_permissions(file="/var/log/messages", perms=target_perms) }}}'
- 
-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 143dadf52..63d51f40f 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
-@@ -39,7 +39,7 @@ references:
-     nist: CM-5(6),CM-5(6).1
-     srg: SRG-OS-000259-GPOS-00100
-     stigid@ol8: OL08-00-010351
--    stigid@rhel8: RHEL-08-010351
-+    stigid@almalinux8: RHEL-08-010351
-     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 079484a50..fc28c01f4 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
-@@ -38,7 +38,7 @@ references:
-     nist: CM-5(6),CM-5(6).1
-     srg: SRG-OS-000259-GPOS-00100
-     stigid@ol8: OL08-00-010341
--    stigid@rhel8: RHEL-08-010341
-+    stigid@almalinux8: RHEL-08-010341
-     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_permissions_library_dirs/rule.yml b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/dir_permissions_library_dirs/rule.yml
-index e4968a684..160216355 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
-@@ -45,7 +45,7 @@ references:
-     nist: CM-5,CM-5(6),CM-5(6).1
-     srg: SRG-OS-000259-GPOS-00100
-     stigid@ol8: OL08-00-010331
--    stigid@rhel8: RHEL-08-010331
-+    stigid@almalinux8: RHEL-08-010331
-     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/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 9fd99cb15..f64bb1fb4 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
-@@ -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@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/rule.yml b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_ownership_binary_dirs/rule.yml
-index 44a6ce121..5e5e48804 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:
-     nist-csf: PR.AC-4,PR.DS-5
-     srg: SRG-OS-000259-GPOS-00100
-     stigid@ol8: OL08-00-010310
--    stigid@rhel8: RHEL-08-010310
-+    stigid@almalinux8: RHEL-08-010310
-     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 fc6d9385d..8996ca632 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:
-     nist-csf: PR.AC-4,PR.DS-5
-     srg: SRG-OS-000259-GPOS-00100
-     stigid@ol8: OL08-00-010340
--    stigid@rhel8: RHEL-08-010340
-+    stigid@almalinux8: RHEL-08-010340
-     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_permissions_binary_dirs/rule.yml b/linux_os/guide/system/permissions/files/permissions_within_important_dirs/file_permissions_binary_dirs/rule.yml
-index 203410aef..712f35549 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:
-     nist-csf: PR.AC-4,PR.DS-5
-     srg: SRG-OS-000259-GPOS-00100
-     stigid@ol8: OL08-00-010300
--    stigid@rhel8: RHEL-08-010300
-+    stigid@almalinux8: RHEL-08-010300
-     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 7b1d3a081..5d2e252c2 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:
-     nist-csf: PR.AC-4,PR.DS-5
-     srg: SRG-OS-000259-GPOS-00100
-     stigid@ol8: OL08-00-010330
--    stigid@rhel8: RHEL-08-010330
-+    stigid@almalinux8: RHEL-08-010330
-     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 21c9a91d2..836697714 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
-@@ -43,7 +43,7 @@ references:
-     nist: CM-5(6),CM-5(6).1
-     srg: SRG-OS-000259-GPOS-00100
-     stigid@ol8: OL08-00-010350
--    stigid@rhel8: RHEL-08-010350
-+    stigid@almalinux8: RHEL-08-010350
-     stigid@sle12: SLES-12-010875
-     stigid@sle15: SLES-15-010355
-     stigid@ubuntu2004: UBTU-20-010430
+ mount tmpfs /tmp -t tmpfs
 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 af967f535..4847d0c3c 100644
 --- a/linux_os/guide/system/permissions/files/permissions_within_important_dirs/root_permissions_syslibrary_files/tests/correct_groupowner.pass.sh
@@ -8430,19 +4851,6 @@ index 1fd8fe347..5dc9e9538 100644
  
  groupadd group_test
  for TESTFILE in /lib/test_me /lib64/test_me /usr/lib/test_me /usr/lib64/test_me
-diff --git a/linux_os/guide/system/permissions/files/rootfiles/rootfiles_configured/rule.yml b/linux_os/guide/system/permissions/files/rootfiles/rootfiles_configured/rule.yml
-index 5bee83fa2..ebfe1729f 100644
---- a/linux_os/guide/system/permissions/files/rootfiles/rootfiles_configured/rule.yml
-+++ b/linux_os/guide/system/permissions/files/rootfiles/rootfiles_configured/rule.yml
-@@ -26,7 +26,7 @@ identifiers:
- 
- references:
-     srg: SRG-OS-000480-GPOS-00227
--    stigid@rhel8: RHEL-08-010770
-+    stigid@almalinux8: RHEL-08-010770
- 
- ocil_clause: 'that rootfiles are not configured correctly'
- 
 diff --git a/linux_os/guide/system/permissions/files/sysctl_fs_protected_hardlinks/kubernetes/shared.yml b/linux_os/guide/system/permissions/files/sysctl_fs_protected_hardlinks/kubernetes/shared.yml
 index b0d594003..4a71eccda 100644
 --- a/linux_os/guide/system/permissions/files/sysctl_fs_protected_hardlinks/kubernetes/shared.yml
@@ -8454,19 +4862,6 @@ index b0d594003..4a71eccda 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 57bb2b44d..803c58227 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
-@@ -25,7 +25,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
- 
- {{{ 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
@@ -8478,318 +4873,6 @@ index 5ce0decba..b7a4243e4 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 426934e4d..8666d405c 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
-@@ -27,7 +27,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
- 
- {{{ 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 28a1717b0..106537e90 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
-@@ -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
- 
- {{{ 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 047b74a20..f9afe95e0 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
-@@ -43,7 +43,7 @@ references:
-     srg: SRG-OS-000114-GPOS-00059,SRG-OS-000378-GPOS-00163,SRG-OS-000480-GPOS-00227,SRG-APP-000141-CTR-000315
-     stigid@ol7: OL07-00-020100
-     stigid@ol8: OL08-00-040080
--    stigid@rhel8: RHEL-08-040080
-+    stigid@almalinux8: RHEL-08-040080
-     stigid@sle12: SLES-12-010580
-     stigid@sle15: SLES-15-010480
-     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 e9f2e6a4e..465fa5f52 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
-@@ -50,7 +50,7 @@ references:
-     srg: SRG-OS-000114-GPOS-00059,SRG-OS-000378-GPOS-00163,SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-020110
-     stigid@ol8: OL08-00-040070
--    stigid@rhel8: RHEL-08-040070
-+    stigid@almalinux8: RHEL-08-040070
-     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 abf49782a..da17a4eaf 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
-@@ -25,7 +25,7 @@ references:
-     nist: CM-6(b),CM-6.1(iv)
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol8: OL08-00-010572
--    stigid@rhel8: RHEL-08-010572
-+    stigid@almalinux8: RHEL-08-010572
- 
- platform: mount[boot-efi]
- 
-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 034711b00..c9fc80cb3 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
-@@ -30,7 +30,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
- 
- 
- template:
-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 de9b8baa6..cac949ced 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
-@@ -42,7 +42,7 @@ references:
-     srg: SRG-OS-000368-GPOS-00154
-     stigid@ol7: OL07-00-021024
-     stigid@ol8: OL08-00-040120
--    stigid@rhel8: RHEL-08-040120
-+    stigid@almalinux8: RHEL-08-040120
- 
- 
- template:
-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 5b5c3bea4..476e3afb6 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
-@@ -44,7 +44,7 @@ references:
-     srg: SRG-OS-000368-GPOS-00154
-     stigid@ol7: OL07-00-021024
-     stigid@ol8: OL08-00-040122
--    stigid@rhel8: RHEL-08-040122
-+    stigid@almalinux8: RHEL-08-040122
- 
- 
- fixtext: |-
-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 6df669124..e20bda87d 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
-@@ -42,7 +42,7 @@ references:
-     srg: SRG-OS-000368-GPOS-00154
-     stigid@ol7: OL07-00-021024
-     stigid@ol8: OL08-00-040121
--    stigid@rhel8: RHEL-08-040121
-+    stigid@almalinux8: RHEL-08-040121
- 
- 
- template:
-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 4df0d576b..8a07ea6c2 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
-@@ -26,7 +26,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
- 
- 
- {{{ complete_ocil_entry_mount_option("/home", "noexec") }}}
-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 9055d8fa9..abc6ef00f 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
-@@ -36,7 +36,7 @@ references:
-     srg: SRG-OS-000368-GPOS-00154,SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-021000
-     stigid@ol8: OL08-00-010570
--    stigid@rhel8: RHEL-08-010570
-+    stigid@almalinux8: RHEL-08-010570
-     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 664ab3db8..76100739f 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
-@@ -44,7 +44,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
- 
- 
- fixtext: |-
-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 3ea8f6a78..657a05cf0 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
-@@ -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
- 
- 
- ocil_clause: 'a file system found in "/etc/fstab" refers to removable media and it does not have the "nodev" option set'
-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 36afd8b75..2dd5caa59 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
-@@ -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
- 
- 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 d9430f612..7c0fae699 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
-@@ -42,7 +42,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-021010
-     stigid@ol8: OL08-00-010620
--    stigid@rhel8: RHEL-08-010620
-+    stigid@almalinux8: RHEL-08-010620
-     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 672bfaffd..286f8430e 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
-@@ -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-040123
--    stigid@rhel8: RHEL-08-040123
-+    stigid@almalinux8: RHEL-08-040123
- 
- platform: 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 e59e9891b..78c8ecb19 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
-@@ -39,7 +39,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
- 
- platform: 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 678d4134d..7826d5ab6 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
-@@ -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-040124
--    stigid@rhel8: RHEL-08-040124
-+    stigid@almalinux8: RHEL-08-040124
- 
- platform: 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 6941648ec..1518c08b4 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
-@@ -32,7 +32,7 @@ references:
-     ospp: FMT_SMF_EXT.1
-     srg: SRG-OS-000368-GPOS-00154
-     stigid@ol8: OL08-00-040129
--    stigid@rhel8: RHEL-08-040129
-+    stigid@almalinux8: RHEL-08-040129
- 
- platform: 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 c9944fa73..23d5c1bb0 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
-@@ -30,7 +30,7 @@ references:
-     ospp: FMT_SMF_EXT.1
-     srg: SRG-OS-000368-GPOS-00154
-     stigid@ol8: OL08-00-040131
--    stigid@rhel8: RHEL-08-040131
-+    stigid@almalinux8: RHEL-08-040131
- 
- platform: 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 6e4c8c72b..875b70642 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
-@@ -31,7 +31,7 @@ references:
-     ospp: FMT_SMF_EXT.1
-     srg: SRG-OS-000368-GPOS-00154
-     stigid@ol8: OL08-00-040130
--    stigid@rhel8: RHEL-08-040130
-+    stigid@almalinux8: RHEL-08-040130
- 
- platform: 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 603590750..6460d2ea2 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
-@@ -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-040126
--    stigid@rhel8: RHEL-08-040126
-+    stigid@almalinux8: RHEL-08-040126
- 
- platform: 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 a91fa4b14..5f3e1c8ab 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
-@@ -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-040128
--    stigid@rhel8: RHEL-08-040128
-+    stigid@almalinux8: RHEL-08-040128
- 
- platform: 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 da230c6cc..77bd74653 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
-@@ -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-040127
--    stigid@rhel8: RHEL-08-040127
-+    stigid@almalinux8: RHEL-08-040127
- 
- platform: 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
@@ -8800,45 +4883,6 @@ 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 44743f89f..e457fa6d7 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
-@@ -33,7 +33,7 @@ references:
-     cis@ubuntu2204: 1.1.4.4
-     srg: SRG-OS-000368-GPOS-00154
-     stigid@ol8: OL08-00-040132
--    stigid@rhel8: RHEL-08-040132
-+    stigid@almalinux8: RHEL-08-040132
- 
- platform: 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 d897bb82f..d5905470c 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
-@@ -33,7 +33,7 @@ references:
-     cis@ubuntu2204: 1.1.4.2
-     srg: SRG-OS-000368-GPOS-00154
-     stigid@ol8: OL08-00-040134
--    stigid@rhel8: RHEL-08-040134
-+    stigid@almalinux8: RHEL-08-040134
- 
- platform: 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 eb4c872b1..1c47e4963 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
-@@ -33,7 +33,7 @@ references:
-     cis@ubuntu2204: 1.1.4.3
-     srg: SRG-OS-000368-GPOS-00154
-     stigid@ol8: OL08-00-040133
--    stigid@rhel8: RHEL-08-040133
-+    stigid@almalinux8: RHEL-08-040133
- 
- platform: 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
@@ -8850,19 +4894,6 @@ index d94802273..554e34e00 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 bb7b13db0..136ef4934 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
-@@ -38,7 +38,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
- 
- 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
@@ -8874,19 +4905,6 @@ index d94802273..554e34e00 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 ef51bdb74..59579139d 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
-@@ -38,7 +38,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
- 
- 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/kubernetes/shared.yml b/linux_os/guide/system/permissions/restrictions/coredumps/disable_users_coredumps/kubernetes/shared.yml
 index 41cbd1197..481afa583 100644
 --- a/linux_os/guide/system/permissions/restrictions/coredumps/disable_users_coredumps/kubernetes/shared.yml
@@ -8898,33 +4916,11 @@ index 41cbd1197..481afa583 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 d49563ab9..fed70f09c 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
-@@ -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
- 
- 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 505c638c0..59b320d04 100644
+index f211f3dd7..6d67604f7 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:
-     ospp: FMT_SMF_EXT.1
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol8: OL08-00-010672
--    stigid@rhel8: RHEL-08-010672
-+    stigid@almalinux8: RHEL-08-010672
- 
- ocil_clause: unit systemd-coredump.socket is not masked or running
- 
-@@ -50,7 +50,7 @@ template:
+@@ -49,7 +49,7 @@ template:
      name: socket_disabled
      vars:
          socketname: systemd-coredump
@@ -8954,19 +4950,6 @@ index 415b0486d..02b1e991a 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 e70e0db7c..700a65e1d 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:
-     ospp: FMT_SMF_EXT.1
-     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@sle12: SLES-12-030320
-     stigid@sle15: SLES-15-010540
- 
 diff --git a/linux_os/guide/system/permissions/restrictions/enable_execshield_settings/sysctl_kernel_randomize_va_space/kubernetes/shared.yml b/linux_os/guide/system/permissions/restrictions/enable_execshield_settings/sysctl_kernel_randomize_va_space/kubernetes/shared.yml
 index 7a4c107b2..22e209120 100644
 --- a/linux_os/guide/system/permissions/restrictions/enable_execshield_settings/sysctl_kernel_randomize_va_space/kubernetes/shared.yml
@@ -8978,71 +4961,6 @@ index 7a4c107b2..22e209120 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 acd3b3b1c..43ea4f5be 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
-@@ -36,7 +36,7 @@ references:
-     srg: SRG-OS-000433-GPOS-00193,SRG-OS-000480-GPOS-00227,SRG-APP-000450-CTR-001105
-     stigid@ol7: OL07-00-040201
-     stigid@ol8: OL08-00-010430
--    stigid@rhel8: RHEL-08-010430
-+    stigid@almalinux8: RHEL-08-010430
-     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 ea64fdae9..19f027642 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
-@@ -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
- 
-diff --git a/linux_os/guide/system/permissions/restrictions/kernel_module_uvcvideo_disabled/rule.yml b/linux_os/guide/system/permissions/restrictions/kernel_module_uvcvideo_disabled/rule.yml
-index debd5bf4f..a89681387 100644
---- a/linux_os/guide/system/permissions/restrictions/kernel_module_uvcvideo_disabled/rule.yml
-+++ b/linux_os/guide/system/permissions/restrictions/kernel_module_uvcvideo_disabled/rule.yml
-@@ -19,7 +19,7 @@ references:
-     nist: CM-7 (a),CM-7 (5) (b)
-     srg: SRG-OS-000095-GPOS-00049,SRG-OS-000370-GPOS-00155
-     stigid@ol8: OL08-00-040020
--    stigid@rhel8: RHEL-08-040020
-+    stigid@almalinux8: RHEL-08-040020
- 
- platform: system_with_kernel
- 
-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 ac6aa8404..3607d8da8 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
-@@ -27,7 +27,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
- 
- 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 955baed18..8899dd9aa 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
-@@ -27,7 +27,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
- 
- 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
@@ -9054,19 +4972,6 @@ index 88c683445..fa9b2020d 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 a94218c1b..4ca1cf722 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
-@@ -27,7 +27,7 @@ references:
-     nist: SC-7(10)
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol8: OL08-00-010671
--    stigid@rhel8: RHEL-08-010671
-+    stigid@almalinux8: RHEL-08-010671
- 
- 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
@@ -9078,19 +4983,6 @@ index 36e025cc3..e97acde11 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 ed853b05e..828361fe7 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
-@@ -28,7 +28,7 @@ references:
-     srg: SRG-OS-000132-GPOS-00067,SRG-OS-000138-GPOS-00069,SRG-APP-000243-CTR-000600
-     stigid@ol7: OL07-00-010375
-     stigid@ol8: OL08-00-010375
--    stigid@rhel8: RHEL-08-010375
-+    stigid@almalinux8: RHEL-08-010375
-     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
@@ -9102,19 +4994,6 @@ index 505b3c12b..cdf18e6dd 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 26fab4fd1..52e06e4ed 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:
-     ospp: FMT_SMF_EXT.1
-     srg: SRG-OS-000480-GPOS-00227,SRG-OS-000366-GPOS-00153
-     stigid@ol8: OL08-00-010372
--    stigid@rhel8: RHEL-08-010372
-+    stigid@almalinux8: RHEL-08-010372
- 
- {{{ 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
@@ -9126,19 +5005,6 @@ index 0541e59a7..50020c28c 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 d5971cc24..52daadd1d 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
-@@ -23,7 +23,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
- 
- {{{ 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
@@ -9150,19 +5016,6 @@ index 2e24d9211..7b706bb32 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 52ab8ee5d..c1c55c06d 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
-@@ -21,7 +21,7 @@ references:
-     nist: AC-6,SC-7(10)
-     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
- 
- {{{ 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
@@ -9174,19 +5027,6 @@ index ceafd4839..7006e2066 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 dd9484433..db70a21f7 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
-@@ -26,7 +26,7 @@ references:
-     ospp: FMT_SMF_EXT.1
-     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
- 
- {{{ 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
@@ -9198,19 +5038,6 @@ index 7519b7740..af6c30abd 100644
  apiVersion: machineconfiguration.openshift.io/v1
  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 dcb8ba2e0..35be777df 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
-@@ -22,7 +22,7 @@ references:
-     nist: CM-6,SC-7(10)
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol8: OL08-00-040286
--    stigid@rhel8: RHEL-08-040286
-+    stigid@almalinux8: RHEL-08-040286
- 
- {{{ 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
@@ -9222,19 +5049,6 @@ index fdd4fb83e..3274d5b36 100644
  apiVersion: machineconfiguration.openshift.io/v1
  kind: MachineConfig
  spec:
-diff --git a/linux_os/guide/system/permissions/restrictions/sysctl_user_max_user_namespaces_no_remediation/rule.yml b/linux_os/guide/system/permissions/restrictions/sysctl_user_max_user_namespaces_no_remediation/rule.yml
-index fcb356e7c..201bed021 100644
---- a/linux_os/guide/system/permissions/restrictions/sysctl_user_max_user_namespaces_no_remediation/rule.yml
-+++ b/linux_os/guide/system/permissions/restrictions/sysctl_user_max_user_namespaces_no_remediation/rule.yml
-@@ -31,7 +31,7 @@ identifiers:
- 
- references:
-     srg: SRG-OS-000480-GPOS-00227
--    stigid@rhel8: RHEL-08-040284
-+    stigid@almalinux8: RHEL-08-040284
- 
- ocil: |
-     Verify that {{{ full_name }}} disables the use of user namespaces with the following commands:
 diff --git a/linux_os/guide/system/selinux/package_libselinux_installed/tests/custom-package-removed.fail.sh b/linux_os/guide/system/selinux/package_libselinux_installed/tests/custom-package-removed.fail.sh
 index 9558acad7..52cc0a789 100644
 --- a/linux_os/guide/system/selinux/package_libselinux_installed/tests/custom-package-removed.fail.sh
@@ -9246,331 +5060,19 @@ index 9558acad7..52cc0a789 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 3a853c067..e9a5a08bf 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 @@ identifiers:
- references:
-     srg: SRG-OS-000480-GPOS-00227,SRG-OS-000134-GPOS-00068
-     stigid@ol8: OL08-00-010171
--    stigid@rhel8: RHEL-08-010171
-+    stigid@almalinux8: RHEL-08-010171
- 
- ocil_clause: 'the policycoreutils package is not installed'
- 
-diff --git a/linux_os/guide/system/selinux/selinux_context_elevation_for_sudo/rule.yml b/linux_os/guide/system/selinux/selinux_context_elevation_for_sudo/rule.yml
-index 6d8605cba..8e195bdd5 100644
---- a/linux_os/guide/system/selinux/selinux_context_elevation_for_sudo/rule.yml
-+++ b/linux_os/guide/system/selinux/selinux_context_elevation_for_sudo/rule.yml
-@@ -36,7 +36,7 @@ references:
-     nist: AC-3(4),AC-6(10)
-     srg: SRG-OS-000324-GPOS-00125
-     stigid@ol7: OL07-00-020023
--    stigid@rhel8: RHEL-08-010455
-+    stigid@almalinux8: RHEL-08-010455
- 
- ocil_clause: 'selinux context does not elevate when running sudo command'
- 
-diff --git a/linux_os/guide/system/selinux/selinux_policytype/rule.yml b/linux_os/guide/system/selinux/selinux_policytype/rule.yml
-index 729d1728f..e2c97598e 100644
---- a/linux_os/guide/system/selinux/selinux_policytype/rule.yml
-+++ b/linux_os/guide/system/selinux/selinux_policytype/rule.yml
-@@ -50,7 +50,7 @@ references:
-     srg: SRG-OS-000445-GPOS-00199,SRG-APP-000233-CTR-000585
-     stigid@ol7: OL07-00-020220
-     stigid@ol8: OL08-00-010450
--    stigid@rhel8: RHEL-08-010450
-+    stigid@almalinux8: RHEL-08-010450
- 
- ocil_clause: 'the loaded policy name is not "{{{ xccdf_value("var_selinux_policy_name") }}}"'
- 
-diff --git a/linux_os/guide/system/selinux/selinux_state/rule.yml b/linux_os/guide/system/selinux/selinux_state/rule.yml
-index 56903e6c1..e7e547dee 100644
---- a/linux_os/guide/system/selinux/selinux_state/rule.yml
-+++ b/linux_os/guide/system/selinux/selinux_state/rule.yml
-@@ -43,7 +43,7 @@ references:
-     srg: SRG-OS-000445-GPOS-00199,SRG-OS-000134-GPOS-00068
-     stigid@ol7: OL07-00-020210
-     stigid@ol8: OL08-00-010170
--    stigid@rhel8: RHEL-08-010170
-+    stigid@almalinux8: RHEL-08-010170
- 
- 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 9e2266885..cddf41fd6 100644
---- a/linux_os/guide/system/selinux/selinux_user_login_roles/rule.yml
-+++ b/linux_os/guide/system/selinux/selinux_user_login_roles/rule.yml
-@@ -39,7 +39,7 @@ references:
-     srg: SRG-OS-000324-GPOS-00125
-     stigid@ol7: OL07-00-020020
-     stigid@ol8: OL08-00-040400
--    stigid@rhel8: RHEL-08-040400
-+    stigid@almalinux8: RHEL-08-040400
- 
- 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 6cfb138e1..ce269b047 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
-@@ -79,7 +79,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@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 67cbbc42d..fb7a57fce 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
-@@ -40,7 +40,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-021310
-     stigid@ol8: OL08-00-010800
--    stigid@rhel8: RHEL-08-010800
-+    stigid@almalinux8: RHEL-08-010800
-     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 59cab71f3..1ce7c07ca 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
-@@ -36,7 +36,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-021340
-     stigid@ol8: OL08-00-010543
--    stigid@rhel8: RHEL-08-010543
-+    stigid@almalinux8: RHEL-08-010543
- 
- {{{ 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 951a223ef..f72388b91 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
-@@ -39,7 +39,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-021320
-     stigid@ol8: OL08-00-010540
--    stigid@rhel8: RHEL-08-010540
-+    stigid@almalinux8: RHEL-08-010540
-     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 99d575d7d..b49da6d2a 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
-@@ -37,7 +37,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
- 
- {{{ 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 b9333aa7b..e176ca849 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
-@@ -45,7 +45,7 @@ references:
-     srg: SRG-OS-000341-GPOS-00132,SRG-OS-000480-GPOS-00227,SRG-APP-000357-CTR-000800
-     stigid@ol7: OL07-00-021330
-     stigid@ol8: OL08-00-010542
--    stigid@rhel8: RHEL-08-010542
-+    stigid@almalinux8: RHEL-08-010542
-     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 e607f1ab9..40bbfbb49 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
-@@ -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
- 
- {{{ complete_ocil_entry_separate_partition(part="/var/tmp") }}}
- 
-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 0c1f1e2f1..69d5901bb 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
-@@ -42,7 +42,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-010063
-     stigid@ol8: OL08-00-020032
--    stigid@rhel8: RHEL-08-020032
-+    stigid@almalinux8: RHEL-08-020032
- 
- 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_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 3829aa092..1211f58ab 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 @@ identifiers:
- references:
-     srg: SRG-OS-000028-GPOS-00009,SRG-OS-000030-GPOS-00011
-     stigid@ol8: OL08-00-020050
--    stigid@rhel8: RHEL-08-020050
-+    stigid@almalinux8: RHEL-08-020050
- 
- ocil_clause: 'removal-action has not been configured'
- 
-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 58c24a33e..e632a351c 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
-@@ -35,7 +35,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00229
-     stigid@ol7: OL07-00-010440
-     stigid@ol8: OL08-00-010820
--    stigid@rhel8: RHEL-08-010820
-+    stigid@almalinux8: RHEL-08-010820
- 
- ocil_clause: 'GDM allows users to automatically login'
- 
-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 4f6bd8a78..17bdc082c 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
-@@ -45,7 +45,7 @@ references:
-     srg: SRG-OS-000029-GPOS-00010,SRG-OS-000031-GPOS-00012
-     stigid@ol7: OL07-00-010070
-     stigid@ol8: OL08-00-020060
--    stigid@rhel8: RHEL-08-020060
-+    stigid@almalinux8: RHEL-08-020060
-     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/rule.yml b/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_lock_delay/rule.yml
-index ae653b81b..81e55548b 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
-@@ -37,7 +37,7 @@ references:
-     srg: SRG-OS-000029-GPOS-00010,SRG-OS-000031-GPOS-00012
-     stigid@ol7: OL07-00-010110
-     stigid@ol8: OL08-00-020031
--    stigid@rhel8: RHEL-08-020031
-+    stigid@almalinux8: RHEL-08-020031
-     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/rule.yml b/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_lock_enabled/rule.yml
-index 9e7d71395..6c868e42f 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
-@@ -53,7 +53,7 @@ references:
-     srg: SRG-OS-000028-GPOS-00009,SRG-OS-000030-GPOS-00011
-     stigid@ol7: OL07-00-010060
-     stigid@ol8: OL08-00-020030,OL08-00-020082
--    stigid@rhel8: RHEL-08-020030
-+    stigid@almalinux8: RHEL-08-020030
-     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/rule.yml b/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_lock_locked/rule.yml
-index 633670dbc..a51d504e2 100644
---- a/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_lock_locked/rule.yml
-+++ b/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_screensaver_lock_locked/rule.yml
-@@ -35,7 +35,7 @@ references:
-     pcidss: Req-8.1.8
-     srg: SRG-OS-000028-GPOS-00009,SRG-OS-000030-GPOS-00011
-     stigid@ol7: OL07-00-010062
--    stigid@rhel8: RHEL-08-020082
-+    stigid@almalinux8: RHEL-08-020082
- 
- ocil_clause: 'screensaver locking is not locked'
- 
-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 cfea5c9dd..6c100a046 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
-@@ -37,7 +37,7 @@ references:
-     srg: SRG-OS-000029-GPOS-00010,SRG-OS-000031-GPOS-00012
-     stigid@ol7: OL07-00-010081
-     stigid@ol8: OL08-00-020080
--    stigid@rhel8: RHEL-08-020080
-+    stigid@almalinux8: RHEL-08-020080
- 
- 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/rule.yml b/linux_os/guide/system/software/gnome/gnome_screen_locking/dconf_gnome_session_idle_user_locks/rule.yml
-index b7d93c509..4db15007f 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
-@@ -40,7 +40,7 @@ references:
-     srg: SRG-OS-000029-GPOS-00010,SRG-OS-000031-GPOS-00012
-     stigid@ol7: OL07-00-010082
-     stigid@ol8: OL08-00-020081
--    stigid@rhel8: RHEL-08-020081
-+    stigid@almalinux8: RHEL-08-020081
-     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/rule.yml b/linux_os/guide/system/software/gnome/gnome_system_settings/dconf_gnome_disable_ctrlaltdel_reboot/rule.yml
-index 398837a05..a1e3af64c 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
-@@ -44,7 +44,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-020231
-     stigid@ol8: OL08-00-040171
--    stigid@rhel8: RHEL-08-040171
-+    stigid@almalinux8: RHEL-08-040171
-     stigid@ubuntu2004: UBTU-20-010459
-     stigid@ubuntu2204: UBTU-22-271030
- 
 diff --git a/linux_os/guide/system/software/integrity/certified-vendor/installed_OS_is_vendor_supported/oval/shared.xml b/linux_os/guide/system/software/integrity/certified-vendor/installed_OS_is_vendor_supported/oval/shared.xml
-index 24223598f..eb1db3fa3 100644
+index 98cd1fdfb..1fbf06697 100644
 --- a/linux_os/guide/system/software/integrity/certified-vendor/installed_OS_is_vendor_supported/oval/shared.xml
 +++ b/linux_os/guide/system/software/integrity/certified-vendor/installed_OS_is_vendor_supported/oval/shared.xml
 @@ -4,7 +4,7 @@
          The operating system installed on the system is supported by a vendor that provides security patches.
-       ") }}}
+       ", rule_title=rule_title) }}}
      
 -      
 +      
        
        
        
-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 67c30bb55..396b22f2e 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
-@@ -50,7 +50,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-020250
-     stigid@ol8: OL08-00-010000
--    stigid@rhel8: RHEL-08-010000
-+    stigid@almalinux8: RHEL-08-010000
-     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 8f5d6697f..07e0753c6 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
-@@ -31,7 +31,7 @@ references:
-     nist: SC-13,SC-12(2),SC-12(3)
-     srg: SRG-OS-000423-GPOS-00187,SRG-OS-000426-GPOS-00190
-     stigid@ol8: OL08-00-010020
--    stigid@rhel8: RHEL-08-010020
-+    stigid@almalinux8: RHEL-08-010020
- 
- 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..7bff0fb5e 100644
 --- a/linux_os/guide/system/software/integrity/crypto/configure_bind_crypto_policy/tests/absent.fail.sh
@@ -9641,19 +5143,6 @@ index dd096ab41..b180ed3b3 100644
  # reboot = true
  # 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 93073191c..9fcd75990 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
-@@ -67,7 +67,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
- 
- 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 7fca85ed5..2446c842e 100644
 --- a/linux_os/guide/system/software/integrity/crypto/configure_crypto_policy/tests/cis_l2.pass.sh
@@ -9786,21 +5275,8 @@ index 9461c3ddd..54a9e50d6 100644
  # profiles = xccdf_org.ssgproject.content_profile_ospp, xccdf_org.ssgproject.content_profile_standard
  # packages = crypto-policies-scripts
  
-diff --git a/linux_os/guide/system/software/integrity/crypto/configure_gnutls_tls_crypto_policy/rule.yml b/linux_os/guide/system/software/integrity/crypto/configure_gnutls_tls_crypto_policy/rule.yml
-index deecd540d..c0389af8a 100644
---- a/linux_os/guide/system/software/integrity/crypto/configure_gnutls_tls_crypto_policy/rule.yml
-+++ b/linux_os/guide/system/software/integrity/crypto/configure_gnutls_tls_crypto_policy/rule.yml
-@@ -28,7 +28,7 @@ references:
-     nist: AC-17(2)
-     srg: SRG-OS-000250-GPOS-00093,SRG-OS-000423-GPOS-00187
-     stigid@ol8: OL08-00-010295
--    stigid@rhel8: RHEL-08-010295
-+    stigid@almalinux8: RHEL-08-010295
- 
- ocil_clause: 'cryptographic policy for gnutls is not configured or is configured incorrectly'
- 
 diff --git a/linux_os/guide/system/software/integrity/crypto/configure_gnutls_tls_crypto_policy/tests/correct.pass.sh b/linux_os/guide/system/software/integrity/crypto/configure_gnutls_tls_crypto_policy/tests/correct.pass.sh
-index 79d8682d3..6b261f2b3 100644
+index 749484902..7dd7b49c8 100644
 --- a/linux_os/guide/system/software/integrity/crypto/configure_gnutls_tls_crypto_policy/tests/correct.pass.sh
 +++ b/linux_os/guide/system/software/integrity/crypto/configure_gnutls_tls_crypto_policy/tests/correct.pass.sh
 @@ -1,5 +1,5 @@
@@ -9843,19 +5319,6 @@ index 3776d35aa..d1c88830e 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 da3b61ed3..02b0c4c3d 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
-@@ -29,7 +29,7 @@ references:
-     nist: SC-13,SC-12(2),SC-12(3)
-     srg: SRG-OS-000120-GPOS-00061
-     stigid@ol8: OL08-00-010020
--    stigid@rhel8: RHEL-08-010020
-+    stigid@almalinux8: RHEL-08-010020
- 
- 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..fdf9d4547 100644
 --- a/linux_os/guide/system/software/integrity/crypto/configure_kerberos_crypto_policy/tests/kerberos_correct_policy.pass.sh
@@ -9888,19 +5351,6 @@ index 4eb5348f2..2437eb0a9 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 ad4166c4f..905a5213d 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:
-     pcidss: Req-2.2
-     srg: SRG-OS-000033-GPOS-00014
-     stigid@ol8: OL08-00-010020
--    stigid@rhel8: RHEL-08-010020
-+    stigid@almalinux8: RHEL-08-010020
- 
- ocil_clause: |-
-     the "IPsec" service is active and the ipsec configuration file does not contain does not contain include /etc/crypto-policies/back-ends/libreswan.config
 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..413c8e12d 100644
 --- a/linux_os/guide/system/software/integrity/crypto/configure_libreswan_crypto_policy/tests/libreswan_not_installed.pass.sh
@@ -9959,19 +5409,6 @@ index 2863c6102..495d4eab8 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 6a762273e..00278e36a 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
-@@ -45,7 +45,7 @@ references:
-     pcidss: Req-2.2
-     srg: SRG-OS-000250-GPOS-00093
-     stigid@ol8: OL08-00-010293
--    stigid@rhel8: RHEL-08-010293
-+    stigid@almalinux8: RHEL-08-010293
- 
- 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..cdf72ad5d 100644
 --- a/linux_os/guide/system/software/integrity/crypto/configure_openssl_crypto_policy/tests/include_with_equal_sign.pass.sh
@@ -10027,19 +5464,6 @@ index 1b2ea8d80..085f6172d 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 4db3f28bb..12c44fe23 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:
-     nist: AC-17(2)
-     srg: SRG-OS-000125-GPOS-00065,SRG-OS-000250-GPOS-00093,SRG-OS-000393-GPOS-00173,SRG-OS-000394-GPOS-00174
-     stigid@ol8: OL08-00-010294
--    stigid@rhel8: RHEL-08-010294
-+    stigid@almalinux8: RHEL-08-010294
- 
- 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..8737c085c 100644
 --- a/linux_os/guide/system/software/integrity/crypto/configure_openssl_tls_crypto_policy/tests/correct.pass.sh
@@ -10117,19 +5541,6 @@ index 78f3efb8a..d9c6a98e6 100644
  # remediation = none
  
  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 4fa1ebb05..54b6b4f4b 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
-@@ -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
- 
- 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..0d48f0866 100644
 --- a/linux_os/guide/system/software/integrity/crypto/configure_ssh_crypto_policy/tests/absent.pass.sh
@@ -10191,7 +5602,7 @@ index a6e7c89da..5bb0037d0 100644
  SSH_CONF="/etc/sysconfig/sshd"
  
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_openssl_crypto_policy/ansible/shared.yml b/linux_os/guide/system/software/integrity/crypto/harden_openssl_crypto_policy/ansible/shared.yml
-index d530f4b76..948225470 100644
+index 3260f8091..7063a9bdc 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_openssl_crypto_policy/ansible/shared.yml
 +++ b/linux_os/guide/system/software/integrity/crypto/harden_openssl_crypto_policy/ansible/shared.yml
 @@ -1,4 +1,4 @@
@@ -10585,7 +5996,7 @@ index b6ff5881d..1303a0bf3 100644
  file="/etc/ssh/ssh_config.d/02-ospp.conf"
  echo -e "Match final all\n\
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_openssh_conf_crypto_policy/ansible/shared.yml b/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_openssh_conf_crypto_policy/ansible/shared.yml
-index 3234911f5..7213fca2d 100644
+index c31e056c6..800c122e5 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_openssh_conf_crypto_policy/ansible/shared.yml
 +++ b/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_openssh_conf_crypto_policy/ansible/shared.yml
 @@ -1,4 +1,4 @@
@@ -10595,28 +6006,15 @@ index 3234911f5..7213fca2d 100644
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_openssh_conf_crypto_policy/bash/shared.sh b/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_openssh_conf_crypto_policy/bash/shared.sh
-index 6db8f9654..8a986c8c1 100644
+index 7f5863452..343574900 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_openssh_conf_crypto_policy/bash/shared.sh
 +++ b/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_openssh_conf_crypto_policy/bash/shared.sh
 @@ -1,4 +1,4 @@
--# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,multi_platform_fedora
-+# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux OS 8,multi_platform_fedora
+-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,multi_platform_fedora
++# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux OS 8,multi_platform_fedora
  
  {{{ 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 a14fe4799..9fef081d0 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
-@@ -30,7 +30,7 @@ identifiers:
- references:
-     nist: AC-17(2)
-     srg: SRG-OS-000033-GPOS-00014,SRG-OS-000125-GPOS-00065,SRG-OS-000250-GPOS-00093,SRG-OS-000393-GPOS-00173,SRG-OS-000394-GPOS-00174,SRG-OS-000423-GPOS-00187
--    stigid@rhel8: RHEL-08-010020,RHEL-08-010296
-+    stigid@almalinux8: RHEL-08-010020,RHEL-08-010296
- 
- 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 c657d38e4..eae98c675 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_openssh_conf_crypto_policy/tests/stig_correct.pass.sh
@@ -10706,7 +6104,7 @@ index 1a198d67d..28e1f4239 100644
  
  configfile=/etc/crypto-policies/back-ends/openssh.config
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_opensshserver_conf_crypto_policy/ansible/shared.yml b/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_opensshserver_conf_crypto_policy/ansible/shared.yml
-index f8359f007..271deab3d 100644
+index 3bcbd7b28..d4deb142e 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_opensshserver_conf_crypto_policy/ansible/shared.yml
 +++ b/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_opensshserver_conf_crypto_policy/ansible/shared.yml
 @@ -1,4 +1,4 @@
@@ -10726,7 +6124,7 @@ index 43fed0ef3..91bee459d 100644
  {{{ bash_instantiate_variables("sshd_approved_ciphers") }}}
  
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_opensshserver_conf_crypto_policy/oval/shared.xml b/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_opensshserver_conf_crypto_policy/oval/shared.xml
-index 2677b284e..7ded128b2 100644
+index 7f0823a56..c8c4b5ef5 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_opensshserver_conf_crypto_policy/oval/shared.xml
 +++ b/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_opensshserver_conf_crypto_policy/oval/shared.xml
 @@ -16,7 +16,7 @@
@@ -10738,19 +6136,6 @@ index 2677b284e..7ded128b2 100644
      ^(?!#).*-oCiphers=([^\s']+).*$
      {{%- else -%}}
      ^(?!#).*Ciphers\s+([^\s']+).*$
-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 c31d66b1c..3c605e15b 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:
-     nist: AC-17(2)
-     srg: SRG-OS-000125-GPOS-00065,SRG-OS-000250-GPOS-00093
-     stigid@ol8: OL08-00-010291
--    stigid@rhel8: RHEL-08-010291
-+    stigid@almalinux8: RHEL-08-010291
- 
- 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..e9db9581c 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_ciphers_opensshserver_conf_crypto_policy/tests/rhel8_stig_correct.pass.sh
@@ -10894,128 +6279,115 @@ index 1928d2cfe..ad090c367 100644
  configfile=/etc/crypto-policies/back-ends/opensshserver.config
  
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/ansible/shared.yml b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/ansible/shared.yml
-index c1ea94ce0..8afe5ea62 100644
+index 9fce65f7e..56e24178f 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/ansible/shared.yml
 +++ b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/ansible/shared.yml
 @@ -1,4 +1,4 @@
--# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,multi_platform_fedora
-+# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux OS 8,multi_platform_fedora
+-# platform = Red Hat Enterprise Linux 8,multi_platform_ol,multi_platform_fedora
++# platform = Red Hat Enterprise Linux 8,AlmaLinux OS 8,multi_platform_ol,multi_platform_fedora
  # reboot = true
  # strategy = restrict
  # complexity = low
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/bash/shared.sh b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/bash/shared.sh
-index 451da4db3..01f233fc4 100644
+index 174ee6719..8ab713c77 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/bash/shared.sh
 +++ b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/bash/shared.sh
 @@ -1,4 +1,4 @@
--# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,multi_platform_fedora
-+# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux OS 8,multi_platform_fedora
+-# platform = Red Hat Enterprise Linux 8,multi_platform_ol,multi_platform_fedora
++# platform = Red Hat Enterprise Linux 8,AlmaLinux OS 8,multi_platform_ol,multi_platform_fedora
  
  {{{ bash_instantiate_variables("sshd_approved_macs") }}}
  
-diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/rule.yml b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/rule.yml
-index 77e07ee35..cfdee0a41 100644
---- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/rule.yml
-+++ b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/rule.yml
-@@ -28,7 +28,7 @@ identifiers:
- references:
-     nist: AC-17(2)
-     srg: SRG-OS-000125-GPOS-00065,SRG-OS-000250-GPOS-00093
--    stigid@rhel8: RHEL-08-010020,RHEL-08-010296
-+    stigid@almalinux8: RHEL-08-010020,RHEL-08-010296
- 
- ocil_clause: 'Crypto Policy for OpenSSH client is not configured correctly'
- 
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_correct.pass.sh b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_correct.pass.sh
-index 49d18486f..99f92bed4 100644
+index 4c44ffbef..909ff61ca 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_correct.pass.sh
 +++ b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_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 OS 8,multi_platform_fedora
+-# platform = Red Hat Enterprise Linux 8,multi_platform_ol,multi_platform_fedora
++# platform = Red Hat Enterprise Linux 8,AlmaLinux OS 8,multi_platform_ol,multi_platform_fedora
  # variables = sshd_approved_macs=hmac-sha2-512,hmac-sha2-256,hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com
  
  sshd_approved_macs=hmac-sha2-512,hmac-sha2-256,hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_correct_commented.fail.sh b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_correct_commented.fail.sh
-index b068e2ea4..bc991d899 100644
+index a819b2dd0..755ce1985 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_correct_commented.fail.sh
 +++ b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_correct_commented.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 OS 8,multi_platform_fedora
+-# platform = Red Hat Enterprise Linux 8,multi_platform_ol,multi_platform_fedora
++# platform = Red Hat Enterprise Linux 8,AlmaLinux OS 8,multi_platform_ol,multi_platform_fedora
  # variables = sshd_approved_macs=hmac-sha2-512,hmac-sha2-256,hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com
  
  sshd_approved_macs=hmac-sha2-512,hmac-sha2-256,hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_correct_followed_by_incorrect_commented.pass.sh b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_correct_followed_by_incorrect_commented.pass.sh
-index f57f42270..364985b8a 100644
+index ec7c3d2b5..d55e26e27 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_correct_followed_by_incorrect_commented.pass.sh
 +++ b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_correct_followed_by_incorrect_commented.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 OS 8,multi_platform_fedora
+-# platform = Red Hat Enterprise Linux 8,multi_platform_ol,multi_platform_fedora
++# platform = Red Hat Enterprise Linux 8,AlmaLinux OS 8,multi_platform_ol,multi_platform_fedora
  # variables = sshd_approved_macs=hmac-sha2-512,hmac-sha2-256,hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com
  
  sshd_approved_macs=hmac-sha2-512,hmac-sha2-256,hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_empty_file.fail.sh b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_empty_file.fail.sh
-index 32d81d353..454f95db7 100644
+index 15a29dc4b..11b8b49f1 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_empty_file.fail.sh
 +++ b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_empty_file.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 OS 8,multi_platform_fedora
+-# platform = Red Hat Enterprise Linux 8,multi_platform_ol,multi_platform_fedora
++# platform = Red Hat Enterprise Linux 8,AlmaLinux OS 8,multi_platform_ol,multi_platform_fedora
  # profiles = xccdf_org.ssgproject.content_profile_stig
  
  configfile=/etc/crypto-policies/back-ends/openssh.config
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_empty_policy.fail.sh b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_empty_policy.fail.sh
-index be78ed116..67b7439bf 100644
+index 5c67ee37e..ff8aa152f 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_empty_policy.fail.sh
 +++ b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_empty_policy.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 OS 8,multi_platform_fedora
+-# platform = Red Hat Enterprise Linux 8,multi_platform_ol,multi_platform_fedora
++# platform = Red Hat Enterprise Linux 8,AlmaLinux OS 8,multi_platform_ol,multi_platform_fedora
  # profiles = xccdf_org.ssgproject.content_profile_stig
  
  configfile=/etc/crypto-policies/back-ends/openssh.config
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_incorrect_followed_by_correct_commented.fail.sh b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_incorrect_followed_by_correct_commented.fail.sh
-index 999463e1c..9fd9ee429 100644
+index b0fea133a..5485cc65d 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_incorrect_followed_by_correct_commented.fail.sh
 +++ b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_incorrect_followed_by_correct_commented.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 OS 8,multi_platform_fedora
+-# platform = Red Hat Enterprise Linux 8,multi_platform_ol,multi_platform_fedora
++# platform = Red Hat Enterprise Linux 8,AlmaLinux OS 8,multi_platform_ol,multi_platform_fedora
  # variables = sshd_approved_macs=hmac-sha2-512,hmac-sha2-256,hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com
  
  sshd_approved_macs=hmac-sha2-512,hmac-sha2-256,hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_incorrect_policy.fail.sh b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_incorrect_policy.fail.sh
-index 0114a63ab..dcef5de40 100644
+index d5686a74f..fd6740e1f 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_incorrect_policy.fail.sh
 +++ b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_incorrect_policy.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 OS 8,multi_platform_fedora
+-# platform = Red Hat Enterprise Linux 8,multi_platform_ol,multi_platform_fedora
++# platform = Red Hat Enterprise Linux 8,AlmaLinux OS 8,multi_platform_ol,multi_platform_fedora
  # profiles = xccdf_org.ssgproject.content_profile_stig
  
  configfile=/etc/crypto-policies/back-ends/openssh.config
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_missing_file.fail.sh b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_missing_file.fail.sh
-index 4f335aebc..e50f36bfa 100644
+index e9766f38e..c5cbd666c 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_missing_file.fail.sh
 +++ b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_openssh_conf_crypto_policy/tests/stig_missing_file.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 OS 8,multi_platform_fedora
+-# platform = Red Hat Enterprise Linux 8,multi_platform_ol,multi_platform_fedora
++# platform = Red Hat Enterprise Linux 8,AlmaLinux OS 8,multi_platform_ol,multi_platform_fedora
  # profiles = xccdf_org.ssgproject.content_profile_stig
  
  configfile=/etc/crypto-policies/back-ends/openssh.config
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_opensshserver_conf_crypto_policy/ansible/shared.yml b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_opensshserver_conf_crypto_policy/ansible/shared.yml
-index 687b5ecd3..65272c06d 100644
+index 958a57107..3c561c4a5 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_opensshserver_conf_crypto_policy/ansible/shared.yml
 +++ b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_opensshserver_conf_crypto_policy/ansible/shared.yml
 @@ -1,4 +1,4 @@
@@ -11035,7 +6407,7 @@ index 0c124e624..1466d1689 100644
  {{{ bash_instantiate_variables("sshd_approved_macs") }}}
  
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_opensshserver_conf_crypto_policy/oval/shared.xml b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_opensshserver_conf_crypto_policy/oval/shared.xml
-index acb433170..f1cf7e27a 100644
+index 5f734202f..272b1834b 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_opensshserver_conf_crypto_policy/oval/shared.xml
 +++ b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_opensshserver_conf_crypto_policy/oval/shared.xml
 @@ -16,7 +16,7 @@
@@ -11047,19 +6419,6 @@ index acb433170..f1cf7e27a 100644
      ^(?!#).*-oMACs=([^\s']+).*$
      {{%- else -%}}
      ^(?!#).*MACs\s+([^\s']+).*$
-diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_opensshserver_conf_crypto_policy/rule.yml b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_opensshserver_conf_crypto_policy/rule.yml
-index 2841d3250..7be55e76f 100644
---- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_opensshserver_conf_crypto_policy/rule.yml
-+++ b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_opensshserver_conf_crypto_policy/rule.yml
-@@ -29,7 +29,7 @@ references:
-     nist: AC-17(2)
-     srg: SRG-OS-000125-GPOS-00065,SRG-OS-000250-GPOS-00093
-     stigid@ol8: OL08-00-010290
--    stigid@rhel8: RHEL-08-010290
-+    stigid@almalinux8: RHEL-08-010290
- 
- ocil_clause: 'Crypto Policy for OpenSSH Server is not configured correctly'
- 
 diff --git a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_opensshserver_conf_crypto_policy/tests/rhel8_stig_correct.pass.sh b/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_opensshserver_conf_crypto_policy/tests/rhel8_stig_correct.pass.sh
 index df9a2844e..68b1fbcc3 100644
 --- a/linux_os/guide/system/software/integrity/crypto/harden_sshd_macs_opensshserver_conf_crypto_policy/tests/rhel8_stig_correct.pass.sh
@@ -11145,32 +6504,6 @@ index 298c79dc0..d501c7a5b 100644
 +# platform = Oracle Linux 8,Red Hat Enterprise Linux 8,AlmaLinux OS 8
  
  echo "wrong data" > /etc/profile.d/openssl-rand.sh
-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 0a1b6cbd2..0e3405504 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
-@@ -32,7 +32,7 @@ identifiers:
- references:
-     nist: SI-2(2)
-     srg: SRG-OS-000191-GPOS-00080
--    stigid@rhel8: RHEL-08-010001
-+    stigid@almalinux8: RHEL-08-010001
-     stigid@ubuntu2004: UBTU-20-010415
- 
- ocil_clause: 'the package is not installed'
-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 7cd41cb80..baf9fdd05 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
-@@ -38,7 +38,7 @@ references:
-     ospp: FCS_RBG_EXT.1
-     srg: SRG-OS-000478-GPOS-00223
-     stigid@ol8: OL08-00-010020
--    stigid@rhel8: RHEL-08-010020
-+    stigid@almalinux8: RHEL-08-010020
- 
- 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 d0a400adf..1f0cf1317 100644
 --- a/linux_os/guide/system/software/integrity/fips/enable_dracut_fips_module/tests/fips_dracut_module_missing.fail.sh
@@ -11196,7 +6529,7 @@ index b92e82236..138d2c997 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_fips_mode/oval/shared.xml b/linux_os/guide/system/software/integrity/fips/enable_fips_mode/oval/shared.xml
-index ca46a3606..16261f584 100644
+index dcf3ef58f..a28be45de 100644
 --- a/linux_os/guide/system/software/integrity/fips/enable_fips_mode/oval/shared.xml
 +++ b/linux_os/guide/system/software/integrity/fips/enable_fips_mode/oval/shared.xml
 @@ -55,7 +55,7 @@
@@ -11217,84 +6550,6 @@ index ca46a3606..16261f584 100644
    
-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 2fb0f36f4..6567fe24d 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
-@@ -58,7 +58,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,FCS_RBG_EXT.1
-     srg: SRG-OS-000478-GPOS-00223,SRG-OS-000396-GPOS-00176
-     stigid@ol8: OL08-00-010020
--    stigid@rhel8: RHEL-08-010020
-+    stigid@almalinux8: RHEL-08-010020
- 
- ocil_clause: 'FIPS mode is not enabled'
- 
-diff --git a/linux_os/guide/system/software/integrity/fips/fips_crypto_subpolicy/rule.yml b/linux_os/guide/system/software/integrity/fips/fips_crypto_subpolicy/rule.yml
-index 476d3d6fd..838837382 100644
---- a/linux_os/guide/system/software/integrity/fips/fips_crypto_subpolicy/rule.yml
-+++ b/linux_os/guide/system/software/integrity/fips/fips_crypto_subpolicy/rule.yml
-@@ -19,7 +19,7 @@ identifiers:
- 
- references:
-     srg: SRG-OS-000033-GPOS-00014
--    stigid@rhel8: RHEL-08-010020
-+    stigid@almalinux8: RHEL-08-010020
- 
- severity: medium
- 
-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 9ede74c26..37f1d424f 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
-@@ -40,7 +40,7 @@ references:
-     nist: SC-12(2),SC-12(3),IA-7,SC-13,CM-6(a),SC-12
-     srg: SRG-OS-000033-GPOS-00014,SRG-OS-000125-GPOS-00065,SRG-OS-000250-GPOS-00093,SRG-OS-000393-GPOS-00173,SRG-OS-000394-GPOS-00174,SRG-OS-000396-GPOS-00176,SRG-OS-000423-GPOS-00187,SRG-OS-000478-GPOS-00223
-     stigid@ol8: OL08-00-010020
--    stigid@rhel8: RHEL-08-010020
-+    stigid@almalinux8: RHEL-08-010020
- 
- ocil_clause: 'crypto.fips_enabled is not 1'
- 
-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 8585f0c65..679386d76 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
-@@ -60,7 +60,7 @@ references:
-     srg: SRG-OS-000445-GPOS-00199
-     stigid@ol7: OL07-00-020029
-     stigid@ol8: OL08-00-010359
--    stigid@rhel8: RHEL-08-010359
-+    stigid@almalinux8: RHEL-08-010359
-     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/aide/aide_check_audit_tools/rule.yml b/linux_os/guide/system/software/integrity/software-integrity/aide/aide_check_audit_tools/rule.yml
-index 55949199a..2a20b9db7 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
-@@ -42,7 +42,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@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_scan_notification/rule.yml b/linux_os/guide/system/software/integrity/software-integrity/aide/aide_scan_notification/rule.yml
-index 8c2eeb208..0f38762e6 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
-@@ -46,7 +46,7 @@ references:
-     srg: SRG-OS-000363-GPOS-00150,SRG-OS-000446-GPOS-00200,SRG-OS-000447-GPOS-00201
-     stigid@ol7: OL07-00-020040
-     stigid@ol8: OL08-00-010360
--    stigid@rhel8: RHEL-08-010360
-+    stigid@almalinux8: RHEL-08-010360
-     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/tests/correct_value.pass.sh b/linux_os/guide/system/software/integrity/software-integrity/aide/aide_use_fips_hashes/tests/correct_value.pass.sh
 index 6c59f7e22..f66a0b4d0 100644
 --- a/linux_os/guide/system/software/integrity/software-integrity/aide/aide_use_fips_hashes/tests/correct_value.pass.sh
@@ -11319,84 +6574,39 @@ index 812d9c928..ef94ec555 100644
  
  
  cat >/etc/aide.conf <
    
--    {{{ oval_metadata("The AlmaLinux release packages are required to be installed.") }}}
-+    {{{ oval_metadata("The AlmaLinux release and auxiliary key packages are required to be installed.") }}}
+-    {{{ oval_metadata("The AlmaLinux release packages are required to be installed.", rule_title=rule_title) }}}
++    {{{ oval_metadata("The AlmaLinux release and auxiliary key packages are required to be installed.", rule_title=rule_title) }}}
      
        
          
@@ -11873,58 +6810,6 @@ index 87b82cb01..01721fcba 100644
  
 -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
 +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-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 f3471ec27..f179ef198 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
-@@ -55,7 +55,7 @@ references:
-     srg: SRG-OS-000366-GPOS-00153
-     stigid@ol7: OL07-00-020050
-     stigid@ol8: OL08-00-010370
--    stigid@rhel8: RHEL-08-010370
-+    stigid@almalinux8: RHEL-08-010370
-     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 10afa2cf4..6add5b60c 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
-@@ -39,7 +39,7 @@ references:
-     srg: SRG-OS-000366-GPOS-00153
-     stigid@ol7: OL07-00-020060
-     stigid@ol8: OL08-00-010371
--    stigid@rhel8: RHEL-08-010371
-+    stigid@almalinux8: RHEL-08-010371
- 
- 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_redhat_gpgkey_installed/rule.yml b/linux_os/guide/system/software/updating/ensure_redhat_gpgkey_installed/rule.yml
-index 91be9d763..e4488ec89 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
-@@ -52,7 +52,7 @@ references:
-     ospp: FPT_TUD_EXT.1,FPT_TUD_EXT.2
-     pcidss: Req-6.2
-     srg: SRG-OS-000366-GPOS-00153
--    stigid@rhel8: RHEL-08-010019
-+    stigid@almalinux8: RHEL-08-010019
- 
- ocil_clause: 'the Red Hat GPG Key is not installed'
- 
-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 c85045a1c..77c5f64d0 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
-@@ -64,7 +64,7 @@ references:
-     srg: SRG-OS-000480-GPOS-00227
-     stigid@ol7: OL07-00-020260
-     stigid@ol8: OL08-00-010010
--    stigid@rhel8: RHEL-08-010010
-+    stigid@almalinux8: RHEL-08-010010
-     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
@@ -14406,10 +9291,10 @@ index 000000000..e4580fdf8
 +
 diff --git a/products/almalinux8/product.yml b/products/almalinux8/product.yml
 new file mode 100644
-index 000000000..56dee61a9
+index 000000000..57c4d6361
 --- /dev/null
 +++ b/products/almalinux8/product.yml
-@@ -0,0 +1,52 @@
+@@ -0,0 +1,107 @@
 +product: almalinux8
 +full_name: AlmaLinux OS 8
 +type: platform
@@ -14453,6 +9338,61 @@ index 000000000..56dee61a9
 +      title: "AlmaLinux OS 8"
 +      check_id: installed_OS_is_almalinux8
 +
++  - almalinux8.0:
++      name: "cpe:/o:almalinux:almalinux:8.0"
++      title: "AlmaLinux OS 8.0"
++      check_id: installed_OS_is_almalinux8_0
++
++  - almalinux8.1:
++      name: "cpe:/o:almalinux:almalinux:8.1"
++      title: "AlmaLinux OS 8.1"
++      check_id: installed_OS_is_almalinux8_1
++
++  - almalinux8.2:
++      name: "cpe:/o:almalinux:almalinux:8.2"
++      title: "AlmaLinux OS 8.2"
++      check_id: installed_OS_is_almalinux8_2
++
++  - almalinux8.3:
++      name: "cpe:/o:almalinux:almalinux:8.3"
++      title: "AlmaLinux OS 8.3"
++      check_id: installed_OS_is_almalinux8_3
++
++  - almalinux8.4:
++      name: "cpe:/o:almalinux:almalinux:8.4"
++      title: "AlmaLinux OS 8.4"
++      check_id: installed_OS_is_almalinux8_4
++
++  - almalinux8.5:
++      name: "cpe:/o:almalinux:almalinux:8.5"
++      title: "AlmaLinux OS 8.5"
++      check_id: installed_OS_is_almalinux8_5
++
++  - almalinux8.6:
++      name: "cpe:/o:almalinux:almalinux:8.6"
++      title: "AlmaLinux OS 8.6"
++      check_id: installed_OS_is_almalinux8_6
++
++  - almalinux8.7:
++      name: "cpe:/o:almalinux:almalinux:8.7"
++      title: "AlmaLinux OS 8.7"
++      check_id: installed_OS_is_almalinux8_7
++
++  - almalinux8.8:
++      name: "cpe:/o:almalinux:almalinux:8.8"
++      title: "AlmaLinux OS 8.8"
++      check_id: installed_OS_is_almalinux8_8
++
++  - almalinux8.9:
++      name: "cpe:/o:almalinux:almalinux:8.9"
++      title: "AlmaLinux OS 8.9"
++      check_id: installed_OS_is_almalinux8_9
++
++  - almalinux8.10:
++      name: "cpe:/o:almalinux:almalinux:8.10"
++      title: "AlmaLinux OS 8.10"
++      check_id: installed_OS_is_almalinux8_10
++
 +# Mapping of CPE platform to package
 +platform_package_overrides:
 +  login_defs: "shadow-utils"
@@ -14464,10 +9404,11 @@ index 000000000..56dee61a9
 +journald_conf_dir_path: /etc/systemd/journald.conf.d
 diff --git a/products/almalinux8/profiles/anssi_bp28_enhanced.profile b/products/almalinux8/profiles/anssi_bp28_enhanced.profile
 new file mode 100644
-index 000000000..882d38cf3
+index 000000000..378cd83a8
 --- /dev/null
 +++ b/products/almalinux8/profiles/anssi_bp28_enhanced.profile
-@@ -0,0 +1,66 @@
+@@ -0,0 +1,71 @@
++---
 +documentation_complete: true
 +
 +metadata:
@@ -14534,12 +9475,17 @@ index 000000000..882d38cf3
 +    - '!audit_rules_dac_modification_fchmodat2'
 +    - '!package_rsh-server_removed'
 +    - '!package_rsh_removed'
++
++    # Following rules are not applicable to RHEL
++    - '!package_talk_removed'
++    - '!package_talk-server_removed'
 diff --git a/products/almalinux8/profiles/anssi_bp28_high.profile b/products/almalinux8/profiles/anssi_bp28_high.profile
 new file mode 100644
-index 000000000..30e251a96
+index 000000000..349fda62b
 --- /dev/null
 +++ b/products/almalinux8/profiles/anssi_bp28_high.profile
-@@ -0,0 +1,74 @@
+@@ -0,0 +1,79 @@
++---
 +documentation_complete: true
 +
 +metadata:
@@ -14614,12 +9560,17 @@ index 000000000..30e251a96
 +    - '!audit_rules_dac_modification_fchmodat2'
 +    - '!package_rsh-server_removed'
 +    - '!package_rsh_removed'
++
++    # Following rules are not applicable to RHEL
++    - '!package_talk_removed'
++    - '!package_talk-server_removed'
 diff --git a/products/almalinux8/profiles/anssi_bp28_intermediary.profile b/products/almalinux8/profiles/anssi_bp28_intermediary.profile
 new file mode 100644
-index 000000000..d4092bc5e
+index 000000000..1ce81d556
 --- /dev/null
 +++ b/products/almalinux8/profiles/anssi_bp28_intermediary.profile
-@@ -0,0 +1,51 @@
+@@ -0,0 +1,56 @@
++---
 +documentation_complete: true
 +
 +metadata:
@@ -14642,41 +9593,46 @@ index 000000000..d4092bc5e
 +    https://cyber.gouv.fr/publications/configuration-recommendations-gnulinux-system
 +
 +selections:
-+  - anssi:all:intermediary
-+  - var_password_hashing_algorithm=SHA512
-+  - var_password_pam_unix_rounds=65536
++    - anssi:all:intermediary
++    - var_password_hashing_algorithm=SHA512
++    - var_password_pam_unix_rounds=65536
 +
-+  # An alternative solution for R67 is using nss-pam-ldapd package, in this case ensures SSL and certificate configuration
-+  - ldap_client_start_tls
-+  - ldap_client_tls_cacertpath
++    # An alternative solution for R67 is using nss-pam-ldapd package, in this case ensures SSL and certificate configuration
++    - ldap_client_start_tls
++    - ldap_client_tls_cacertpath
 +
-+  # Ensure nis is not used for RHEL 8 in R69
-+  - no_nis_in_nsswitch
++    # Ensure nis is not used for RHEL 8 in R69
++    - no_nis_in_nsswitch
 +
-+  # Following rules once had a prodtype incompatible with the rhel8 product
-+  - '!cracklib_accounts_password_pam_minlen'
-+  - '!accounts_passwords_pam_tally2_deny_root'
-+  - '!grub2_mds_argument'
-+  - '!sysctl_fs_protected_fifos'
-+  - '!accounts_passwords_pam_tally2'
-+  - '!cracklib_accounts_password_pam_ucredit'
-+  - '!cracklib_accounts_password_pam_dcredit'
-+  - '!cracklib_accounts_password_pam_lcredit'
-+  - '!sysctl_fs_protected_regular'
-+  - '!cracklib_accounts_password_pam_ocredit'
-+  - '!grub2_page_alloc_shuffle_argument'
-+  - '!accounts_passwords_pam_tally2_unlock_time'
-+  - '!ensure_oracle_gpgkey_installed'
-+  - ensure_almalinux_gpgkey_installed
-+  - '!package_kea_removed'
-+  - '!package_rsh-server_removed'
-+  - '!package_rsh_removed'
++    # Following rules once had a prodtype incompatible with the rhel8 product
++    - '!cracklib_accounts_password_pam_minlen'
++    - '!accounts_passwords_pam_tally2_deny_root'
++    - '!grub2_mds_argument'
++    - '!sysctl_fs_protected_fifos'
++    - '!accounts_passwords_pam_tally2'
++    - '!cracklib_accounts_password_pam_ucredit'
++    - '!cracklib_accounts_password_pam_dcredit'
++    - '!cracklib_accounts_password_pam_lcredit'
++    - '!sysctl_fs_protected_regular'
++    - '!cracklib_accounts_password_pam_ocredit'
++    - '!grub2_page_alloc_shuffle_argument'
++    - '!accounts_passwords_pam_tally2_unlock_time'
++    - '!ensure_oracle_gpgkey_installed'
++    - ensure_almalinux_gpgkey_installed
++    - '!package_kea_removed'
++    - '!package_rsh-server_removed'
++    - '!package_rsh_removed'
++
++    # Following rules are not applicable to RHEL
++    - '!package_talk_removed'
++    - '!package_talk-server_removed'
 diff --git a/products/almalinux8/profiles/anssi_bp28_minimal.profile b/products/almalinux8/profiles/anssi_bp28_minimal.profile
 new file mode 100644
-index 000000000..ad72e253f
+index 000000000..882020451
 --- /dev/null
 +++ b/products/almalinux8/profiles/anssi_bp28_minimal.profile
-@@ -0,0 +1,39 @@
+@@ -0,0 +1,44 @@
++---
 +documentation_complete: true
 +
 +metadata:
@@ -14699,29 +9655,34 @@ index 000000000..ad72e253f
 +    https://cyber.gouv.fr/publications/configuration-recommendations-gnulinux-system
 +
 +selections:
-+  - anssi:all:minimal
-+  - var_password_hashing_algorithm=SHA512
-+  - var_password_pam_unix_rounds=65536
-+  # Following rules once had a prodtype incompatible with the rhel8 product
-+  - '!cracklib_accounts_password_pam_minlen'
-+  - '!accounts_passwords_pam_tally2_deny_root'
-+  - '!accounts_passwords_pam_tally2'
-+  - '!cracklib_accounts_password_pam_ucredit'
-+  - '!cracklib_accounts_password_pam_dcredit'
-+  - '!cracklib_accounts_password_pam_lcredit'
-+  - '!cracklib_accounts_password_pam_ocredit'
-+  - '!accounts_passwords_pam_tally2_unlock_time'
-+  - '!ensure_oracle_gpgkey_installed'
-+  - ensure_almalinux_gpgkey_installed
-+  - '!package_kea_removed'
-+  - '!package_rsh-server_removed'
-+  - '!package_rsh_removed'
++    - anssi:all:minimal
++    - var_password_hashing_algorithm=SHA512
++    - var_password_pam_unix_rounds=65536
++    # Following rules once had a prodtype incompatible with the rhel8 product
++    - '!cracklib_accounts_password_pam_minlen'
++    - '!accounts_passwords_pam_tally2_deny_root'
++    - '!accounts_passwords_pam_tally2'
++    - '!cracklib_accounts_password_pam_ucredit'
++    - '!cracklib_accounts_password_pam_dcredit'
++    - '!cracklib_accounts_password_pam_lcredit'
++    - '!cracklib_accounts_password_pam_ocredit'
++    - '!accounts_passwords_pam_tally2_unlock_time'
++    - '!ensure_oracle_gpgkey_installed'
++    - ensure_almalinux_gpgkey_installed
++    - '!package_kea_removed'
++    - '!package_rsh-server_removed'
++    - '!package_rsh_removed'
++
++    # Following rules are not applicable to RHEL
++    - '!package_talk_removed'
++    - '!package_talk-server_removed'
 diff --git a/products/almalinux8/profiles/cis.profile b/products/almalinux8/profiles/cis.profile
 new file mode 100644
-index 000000000..40d3e5ceb
+index 000000000..70fc6df90
 --- /dev/null
 +++ b/products/almalinux8/profiles/cis.profile
-@@ -0,0 +1,26 @@
+@@ -0,0 +1,27 @@
++---
 +documentation_complete: true
 +
 +metadata:
@@ -14738,7 +9699,7 @@ index 000000000..40d3e5ceb
 +description: |-
 +    This profile defines a baseline that aligns to the "Level 2 - Server"
 +    configuration from the Center for Internet Security® 
-+    AlmaLinux OS 8 Benchmark™, v3.0.0, released 2023-10-30.
++    AlmaLinux OS 8 Benchmark™, v3.0.0, released 2025-08-28.
 +
 +    This profile includes Center for Internet Security®
 +    AlmaLinux OS 8 CIS Benchmarks™ content.
@@ -14750,10 +9711,11 @@ index 000000000..40d3e5ceb
 +    - '!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..a8bc574f1
+index 000000000..f52e55381
 --- /dev/null
 +++ b/products/almalinux8/profiles/cis_server_l1.profile
-@@ -0,0 +1,26 @@
+@@ -0,0 +1,27 @@
++---
 +documentation_complete: true
 +
 +metadata:
@@ -14770,7 +9732,7 @@ index 000000000..a8bc574f1
 +description: |-
 +    This profile defines a baseline that aligns to the "Level 1 - Server"
 +    configuration from the Center for Internet Security® 
-+    AlmaLinux OS 8 Benchmark™, v3.0.0, released 2023-10-30.
++    AlmaLinux OS 8 Benchmark™, v3.0.0, released 2025-08-28.
 +
 +    This profile includes Center for Internet Security®
 +    AlmaLinux OS 8 CIS Benchmarks™ content.
@@ -14782,10 +9744,11 @@ index 000000000..a8bc574f1
 +    - '!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..a670f00be
+index 000000000..995c09acd
 --- /dev/null
 +++ b/products/almalinux8/profiles/cis_workstation_l1.profile
-@@ -0,0 +1,26 @@
+@@ -0,0 +1,27 @@
++---
 +documentation_complete: true
 +
 +metadata:
@@ -14802,7 +9765,7 @@ index 000000000..a670f00be
 +description: |-
 +    This profile defines a baseline that aligns to the "Level 1 - Workstation"
 +    configuration from the Center for Internet Security® 
-+    AlmaLinux OS 8 Benchmark™, v3.0.0, released 2023-10-30.
++    AlmaLinux OS 8 Benchmark™, v3.0.0, released 2025-08-28.
 +
 +    This profile includes Center for Internet Security®
 +    AlmaLinux OS 8 CIS Benchmarks™ content.
@@ -14814,10 +9777,11 @@ index 000000000..a670f00be
 +    - '!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..d6e882959
+index 000000000..2c2a55add
 --- /dev/null
 +++ b/products/almalinux8/profiles/cis_workstation_l2.profile
-@@ -0,0 +1,26 @@
+@@ -0,0 +1,27 @@
++---
 +documentation_complete: true
 +
 +metadata:
@@ -14834,7 +9798,7 @@ index 000000000..d6e882959
 +description: |-
 +    This profile defines a baseline that aligns to the "Level 2 - Workstation"
 +    configuration from the Center for Internet Security® 
-+    AlmaLinux OS 8 Benchmark™, v3.0.0, released 2023-10-30.
++    AlmaLinux OS 8 Benchmark™, v3.0.0, released 2025-08-28.
 +
 +    This profile includes Center for Internet Security®
 +    AlmaLinux OS 8 CIS Benchmarks™ content.
@@ -14846,10 +9810,11 @@ index 000000000..d6e882959
 +    - '!package_dnsmasq_removed'
 diff --git a/products/almalinux8/profiles/cjis.profile b/products/almalinux8/profiles/cjis.profile
 new file mode 100644
-index 000000000..2887b6872
+index 000000000..c44adbeb7
 --- /dev/null
 +++ b/products/almalinux8/profiles/cjis.profile
-@@ -0,0 +1,148 @@
+@@ -0,0 +1,149 @@
++---
 +documentation_complete: true
 +
 +hidden: true
@@ -15000,10 +9965,11 @@ index 000000000..2887b6872
 +    - kernel_module_bluetooth_disabled
 diff --git a/products/almalinux8/profiles/cui.profile b/products/almalinux8/profiles/cui.profile
 new file mode 100644
-index 000000000..54629c569
+index 000000000..d14b092a8
 --- /dev/null
 +++ b/products/almalinux8/profiles/cui.profile
-@@ -0,0 +1,33 @@
+@@ -0,0 +1,34 @@
++---
 +documentation_complete: true
 +
 +metadata:
@@ -15039,10 +10005,11 @@ index 000000000..54629c569
 +    - 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..d816cfb50
+index 000000000..810cef2c7
 --- /dev/null
 +++ b/products/almalinux8/profiles/default.profile
-@@ -0,0 +1,727 @@
+@@ -0,0 +1,728 @@
++---
 +documentation_complete: true
 +
 +hidden: true
@@ -15772,10 +10739,11 @@ index 000000000..d816cfb50
 +    - package_rsh-server_removed
 diff --git a/products/almalinux8/profiles/e8.profile b/products/almalinux8/profiles/e8.profile
 new file mode 100644
-index 000000000..7ca0688c5
+index 000000000..b1275bdd8
 --- /dev/null
 +++ b/products/almalinux8/profiles/e8.profile
-@@ -0,0 +1,149 @@
+@@ -0,0 +1,33 @@
++---
 +documentation_complete: true
 +
 +metadata:
@@ -15788,150 +10756,34 @@ index 000000000..7ca0688c5
 +title: 'Australian Cyber Security Centre (ACSC) Essential Eight'
 +
 +description: |-
-+  This profile contains configuration checks for AlmaLinux OS 8
-+  that align to the Australian Cyber Security Centre (ACSC) Essential Eight.
++    This profile contains configuration checks for AlmaLinux OS 8
++    that align to the Australian Cyber Security Centre (ACSC) Essential Eight.
 +
-+  A copy of the Essential Eight in Linux Environments guide can be found at the
-+  ACSC website:
++    A copy of the Essential Eight in Linux Environments guide can be found at the
++    ACSC website:
 +
-+  https://www.cyber.gov.au/acsc/view-all-content/publications/hardening-linux-workstations-and-servers
++    https://www.cyber.gov.au/acsc/view-all-content/publications/hardening-linux-workstations-and-servers
 +
 +selections:
++    - e8:all
++    - service_xinetd_disabled
++    - package_xinetd_removed
++    - package_rear_installed
++    - '!package_rsh_removed'
++    - '!sshd_use_directory_configuration'
++    - '!package_rsh-server_removed'
 +
-+  ### Remove obsolete packages
-+  - package_xinetd_removed
-+  - service_xinetd_disabled
-+  - package_ypbind_removed
-+  - package_telnet_removed
-+  - service_telnet_disabled
-+  - package_telnet-server_removed
-+  - service_avahi-daemon_disabled
-+  - package_squid_removed
-+  - service_squid_disabled
-+
-+  ### Software update
-+  - ensure_almalinux_gpgkey_installed
-+  - ensure_gpgcheck_never_disabled
-+  - ensure_gpgcheck_local_packages
-+  - ensure_gpgcheck_globally_activated
-+  - security_patches_up_to_date
-+  - dnf-automatic_security_updates_only
-+
-+  ### System security settings
-+  - sysctl_kernel_randomize_va_space
-+  - sysctl_kernel_exec_shield
-+  - sysctl_kernel_kptr_restrict
-+  - sysctl_kernel_dmesg_restrict
-+  - sysctl_kernel_kexec_load_disabled
-+  - sysctl_kernel_yama_ptrace_scope
-+  - sysctl_kernel_unprivileged_bpf_disabled
-+  - sysctl_net_core_bpf_jit_harden
-+
-+  ### SELinux
-+  - var_selinux_state=enforcing
-+  - selinux_state
-+  - var_selinux_policy_name=targeted
-+  - selinux_policytype
-+
-+  ### Filesystem integrity
-+  - rpm_verify_hashes
-+  - rpm_verify_permissions
-+  - rpm_verify_ownership
-+  - file_permissions_unauthorized_sgid
-+  - file_permissions_unauthorized_suid
-+  - file_permissions_unauthorized_world_writable
-+  - dir_perms_world_writable_sticky_bits
-+  - file_permissions_library_dirs
-+  - file_ownership_binary_dirs
-+  - file_permissions_binary_dirs
-+  - file_ownership_library_dirs
-+
-+  ### Passwords
-+  - var_authselect_profile=sssd
-+  - enable_authselect
-+  - no_empty_passwords
-+
-+  ### Partitioning
-+  - mount_option_dev_shm_nodev
-+  - mount_option_dev_shm_nosuid
-+  - mount_option_dev_shm_noexec
-+
-+  ### Network
-+  - package_firewalld_installed
-+  - service_firewalld_enabled
-+  - network_sniffer_disabled
-+
-+  ### Admin privileges
-+  - accounts_no_uid_except_zero
-+  - sudo_remove_nopasswd
-+  - sudo_remove_no_authenticate
-+  - sudo_require_authentication
-+
-+  ### Audit
-+  - package_rsyslog_installed
-+  - service_rsyslog_enabled
-+  - service_auditd_enabled
-+  - var_auditd_flush=incremental_async
-+  - auditd_data_retention_flush
-+  - auditd_local_events
-+  - auditd_write_logs
-+  - auditd_log_format
-+  - auditd_freq
-+  - auditd_name_format
-+  - audit_rules_login_events_tallylog
-+  - audit_rules_login_events_faillock
-+  - audit_rules_login_events_lastlog
-+  - audit_rules_time_adjtimex
-+  - audit_rules_time_clock_settime
-+  - audit_rules_time_watch_localtime
-+  - audit_rules_time_settimeofday
-+  - audit_rules_time_stime
-+  - audit_rules_execution_restorecon
-+  - audit_rules_execution_chcon
-+  - audit_rules_execution_semanage
-+  - audit_rules_execution_setsebool
-+  - audit_rules_execution_setfiles
-+  - audit_rules_execution_seunshare
-+  - audit_rules_sysadmin_actions
-+  - audit_rules_networkconfig_modification
-+  - audit_rules_usergroup_modification_group
-+  - audit_rules_usergroup_modification_gshadow
-+  - audit_rules_usergroup_modification_opasswd
-+  - audit_rules_usergroup_modification_passwd
-+  - audit_rules_usergroup_modification_shadow
-+  - audit_rules_dac_modification_chmod
-+  - audit_rules_dac_modification_chown
-+  - audit_rules_kernel_module_loading
-+
-+  ### Secure access
-+  - sshd_disable_root_login
-+  - sshd_disable_gssapi_auth
-+  - sshd_print_last_log
-+  - sshd_do_not_permit_user_env
-+  - sshd_disable_rhosts
-+  - sshd_set_loglevel_info
-+  - sshd_disable_empty_passwords
-+  - sshd_disable_user_known_hosts
-+  - sshd_enable_strictmodes
-+
-+  # See also: https://www.cyber.gov.au/acsc/view-all-content/guidance/asd-approved-cryptographic-algorithms
-+  - var_system_crypto_policy=default_nosha1
-+  - configure_crypto_policy
-+  - configure_ssh_crypto_policy
-+
-+  ### Application whitelisting
-+  - package_fapolicyd_installed
-+  - service_fapolicyd_enabled
-+
-+  ### Backup
-+  - package_rear_installed
++    # Following rules are not applicable to RHEL
++    - '!package_talk_removed'
++    - '!package_talk-server_removed'
 diff --git a/products/almalinux8/profiles/hipaa.profile b/products/almalinux8/profiles/hipaa.profile
 new file mode 100644
-index 000000000..05d35bf89
+index 000000000..2c62f7c8a
 --- /dev/null
 +++ b/products/almalinux8/profiles/hipaa.profile
-@@ -0,0 +1,162 @@
-+documentation_complete: True
+@@ -0,0 +1,91 @@
++---
++documentation_complete: true
 +
 +metadata:
 +    SMEs:
@@ -15954,151 +10806,80 @@ index 000000000..05d35bf89
 +    Use of this profile in no way guarantees or makes claims against legal compliance against the HIPAA Security Rule(s).
 +
 +selections:
-+    - grub2_password
-+    - grub2_uefi_password
-+    - file_groupowner_grub2_cfg
-+    - file_owner_grub2_cfg
-+    - grub2_disable_interactive_boot
-+    - no_direct_root_logins
-+    - no_empty_passwords
-+    - require_singleuser_auth
-+    - restrict_serial_port_logins
-+    - securetty_root_login_console_only
-+    - service_debug-shell_disabled
-+    - disable_ctrlaltdel_reboot
-+    - disable_ctrlaltdel_burstaction
-+    - dconf_db_up_to_date
-+    - dconf_gnome_remote_access_credential_prompt
-+    - dconf_gnome_remote_access_encryption
-+    - sshd_disable_empty_passwords
-+    - sshd_disable_root_login
-+    - libreswan_approved_tunnels
++    - hipaa:all
 +    - no_rsh_trust_files
-+    - package_telnet_removed
-+    - package_telnet-server_removed
-+    - package_xinetd_removed
-+    - service_crond_enabled
-+    - service_telnet_disabled
-+    - service_xinetd_disabled
-+    - use_kerberos_security_all_exports
-+    - var_authselect_profile=sssd
-+    - enable_authselect
-+    - disable_host_auth
-+    - sshd_allow_only_protocol2
-+    - sshd_disable_compression
-+    - sshd_disable_gssapi_auth
-+    - sshd_disable_kerb_auth
-+    - sshd_do_not_permit_user_env
-+    - sshd_enable_strictmodes
-+    - sshd_enable_warning_banner
-+    - var_sshd_set_keepalive=1
-+    - sshd_set_keepalive_0
-+    - encrypt_partitions
 +    - var_system_crypto_policy=fips
-+    - configure_crypto_policy
-+    - configure_ssh_crypto_policy
-+    - var_selinux_policy_name=targeted
-+    - var_selinux_state=enforcing
-+    - grub2_enable_selinux
-+    - sebool_selinuxuser_execheap
-+    - sebool_selinuxuser_execmod
-+    - sebool_selinuxuser_execstack
-+    - selinux_confinement_of_daemons
-+    - selinux_policytype
-+    - selinux_state
-+    - service_kdump_disabled
-+    - sysctl_fs_suid_dumpable
-+    - sysctl_kernel_dmesg_restrict
-+    - sysctl_kernel_exec_shield
-+    - sysctl_kernel_randomize_va_space
-+    - rpm_verify_hashes
-+    - rpm_verify_permissions
++    - '!audit_rules_dac_modification_fchmodat2'
++    - '!audit_rules_file_deletion_events_renameat2'
++    - '!audit_rules_kernel_module_loading_finit'
++    - '!audit_rules_mac_modification_usr_share'
++    - '!audit_rules_privileged_commands_unix2_chkpwd'
++    - '!audit_rules_unsuccessful_file_modification_open_by_handle_at_o_creat'
++    - '!audit_rules_unsuccessful_file_modification_open_by_handle_at_o_trunc_write'
++    - '!audit_rules_unsuccessful_file_modification_open_by_handle_at_rule_order'
++    - '!audit_rules_unsuccessful_file_modification_open_o_creat'
++    - '!audit_rules_unsuccessful_file_modification_open_o_trunc_write'
++    - '!audit_rules_unsuccessful_file_modification_open_rule_order'
++    - '!audit_rules_unsuccessful_file_modification_openat_o_creat'
++    - '!audit_rules_unsuccessful_file_modification_openat_o_trunc_write'
++    - '!audit_rules_unsuccessful_file_modification_openat_rule_order'
++    - '!audit_rules_unsuccessful_file_modification_rename'
++    - '!audit_rules_unsuccessful_file_modification_renameat'
++    - '!audit_rules_unsuccessful_file_modification_unlink'
++    - '!audit_rules_unsuccessful_file_modification_unlinkat'
++    - '!auditd_data_retention_action_mail_acct'
++    - '!auditd_data_retention_admin_space_left_action'
++    - '!auditd_data_retention_max_log_file_action'
++    - '!auditd_data_retention_max_log_file_action_stig'
++    - '!auditd_data_retention_space_left_action'
++    - '!coreos_audit_option'
++    - '!coreos_disable_interactive_boot'
++    - '!coreos_enable_selinux_kernel_argument'
++    - '!coreos_nousb_kernel_argument'
 +    - ensure_almalinux_gpgkey_installed
-+    - ensure_gpgcheck_globally_activated
-+    - ensure_gpgcheck_never_disabled
-+    - ensure_gpgcheck_local_packages
-+    - grub2_audit_argument
-+    - service_auditd_enabled
-+    - audit_rules_privileged_commands_sudo
-+    - audit_rules_privileged_commands_su
-+    - audit_rules_immutable
-+    - kernel_module_usb-storage_disabled
-+    - service_autofs_disabled
-+    - auditd_audispd_syslog_plugin_activated
-+    - rsyslog_remote_loghost
-+    - auditd_data_retention_flush
-+    - audit_rules_dac_modification_chmod
-+    - audit_rules_dac_modification_chown
-+    - audit_rules_dac_modification_fchmodat
-+    - audit_rules_dac_modification_fchmod
-+    - audit_rules_dac_modification_fchownat
-+    - audit_rules_dac_modification_fchown
-+    - audit_rules_dac_modification_fremovexattr
-+    - audit_rules_dac_modification_fsetxattr
-+    - audit_rules_dac_modification_lchown
-+    - audit_rules_dac_modification_lremovexattr
-+    - audit_rules_dac_modification_lsetxattr
-+    - audit_rules_dac_modification_removexattr
-+    - audit_rules_dac_modification_setxattr
-+    - audit_rules_execution_chcon
-+    - audit_rules_execution_restorecon
-+    - audit_rules_execution_semanage
-+    - audit_rules_execution_setsebool
-+    - audit_rules_file_deletion_events_renameat
-+    - audit_rules_file_deletion_events_rename
-+    - audit_rules_file_deletion_events_rmdir
-+    - audit_rules_file_deletion_events_unlinkat
-+    - audit_rules_file_deletion_events_unlink
-+    - audit_rules_kernel_module_loading_delete
-+    - audit_rules_kernel_module_loading_init
-+    - audit_rules_login_events_faillock
-+    - audit_rules_login_events_lastlog
-+    - audit_rules_login_events_tallylog
-+    - audit_rules_mac_modification
-+    - audit_rules_media_export
-+    - audit_rules_networkconfig_modification
-+    - audit_rules_privileged_commands_chage
-+    - audit_rules_privileged_commands_chsh
-+    - audit_rules_privileged_commands_crontab
-+    - audit_rules_privileged_commands_gpasswd
-+    - audit_rules_privileged_commands_newgrp
-+    - audit_rules_privileged_commands_pam_timestamp_check
-+    - audit_rules_privileged_commands_passwd
-+    - audit_rules_privileged_commands_postdrop
-+    - audit_rules_privileged_commands_postqueue
-+    - audit_rules_privileged_commands_ssh_keysign
-+    - audit_rules_privileged_commands_sudoedit
-+    - audit_rules_privileged_commands_umount
-+    - audit_rules_privileged_commands_unix_chkpwd
-+    - audit_rules_privileged_commands_userhelper
-+    - audit_rules_session_events_utmp
-+    - audit_rules_session_events_btmp
-+    - audit_rules_session_events_wtmp
-+    - audit_rules_sysadmin_actions
-+    - audit_rules_system_shutdown
-+    - var_audit_failure_mode=panic
-+    - audit_rules_time_adjtimex
-+    - audit_rules_time_clock_settime
-+    - audit_rules_time_settimeofday
-+    - audit_rules_time_stime
-+    - audit_rules_time_watch_localtime
-+    - audit_rules_unsuccessful_file_modification_creat
-+    - audit_rules_unsuccessful_file_modification_ftruncate
-+    - audit_rules_unsuccessful_file_modification_openat
-+    - audit_rules_unsuccessful_file_modification_open_by_handle_at
-+    - audit_rules_unsuccessful_file_modification_open
-+    - audit_rules_unsuccessful_file_modification_truncate
-+    - audit_rules_usergroup_modification_group
-+    - audit_rules_usergroup_modification_gshadow
-+    - audit_rules_usergroup_modification_opasswd
-+    - audit_rules_usergroup_modification_passwd
-+    - audit_rules_usergroup_modification_shadow
++    - '!ensure_fedora_gpgkey_installed'
++    - '!ensure_gpgcheck_repo_metadata'
++    - '!ensure_suse_gpgkey_installed'
++    - '!file_groupowner_user_cfg'
++    - '!file_owner_user_cfg'
++    - '!file_permissions_grub2_cfg'
++    - '!file_permissions_user_cfg'
++    - '!grub2_admin_username'
++    - '!grub2_uefi_admin_username'
++    - '!package_audit-audispd-plugins_installed'
++    - '!package_audit_installed'
++    - '!package_cron_installed'
++    - '!package_rsh-server_removed'
++    - '!package_rsh_removed'
++    - '!package_rsyslog_installed'
++    - '!package_talk-server_removed'
++    - '!package_talk_removed'
++    - '!package_tcp_wrappers_removed'
++    - '!package_ypbind_removed'
++    - '!package_ypserv_removed'
++    - '!partition_for_var_log_audit'
++    - '!require_emergency_target_auth'
++    - '!service_cron_enabled'
++    - '!service_rexec_disabled'
++    - '!service_rlogin_disabled'
++    - '!service_rsh_disabled'
++    - '!service_rsyslog_enabled'
++    - '!service_ypbind_disabled'
++    - '!service_zebra_disabled'
++    - '!sshd_disable_rhosts_rsa'
++    - '!sshd_disable_user_known_hosts'
++    - '!sshd_set_keepalive'
++    - '!sshd_use_approved_ciphers'
++    - '!sshd_use_approved_macs'
++    - '!sshd_use_directory_configuration'
++    - '!sshd_use_priv_separation'
 diff --git a/products/almalinux8/profiles/ism_o.profile b/products/almalinux8/profiles/ism_o.profile
 new file mode 100644
-index 000000000..a39efd13b
+index 000000000..e334337d6
 --- /dev/null
 +++ b/products/almalinux8/profiles/ism_o.profile
-@@ -0,0 +1,145 @@
+@@ -0,0 +1,84 @@
++---
 +documentation_complete: true
 +
 +metadata:
@@ -16114,142 +10895,81 @@ index 000000000..a39efd13b
 +title: 'Australian Cyber Security Centre (ACSC) ISM Official'
 +
 +description: |-
-+  This profile contains configuration checks for AlmaLinux OS 8
-+  that align to the Australian Cyber Security Centre (ACSC) Information Security Manual (ISM)
-+  with the applicability marking of OFFICIAL.
++    This profile contains configuration checks for AlmaLinux OS 8
++    that align to the Australian Cyber Security Centre (ACSC) Information Security Manual (ISM)
++    with the applicability marking of OFFICIAL.
 +
-+  The ISM uses a risk-based approach to cyber security. This profile provides a guide to aligning 
-+  AlmaLinux OS security controls with the ISM, which can be used to select controls 
-+  specific to an organisation's security posture and risk profile.
++    The ISM uses a risk-based approach to cyber security. This profile provides a guide to aligning
++    AlmaLinux OS security controls with the ISM, which can be used to select controls
++    specific to an organisation's security posture and risk profile.
 +
-+  A copy of the ISM can be found at the ACSC website:
++    A copy of the ISM can be found at the ACSC website:
 +
-+  https://www.cyber.gov.au/ism
++    https://www.cyber.gov.au/ism
 +
 +extends: e8
 +
 +selections:
-+
-+  ## Operating system configuration
-+  ## Identifiers 1491
-+  - no_shelllogin_for_systemaccounts
-+
-+  ## Local administrator accounts
-+  ## Identifiers 1382 / 1410
-+  - accounts_password_all_shadowed
-+  - package_sudo_installed
-+
-+  ## Content filtering & Anti virus
-+  ## Identifiers  0576 / 1341 / 1034 / 1417 / 1288
-+  - package_aide_installed
-+
-+  ## Software firewall
-+  ## Identifiers 1416
-+  - configure_firewalld_ports
-+  ## Removing due to build error
-+  ## - configure_firewalld_rate_limiting
-+  - firewalld_sshd_port_enabled
-+  - set_firewalld_default_zone
-+
-+  ## Endpoint device control software
-+  ## Identifiers 1418
-+  - package_usbguard_installed
-+  - service_usbguard_enabled
-+  - usbguard_allow_hid_and_hub
-+
-+  ## Authentication hardening
-+  ## Identifiers 1546 / 0974 / 1173 / 1504 / 1505 / 1401 / 1559 / 1560
-+  ## 1561 / 1546 / 0421 / 1557 / 0422 / 1558 / 1403 / 0431
-+  - sshd_max_auth_tries_value=5
-+  - disable_host_auth
-+  - require_emergency_target_auth
-+  - require_singleuser_auth
-+  - sshd_disable_kerb_auth
-+  - sshd_set_max_auth_tries
-+
-+  ## Password authentication & Protecting credentials
-+  ## Identifiers 0421 / 0431 / 0418 / 1402
-+  - var_password_pam_minlen=14
-+  - var_accounts_password_warn_age_login_defs=7
-+  - var_accounts_minimum_age_login_defs=1
-+  - var_accounts_maximum_age_login_defs=60
-+  - var_authselect_profile=sssd
-+  - enable_authselect
-+  - accounts_password_warn_age_login_defs
-+  - accounts_maximum_age_login_defs
-+  - accounts_minimum_age_login_defs
-+  - accounts_passwords_pam_faillock_interval
-+  - accounts_passwords_pam_faillock_unlock_time
-+  - accounts_passwords_pam_faillock_deny
-+  - accounts_passwords_pam_faillock_deny_root
-+  - accounts_password_pam_minlen
-+
-+  ## Centralised logging facility
-+  ## Identifiers 1405 / 0988 
-+  - rsyslog_cron_logging
-+  - rsyslog_files_groupownership
-+  - rsyslog_files_ownership
-+  - rsyslog_files_permissions
-+  - rsyslog_nolisten
-+  - rsyslog_remote_loghost
-+  - rsyslog_remote_tls
-+  - rsyslog_remote_tls_cacert
-+  - package_chrony_installed
-+  - service_chronyd_enabled
-+  - chronyd_or_ntpd_specify_multiple_servers
-+  - chronyd_specify_remote_server
-+  - service_chronyd_or_ntpd_enabled
-+
-+  ## Events to be logged
-+  ## Identifiers 0580 / 0584 / 0582 / 0585 / 0586 / 0846 / 0957
-+  - sshd_print_last_log
-+  - sebool_auditadm_exec_content
-+  - audit_rules_privileged_commands
-+  - audit_rules_session_events_utmp
-+  - audit_rules_session_events_btmp
-+  - audit_rules_session_events_wtmp
-+  - audit_rules_usergroup_modification_group
-+  - audit_rules_usergroup_modification_gshadow
-+  - audit_rules_usergroup_modification_opasswd
-+  - audit_rules_usergroup_modification_passwd
-+  - audit_rules_usergroup_modification_shadow
-+  - audit_access_failed
-+  - audit_access_success
-+
-+  ## Web application & Database servers
-+  ## Identifiers 1552 / 1277
-+  - openssl_use_strong_entropy
-+
-+  ## Network design and configuration
-+  ## Identifiers 1055 / 1311 
-+  - network_nmcli_permissions
-+  - service_snmpd_disabled
-+  - snmpd_use_newer_protocol
-+
-+  ## Wireless networks
-+  ## Identifiers 1315
-+  - wireless_disable_interfaces
-+
-+  ## ASD Approved Cryptographic Algorithms
-+  ## Identifiers 0471 / 0472 / 0473 / 0474 / 0475 / 0476 / 0477 / 
-+  ## 0479 / 0480 / 0481 / 0489 / 0497 / 0994 / 0998 / 1001 /  1139 / 
-+  ## 1372 / 1373 / 1374 / 1375
-+  - enable_fips_mode
-+  - var_system_crypto_policy=fips
-+  - configure_crypto_policy
-+
-+  ## Secure Shell access
-+  ## Identifiers 0484 / 1506 / 1449 / 0487
-+  - sshd_allow_only_protocol2
-+  - sshd_enable_warning_banner
-+  - sshd_disable_x11_forwarding
-+  - file_permissions_sshd_private_key
++    - ism_o:all
++    # Add rules missing from the control file that where in RHEL 8
++    - accounts_password_all_shadowed
++    - usbguard_allow_hid_and_hub
++    - sshd_allow_only_protocol2
++    # Remove rules that where not the original profile for RHEL 8
++    - '!accounts_password_minlen_login_defs'
++    - '!accounts_password_pam_dcredit'
++    - '!accounts_password_pam_lcredit'
++    - '!accounts_password_pam_minclass'
++    - '!accounts_password_pam_ocredit'
++    - '!accounts_password_pam_ucredit'
++    - '!accounts_passwords_pam_tally2_deny_root'
++    - '!accounts_passwords_pam_tally2_unlock_time'
++    - '!audit_access_failed_aarch64'
++    - '!audit_access_failed_ppc64le'
++    - '!audit_access_success_aarch64'
++    - '!audit_access_success_ppc64le'
++    - '!audit_rules_unsuccessful_file_modification_creat'
++    - '!audit_rules_unsuccessful_file_modification_ftruncate'
++    - '!audit_rules_unsuccessful_file_modification_open'
++    - '!audit_rules_unsuccessful_file_modification_openat'
++    - '!audit_rules_unsuccessful_file_modification_open_by_handle_at'
++    - '!audit_rules_unsuccessful_file_modification_truncate'
++    - '!chronyd_configure_pool_and_server'
++    - '!configure_kerberos_crypto_policy'
++    - '!configure_opensc_card_drivers'
++    - '!dnf-automatic_apply_updates'
++    - '!enable_dracut_fips_module'
++    - '!enable_ldap_client'
++    - '!force_opensc_card_drivers'
++    - '!kerberos_disable_no_keytab'
++    - '!network_ipv6_static_address'
++    - '!package_audit_installed'
++    - '!package_libdnf-plugin-subscription-manager_installed'
++    - '!package_opensc_installed'
++    - '!package_pcsc-lite-ccid_installed'
++    - '!package_pcsc-lite_installed'
++    - '!package_subscription-manager_installed'
++    - '!sebool_authlogin_nsswitch_use_ldap'
++    - '!sebool_authlogin_radius'
++    - '!sebool_kerberos_enabled'
++    - '!secure_boot_enabled'
++    - '!service_pcscd_enabled'
++    - '!set_password_hashing_algorithm_libuserconf'
++    - '!set_password_hashing_algorithm_logindefs'
++    - '!set_password_hashing_algorithm_passwordauth'
++    - '!set_password_hashing_algorithm_systemauth'
++    - '!sssd_enable_smartcards'
++    - '!system_booted_in_fips_mode'
++    # Adjust variables to match the origianl RHEL 8 profiles
++    - var_password_hashing_algorithm_pam=sha512
++    - var_accounts_password_minlen_login_defs=15
 diff --git a/products/almalinux8/profiles/ospp.profile b/products/almalinux8/profiles/ospp.profile
 new file mode 100644
-index 000000000..094c14a62
+index 000000000..794f44484
 --- /dev/null
 +++ b/products/almalinux8/profiles/ospp.profile
-@@ -0,0 +1,437 @@
+@@ -0,0 +1,208 @@
++---
 +documentation_complete: true
 +
 +metadata:
@@ -16278,421 +10998,192 @@ index 000000000..094c14a62
 +    ### GENERAL REQUIREMENTS
 +    ### Things needed to meet OSPP functional requirements.
 +    #######################################################
++    - ospp:all
 +
-+    ### Partitioning
-+    - mount_option_home_nodev
-+    - mount_option_home_nosuid
-+    - mount_option_tmp_nodev
-+    - mount_option_tmp_noexec
-+    - mount_option_tmp_nosuid
-+    - partition_for_var_tmp
-+    - mount_option_var_tmp_nodev
-+    - mount_option_var_tmp_noexec
-+    - mount_option_var_tmp_nosuid
-+    - mount_option_dev_shm_nodev
-+    - mount_option_dev_shm_noexec
-+    - mount_option_dev_shm_nosuid
-+    - mount_option_nodev_nonroot_local_partitions
-+    - mount_option_boot_nodev
-+    - mount_option_boot_nosuid
-+    - partition_for_home
-+    - partition_for_var
-+    - mount_option_var_nodev
-+    - partition_for_var_log
-+    - mount_option_var_log_nodev
-+    - mount_option_var_log_nosuid
-+    - mount_option_var_log_noexec
-+    - partition_for_var_log_audit
-+    - mount_option_var_log_audit_nodev
-+    - mount_option_var_log_audit_nosuid
-+    - mount_option_var_log_audit_noexec
++    # special unused variables since we can't unselect variables. So we select the default value again
++    - 'var_logind_session_timeout=5_minutes'
++    - 'sysctl_kernel_unprivileged_bpf_disabled_value=2'
 +
-+    ### Services
-+    # sshd
-+    - sshd_disable_root_login
-+    - sshd_enable_strictmodes
-+    - disable_host_auth
-+    - sshd_disable_empty_passwords
-+    - sshd_disable_kerb_auth
-+    - sshd_disable_gssapi_auth
-+    - var_sshd_set_keepalive=1
-+    - sshd_set_keepalive_0
-+    - sshd_enable_warning_banner
-+    - sshd_rekey_limit
-+    - var_rekey_limit_size=1G
-+    - var_rekey_limit_time=1hour
-+    - sshd_use_strong_rng
++    # readd rules that are not present in the OSPP control file
 +    - openssl_use_strong_entropy
-+
-+    # Time Server
-+    - chronyd_client_only
-+    - chronyd_no_chronyc_network
-+
-+    ### Network Settings
-+    - sysctl_net_ipv6_conf_all_accept_ra
-+    - sysctl_net_ipv6_conf_default_accept_ra
-+    - sysctl_net_ipv4_conf_all_accept_redirects
-+    - sysctl_net_ipv4_conf_default_accept_redirects
-+    - sysctl_net_ipv6_conf_all_accept_redirects
-+    - sysctl_net_ipv6_conf_default_accept_redirects
-+    - sysctl_net_ipv4_conf_all_accept_source_route
-+    - sysctl_net_ipv4_conf_default_accept_source_route
-+    - sysctl_net_ipv6_conf_all_accept_source_route
-+    - sysctl_net_ipv6_conf_default_accept_source_route
-+    - sysctl_net_ipv4_conf_all_secure_redirects
-+    - sysctl_net_ipv4_conf_default_secure_redirects
-+    - sysctl_net_ipv4_conf_all_send_redirects
-+    - sysctl_net_ipv4_conf_default_send_redirects
-+    - sysctl_net_ipv4_conf_all_log_martians
-+    - sysctl_net_ipv4_conf_default_log_martians
-+    - sysctl_net_ipv4_conf_all_rp_filter
-+    - sysctl_net_ipv4_conf_default_rp_filter
-+    - sysctl_net_ipv4_icmp_ignore_bogus_error_responses
-+    - sysctl_net_ipv4_icmp_echo_ignore_broadcasts
-+    - sysctl_net_ipv4_ip_forward
-+    - sysctl_net_ipv4_tcp_syncookies
-+
-+    ### systemd
-+    - disable_ctrlaltdel_reboot
-+    - disable_ctrlaltdel_burstaction
-+    - service_debug-shell_disabled
-+
-+    ### umask
-+    - var_accounts_user_umask=027
-+    - accounts_umask_etc_profile
-+    - accounts_umask_etc_bashrc
-+    - accounts_umask_etc_csh_cshrc
-+
-+    ### Software update
-+    - ensure_almalinux_gpgkey_installed
-+    - ensure_gpgcheck_globally_activated
-+    - ensure_gpgcheck_local_packages
-+    - ensure_gpgcheck_never_disabled
-+
-+    ### Passwords
-+    - var_password_pam_difok=4
-+    - accounts_password_pam_difok
-+    - var_password_pam_maxrepeat=3
-+    - accounts_password_pam_maxrepeat
-+    - var_password_pam_maxclassrepeat=4
-+    - accounts_password_pam_maxclassrepeat
-+
-+    ### Kernel Config
-+    ## Boot prompt
-+    - grub2_audit_argument
-+    - grub2_audit_backlog_limit_argument
-+    - grub2_slub_debug_argument
-+    - var_slub_debug_options=P
-+    - grub2_page_poison_argument
-+    - grub2_vsyscall_argument
-+    - grub2_vsyscall_argument.role=unscored
-+    - grub2_vsyscall_argument.severity=info
-+    - grub2_pti_argument
-+    - grub2_kernel_trust_cpu_rng
-+
-+    ## Security Settings
-+    - sysctl_kernel_kptr_restrict
-+    - sysctl_kernel_dmesg_restrict
-+    - sysctl_kernel_kexec_load_disabled
-+    - sysctl_kernel_yama_ptrace_scope
-+    - sysctl_kernel_perf_event_paranoid
-+    - sysctl_user_max_user_namespaces
-+    - sysctl_user_max_user_namespaces.role=unscored
-+    - sysctl_user_max_user_namespaces.severity=info
-+    - sysctl_kernel_unprivileged_bpf_disabled
-+    - sysctl_net_core_bpf_jit_harden
-+    - service_kdump_disabled
-+
-+    ## File System Settings
-+    - sysctl_fs_protected_hardlinks
-+    - sysctl_fs_protected_symlinks
-+
-+    ### Audit
-+    - service_auditd_enabled
-+    - var_auditd_flush=incremental_async
-+    - auditd_data_retention_flush
-+    - auditd_local_events
-+    - auditd_write_logs
-+    - auditd_log_format
-+    - auditd_freq
-+    - auditd_name_format
-+
-+    ### Module Disabled
-+    - kernel_module_cramfs_disabled
-+    - kernel_module_bluetooth_disabled
-+    - kernel_module_sctp_disabled
-+    - kernel_module_firewire-core_disabled
-+    - kernel_module_atm_disabled
-+    - kernel_module_can_disabled
-+    - kernel_module_tipc_disabled
-+
-+    ### rpcbind
-+
-+    ### Install Required Packages
-+    - package_aide_installed
-+    - package_dnf-automatic_installed
-+    - package_subscription-manager_installed
-+    - package_dnf-plugin-subscription-manager_installed
-+    - package_firewalld_installed
-+    - package_openscap-scanner_installed
-+    - package_policycoreutils_installed
-+    - package_sudo_installed
-+    - package_usbguard_installed
-+    - package_scap-security-guide_installed
-+    - package_audit_installed
-+    - package_crypto-policies_installed
-+    - package_openssh-server_installed
-+    - package_openssh-clients_installed
-+    - package_policycoreutils-python-utils_installed
-+    - package_rsyslog_installed
-+    - package_chrony_installed
-+    - package_gnutls-utils_installed
-+
-+    ### Remove Prohibited Packages
-+    - package_sendmail_removed
-+    - package_iprutils_removed
-+    - package_gssproxy_removed
-+    - package_nfs-utils_removed
-+    - package_krb5-workstation_removed
-+    - package_abrt-addon-kerneloops_removed
-+    - package_python3-abrt-addon_removed
-+    - package_abrt-addon-ccpp_removed
-+    - package_abrt-plugin-sosreport_removed
-+    - package_abrt-cli_removed
-+    - package_libreport-plugin-rhtsupport_removed
-+    - package_libreport-plugin-logger_removed
-+    - package_abrt_removed
-+
-+    ### Login
-+    - disable_users_coredumps
-+    - sysctl_kernel_core_pattern
-+    - coredump_disable_storage
 +    - coredump_disable_backtraces
-+    - service_systemd-coredump_disabled
-+    - var_accounts_max_concurrent_login_sessions=10
-+    - accounts_max_concurrent_login_sessions
-+    - securetty_root_login_console_only
-+    - var_authselect_profile=minimal
-+    - enable_authselect
-+    - var_password_pam_unix_remember=5
-+    - accounts_password_pam_unix_remember
-+    - use_pam_wheel_for_su
-+
-+    ### SELinux Configuration
-+    - var_selinux_state=enforcing
-+    - selinux_state
-+    - var_selinux_policy_name=targeted
-+    - selinux_policytype
-+
-+    ### Application Whitelisting (RHEL 8)
-+    - package_fapolicyd_installed
-+    - service_fapolicyd_enabled
-+
-+    ### Configure USBGuard
-+    - service_usbguard_enabled
-+    - configure_usbguard_auditbackend
-+    - usbguard_allow_hid_and_hub
-+
-+
-+    ### Enable / Configure FIPS
-+    - enable_fips_mode
-+    - var_system_crypto_policy=fips_ospp
-+    - configure_crypto_policy
-+    - configure_ssh_crypto_policy
-+    - configure_bind_crypto_policy
-+    - configure_openssl_crypto_policy
-+    - configure_libreswan_crypto_policy
-+    - configure_kerberos_crypto_policy
-+    - enable_dracut_fips_module
-+
-+    #######################################################
-+    ### CONFIGURATION ANNEX TO THE PROTECTION PROFILE
-+    ### FOR GENERAL PURPOSE OPERATING SYSTEMS
-+    ### ANNEX RELEASE 1
-+    ### FOR PROTECTION PROFILE VERSIONS 4.2
-+    ###
-+    ### https://www.niap-ccevs.org/MMO/PP/-442ConfigAnnex-/
-+    #######################################################
-+
-+    ## Configure Minimum Password Length to 12 Characters
-+    ## IA-5 (1)(a) / FMT_MOF_EXT.1
-+    - var_password_pam_minlen=12
-+    - accounts_password_pam_minlen
-+
-+    ## Require at Least 1 Special Character in Password
-+    ## IA-5(1)(a) / FMT_MOF_EXT.1
-+    - var_password_pam_ocredit=1
-+    - accounts_password_pam_ocredit
-+
-+    ## Require at Least 1 Numeric Character in Password
-+    ## IA-5(1)(a) / FMT_MOF_EXT.1
-+    - var_password_pam_dcredit=1
-+    - accounts_password_pam_dcredit
-+
-+    ## Require at Least 1 Uppercase Character in Password
-+    ## IA-5(1)(a) / FMT_MOF_EXT.1
-+    - var_password_pam_ucredit=1
-+    - accounts_password_pam_ucredit
-+
-+    ## Require at Least 1 Lowercase Character in Password
-+    ## IA-5(1)(a) / FMT_MOF_EXT.1
-+    - var_password_pam_lcredit=1
-+    - accounts_password_pam_lcredit
-+
-+    ## Enable Screen Lock
-+    ## FMT_MOF_EXT.1
-+    - package_tmux_installed
 +    - configure_bashrc_exec_tmux
-+    - no_tmux_in_shells
-+    - configure_tmux_lock_command
-+    - configure_tmux_lock_after_time
-+
-+    ## Set Screen Lock Timeout Period to 30 Minutes or Less
-+    ## AC-11(a) / FMT_MOF_EXT.1
-+    ## We deliberately set sshd timeout to 1 minute before tmux lock timeout
-+    - sshd_idle_timeout_value=14_minutes
-+    - sshd_set_idle_timeout
-+
-+    ## Disable Unauthenticated Login (such as Guest Accounts)
-+    ## FIA_UAU.1
-+    - require_singleuser_auth
-+    - grub2_disable_recovery
-+    - grub2_uefi_password
-+    - no_empty_passwords
-+
-+    ## Set Maximum Number of Authentication Failures to 3 Within 15 Minutes
-+    ## AC-7 / FIA_AFL.1
-+    - var_accounts_passwords_pam_faillock_deny=3
-+    - accounts_passwords_pam_faillock_deny
-+    - var_accounts_passwords_pam_faillock_fail_interval=900
-+    - accounts_passwords_pam_faillock_interval
-+    - var_accounts_passwords_pam_faillock_unlock_time=never
-+    - accounts_passwords_pam_faillock_unlock_time
-+
-+    ## Enable Host-Based Firewall
-+    ## SC-7(12) / FMT_MOF_EXT.1
-+    - service_firewalld_enabled
-+
-+    ## Configure Name/Addres of Remote Management Server
-+    ##  From Which to Receive Config Settings
-+    ## CM-3(3) / FMT_MOF_EXT.1
-+
-+    ## Configure the System to Offload Audit Records to a Log
-+    ##  Server
-+    ## AU-4(1) / FAU_GEN.1.1.c
-+    # temporarily dropped
-+
-+    ## Set Logon Warning Banner
-+    ## AC-8(a) / FMT_MOF_EXT.1
-+
-+    ## Audit All Logons (Success/Failure) and Logoffs (Success)
-+    ##  CNSSI 1253 Value or DoD-Specific Values:
-+    ##      (1) Logons (Success/Failure)
-+    ##      (2) Logoffs (Success)
-+    ## AU-2(a) / FAU_GEN.1.1.c
-+
-+    ## Audit File and Object Events (Unsuccessful)
-+    ##  CNSSI 1253 Value or DoD-specific Values:
-+    ##      (1) Create (Success/Failure)
-+    ##      (2) Access (Success/Failure)
-+    ##      (3) Delete (Sucess/Failure)
-+    ##      (4) Modify (Success/Failure)
-+    ##      (5) Permission Modification (Sucess/Failure)
-+    ##      (6) Ownership Modification (Success/Failure)
-+    ## AU-2(a) / FAU_GEN.1.1.c
-+    ##
-+    ##
-+    ## (1) Create (Success/Failure)
-+    ##      (open with O_CREAT)
-+    ## (2) Access (Success/Failure)
-+    ## (3) Delete (Success/Failure)
-+    ## (4) Modify (Success/Failure)
-+    ## (5) Permission Modification (Success/Failure)
-+    ## (6) Ownership Modification (Success/Failure)
-+
-+    ## Audit User and Group Management Events (Success/Failure)
-+    ##  CNSSI 1253 Value or DoD-specific Values:
-+    ##      (1) User add, delete, modify, disable, enable (Success/Failure)
-+    ##      (2) Group/Role add, delete, modify (Success/Failure)
-+    ## AU-2(a) / FAU_GEN.1.1.c
-+    ##
-+    ## Generic User and Group Management Events (Success/Failure)
-+    ## Selection of setuid programs that relate to
-+    ## user accounts.
-+    ##
-+    ## CNSSI 1253: (1) User add, delete, modify, disable, enable (Success/Failure)
-+    ##
-+    ## CNSSI 1252: (2) Group/Role add, delete, modify (Success/Failure)
-+    ##
-+    ## Audit Privilege or Role Escalation Events (Success/Failure)
-+    ##  CNSSI 1253 Value or DoD-specific Values:
-+    ##      - Privilege/Role escalation (Success/Failure)
-+    ## AU-2(a) / FAU_GEN.1.1.c
-+    ## Audit All Audit and Log Data Accesses (Success/Failure)
-+    ##  CNSSI 1253 Value or DoD-specific Values:
-+    ##      - Audit and log data access (Success/Failure)
-+    ## AU-2(a) / FAU_GEN.1.1.c
-+    ## Audit Cryptographic Verification of Software (Success/Failure)
-+    ##  CNSSI 1253 Value or DoD-specific Values:
-+    ##      - Applications (e.g. Firefox, Internet Explorer, MS Office Suite,
-+    ##        etc) initialization (Success/Failure)
-+    ## AU-2(a) / FAU_GEN.1.1.c
-+    ## Audit Kernel Module Loading and Unloading Events (Success/Failure)
-+    ## AU-2(a) / FAU_GEN.1.1.c
-+    - audit_basic_configuration
-+    - audit_immutable_login_uids
-+    - audit_create_failed
-+    - audit_create_success
-+    - audit_modify_failed
-+    - audit_modify_success
-+    - audit_access_failed
-+    - audit_access_success
-+    - audit_delete_failed
-+    - audit_delete_success
-+    - audit_perm_change_failed
-+    - audit_perm_change_success
-+    - audit_owner_change_failed
-+    - audit_owner_change_success
-+    - audit_ospp_general
-+    - audit_module_load
-+
-+    ## Enable Automatic Software Updates
-+    ## SI-2 / FMT_MOF_EXT.1
-+    # Configure dnf-automatic to Install Only Security Updates
 +    - dnf-automatic_security_updates_only
-+
-+    # Configure dnf-automatic to Install Available Updates Automatically
-+    - dnf-automatic_apply_updates
-+
-+    # Enable dnf-automatic Timer
-+    - timer_dnf-automatic_enabled
-+
-+
-+    # Prevent Kerberos use by system daemons
-+    - kerberos_disable_no_keytab
-+
-+    # set ssh client rekey limit
-+    - ssh_client_rekey_limit
-+    - var_ssh_client_rekey_limit_size=1G
-+    - var_ssh_client_rekey_limit_time=1hour
-+
-+# configure ssh client to use strong entropy
-+    - ssh_client_use_strong_rng_sh
-+    - ssh_client_use_strong_rng_csh
-+
-+    # zIPl specific rules
-+    - zipl_bls_entries_only
-+    - zipl_bootmap_is_up_to_date
-+    - zipl_audit_argument
-+    - zipl_audit_backlog_limit_argument
-+    - zipl_slub_debug_argument
 +    - zipl_page_poison_argument
++    - kernel_module_atm_disabled
++    - sysctl_net_ipv4_icmp_ignore_bogus_error_responses
++    - mount_option_tmp_nodev
++    - mount_option_var_log_nosuid
++    - package_abrt-plugin-sosreport_removed
++    - sysctl_net_ipv6_conf_default_accept_redirects
++    - accounts_umask_etc_bashrc
++    - sysctl_net_ipv4_conf_all_accept_source_route
++    - mount_option_var_tmp_nosuid
++    - package_abrt-cli_removed
++    - securetty_root_login_console_only
++    - sshd_use_strong_rng
++    - sysctl_fs_protected_hardlinks
++    - sysctl_net_ipv4_ip_forward
++    - grub2_pti_argument
++    - mount_option_nodev_nonroot_local_partitions
++    - partition_for_var_tmp
++    - configure_bind_crypto_policy
++    - sshd_enable_strictmodes
++    - grub2_slub_debug_argument
++    - sshd_idle_timeout_value=14_minutes
++    - sysctl_user_max_user_namespaces.role=unscored
++    - sysctl_net_ipv4_conf_all_accept_redirects
++    - accounts_password_pam_maxclassrepeat
++    - grub2_page_poison_argument
++    - zipl_slub_debug_argument
++    - sysctl_net_ipv6_conf_default_accept_ra
++    - mount_option_boot_nosuid
++    - enable_authselect
++    - sysctl_net_ipv4_conf_default_send_redirects
++    - package_policycoreutils_installed
++    - mount_option_var_tmp_noexec
++    - package_libreport-plugin-rhtsupport_removed
++    - grub2_uefi_password
++    - mount_option_dev_shm_nosuid
++    - var_password_pam_maxclassrepeat=4
++    - mount_option_tmp_noexec
++    - package_rsyslog_installed
++    - accounts_password_pam_unix_remember
++    - sysctl_net_ipv4_tcp_syncookies
++    - package_iprutils_removed
++    - configure_tmux_lock_after_time
++    - package_libreport-plugin-logger_removed
++    - disable_users_coredumps
++    - sysctl_net_ipv4_conf_default_accept_redirects
++    - var_password_pam_unix_remember=5
++    - kerberos_disable_no_keytab
++    - package_abrt-addon-ccpp_removed
++    - accounts_umask_etc_csh_cshrc
++    - mount_option_home_nodev
++    - sshd_set_keepalive_0
++    - accounts_max_concurrent_login_sessions
++    - var_authselect_profile=minimal
++    - sysctl_user_max_user_namespaces.severity=info
++    - configure_libreswan_crypto_policy
++    - var_accounts_user_umask=027
++    - sysctl_net_ipv4_conf_default_rp_filter
++    - sysctl_net_ipv4_conf_all_secure_redirects
++    - package_tmux_installed
++    - accounts_password_pam_maxrepeat
++    - partition_for_var
++    - grub2_vsyscall_argument.role=unscored
++    - mount_option_boot_nodev
++    - var_accounts_max_concurrent_login_sessions=10
++    - grub2_vsyscall_argument.severity=info
++    - sshd_set_idle_timeout
++    - accounts_password_pam_difok
++    - sysctl_net_ipv4_conf_all_log_martians
++    - partition_for_var_log
++    - package_abrt_removed
++    - coredump_disable_storage
++    - configure_tmux_lock_command
++    - var_password_pam_difok=4
++    - sysctl_net_ipv4_conf_all_rp_filter
++    - mount_option_var_nodev
++    - kernel_module_firewire-core_disabled
++    - sysctl_net_ipv6_conf_default_accept_source_route
++    - sysctl_net_core_bpf_jit_harden
++    - sysctl_fs_protected_symlinks
++    - package_sendmail_removed
++    - package_krb5-workstation_removed
++    - var_password_pam_maxrepeat=3
++    - mount_option_tmp_nosuid
++    - partition_for_home
++    - package_python3-abrt-addon_removed
++    - sysctl_net_ipv4_conf_default_secure_redirects
++    - sysctl_kernel_unprivileged_bpf_disabled
++    - configure_kerberos_crypto_policy
++    - auditd_write_logs
++    - accounts_umask_etc_profile
++    - no_tmux_in_shells
++    - kernel_module_cramfs_disabled
++    - mount_option_home_nosuid
++    - auditd_local_events
++    - package_aide_installed
++    - sysctl_net_ipv6_conf_all_accept_ra
++    - sysctl_net_ipv6_conf_all_accept_source_route
++    - sysctl_net_ipv6_conf_all_accept_redirects
++    - sysctl_net_ipv4_conf_default_accept_source_route
++    - mount_option_var_tmp_nodev
++    - mount_option_var_log_nodev
++    - sysctl_net_ipv4_conf_all_send_redirects
++    - grub2_kernel_trust_cpu_rng
++    - sysctl_net_ipv4_conf_default_log_martians
++    - sysctl_net_ipv4_icmp_echo_ignore_broadcasts
++    - package_gssproxy_removed
++    - mount_option_dev_shm_noexec
++    - package_abrt-addon-kerneloops_removed
++    - ssh_client_use_strong_rng_csh
++    - chronyd_no_chronyc_network
++    - mount_option_var_log_noexec
++    - sysctl_kernel_core_pattern
++    - var_sshd_set_keepalive=1
++    - mount_option_dev_shm_nodev
++    - ssh_client_use_strong_rng_sh
++    - package_nfs-utils_removed
++    - var_slub_debug_options=P
++    - package_policycoreutils-python-utils_installed
++
++
++    # remove extranous rules coming from the OSPP control File
++    - '!audit_access_failed_ppc64le'
++    - '!audit_access_success_ppc64le.role=unscored'
++    - '!audit_ospp_general_aarch64'
++    - '!sysctl_kernel_core_pattern_empty_string'
++    - '!audit_perm_change_failed_ppc64le'
++    - '!sshd_use_directory_configuration'
++    - '!zipl_init_on_alloc_argument'
++    - '!audit_access_success_ppc64le.severity=info'
++    - '!audit_owner_change_failed_aarch64'
++    - '!audit_access_success_aarch64.role=unscored'
++    - '!grub2_systemd_debug-shell_argument_absent'
++    - '!sysctl_kernel_core_uses_pid'
++    - '!grub2_init_on_alloc_argument'
++    - '!audit_perm_change_success_ppc64le'
++    - '!audit_modify_failed_aarch64'
++    - '!audit_modify_success_aarch64'
++    - '!audit_delete_failed_aarch64'
++    - '!audit_perm_change_success_aarch64'
++    - '!sysctl_kernel_unprivileged_bpf_disabled_accept_default'
++    - '!grub2_password'
++    - '!audit_access_success.severity=info'
++    - '!audit_delete_success_ppc64le'
++    - '!audit_create_success_aarch64'
++    - '!audit_create_success_ppc64le'
++    - '!audit_access_success.role=unscored'
++    - '!audit_owner_change_success_ppc64le'
++    - '!audit_access_success_aarch64'
++    - '!audit_delete_failed_ppc64le'
++    - '!audit_perm_change_failed_aarch64'
++    - '!grub2_page_alloc_shuffle_argument'
++    - '!audit_delete_success_aarch64'
++    - '!audit_access_success_aarch64.severity=info'
++    - '!audit_modify_success_ppc64le'
++    - '!audit_owner_change_failed_ppc64le'
++    - '!audit_owner_change_success_aarch64'
++    - '!audit_access_success_ppc64le'
++    - '!audit_create_failed_ppc64le'
++    - '!audit_ospp_general_ppc64le'
++    - '!logind_session_timeout'
++    - '!audit_create_failed_aarch64'
++    - '!zipl_page_alloc_shuffle_argument'
++    - '!audit_module_load_ppc64le'
++    - '!audit_access_failed_aarch64'
++    - '!zipl_systemd_debug-shell_argument_absent'
++    - '!audit_modify_failed_ppc64le'
++
 diff --git a/products/almalinux8/profiles/pci-dss.profile b/products/almalinux8/profiles/pci-dss.profile
 new file mode 100644
-index 000000000..5cc9e2b8f
+index 000000000..baaa75865
 --- /dev/null
 +++ b/products/almalinux8/profiles/pci-dss.profile
-@@ -0,0 +1,65 @@
+@@ -0,0 +1,66 @@
++---
 +documentation_complete: true
 +
 +metadata:
@@ -16760,10 +11251,11 @@ index 000000000..5cc9e2b8f
 +    - '!audit_rules_dac_modification_fchmodat2'
 diff --git a/products/almalinux8/profiles/rht-ccp.profile b/products/almalinux8/profiles/rht-ccp.profile
 new file mode 100644
-index 000000000..79d0208f5
+index 000000000..f6c32777c
 --- /dev/null
 +++ b/products/almalinux8/profiles/rht-ccp.profile
-@@ -0,0 +1,103 @@
+@@ -0,0 +1,104 @@
++---
 +documentation_complete: true
 +
 +hidden: true
@@ -16869,10 +11361,11 @@ index 000000000..79d0208f5
 +    - configure_ssh_crypto_policy
 diff --git a/products/almalinux8/profiles/standard.profile b/products/almalinux8/profiles/standard.profile
 new file mode 100644
-index 000000000..58025b460
+index 000000000..bf5d6d51e
 --- /dev/null
 +++ b/products/almalinux8/profiles/standard.profile
-@@ -0,0 +1,91 @@
+@@ -0,0 +1,92 @@
++---
 +documentation_complete: true
 +
 +hidden: true
@@ -16966,25 +11459,26 @@ index 000000000..58025b460
 +    - file_permissions_user_cfg
 diff --git a/products/almalinux8/profiles/stig.profile b/products/almalinux8/profiles/stig.profile
 new file mode 100644
-index 000000000..0492af012
+index 000000000..e191e4245
 --- /dev/null
 +++ b/products/almalinux8/profiles/stig.profile
-@@ -0,0 +1,1226 @@
+@@ -0,0 +1,29 @@
++---
 +documentation_complete: true
 +
 +metadata:
-+    version: V2R3
++    version: V2R4
 +    SMEs:
 +        - mab879
 +        - ggbecker
 +
-+reference: https://public.cyber.mil/stigs/downloads/?_dl_facet_stigs=operating-systems%2Cunix-linux
++reference: https://www.cyber.mil/stigs/downloads/?_dl_facet_stigs=operating-systems%2Cunix-linux
 +
 +title: 'DISA STIG for Red Hat Enterprise Linux 8'
 +
 +description: |-
 +    This profile contains configuration checks that align to the
-+    DISA STIG for Red Hat Enterprise Linux 8 V2R3.
++    DISA STIG for Red Hat Enterprise Linux 8 V2R4.
 +
 +    In addition to being applicable to Red Hat Enterprise Linux 8, this
 +    configuration baseline is applicable to the operating system tier of
@@ -16997,1226 +11491,29 @@ index 000000000..0492af012
 +    - Red Hat Containers with a Red Hat Enterprise Linux 8 image
 +
 +selections:
-+    ### Variables
-+    - var_rekey_limit_size=1G
-+    - var_rekey_limit_time=1hour
-+    - var_accounts_user_umask=077
-+    - var_password_pam_difok=8
-+    - var_password_pam_maxrepeat=3
-+    - var_password_hashing_algorithm=SHA512
-+    - var_password_hashing_algorithm_pam=sha512
-+    - var_password_pam_maxclassrepeat=4
-+    - var_password_pam_minclass=4
-+    - var_accounts_minimum_age_login_defs=1
-+    - var_accounts_max_concurrent_login_sessions=10
-+    - var_password_pam_remember=5
-+    - var_password_pam_remember_control_flag=requisite_or_required
-+    - var_selinux_state=enforcing
-+    - var_selinux_policy_name=targeted
-+    - var_password_hashing_min_rounds_login_defs=100000
-+    - var_password_pam_minlen=15
-+    - var_password_pam_ocredit=1
-+    - var_password_pam_dcredit=1
-+    - var_password_pam_dictcheck=1
-+    - var_password_pam_ucredit=1
-+    - var_password_pam_lcredit=1
-+    - var_password_pam_retry=3
-+    - var_password_pam_minlen=15
-+    - var_sshd_set_keepalive=1
-+    - sshd_approved_macs=stig_extended
-+    - sshd_approved_ciphers=stig_extended
-+    - sshd_idle_timeout_value=10_minutes
-+    - var_accounts_authorized_local_users_regex=rhel8
-+    - var_accounts_passwords_pam_faillock_deny=3
-+    - var_accounts_passwords_pam_faillock_fail_interval=900
-+    - var_accounts_passwords_pam_faillock_unlock_time=never
-+    - var_ssh_client_rekey_limit_size=1G
-+    - var_ssh_client_rekey_limit_time=1hour
-+    - var_accounts_fail_delay=4
-+    - var_account_disable_post_pw_expiration=35
-+    - var_auditd_action_mail_acct=root
-+    - var_time_service_set_maxpoll=18_hours
-+    - var_accounts_maximum_age_login_defs=60
-+    - var_auditd_space_left_percentage=25pc
-+    - var_auditd_space_left_action=email
-+    - var_auditd_disk_error_action=rhel8
-+    - var_auditd_max_log_file_action=syslog
-+    - var_auditd_disk_full_action=rhel8
-+    - 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
-+    - var_system_crypto_policy=fips
-+    - configure_crypto_policy
-+    - configure_bind_crypto_policy
-+    - configure_libreswan_crypto_policy
-+    - configure_kerberos_crypto_policy
-+    - enable_dracut_fips_module
-+
-+    # Other needed rules
-+    - enable_authselect
-+
-+    ### Rules:
-+    # RHEL-08-010000
-+    - installed_OS_is_vendor_supported
-+
-+    # RHEL-08-010010
-+    - security_patches_up_to_date
-+
-+    # RHEL-08-010019
-+    - ensure_almalinux_gpgkey_installed
-+
-+    # RHEL-08-010020
-+    - sysctl_crypto_fips_enabled
-+    - fips_crypto_subpolicy
-+
-+    # RHEL-08-010030
-+    - encrypt_partitions
-+
-+    # RHEL-08-010040
-+    - sshd_enable_warning_banner
-+
-+    # RHEL-08-010049
-+    - dconf_gnome_banner_enabled
-+
-+    # RHEL-08-010050
-+    - dconf_gnome_login_banner_text
-+
-+    # RHEL-08-010060
-+    - banner_etc_issue
-+
-+    # RHEL-08-010070
-+    - rsyslog_remote_access_monitoring
-+
-+    # RHEL-08-010090
-+    - sssd_has_trust_anchor
-+
-+    # RHEL-08-010100
-+    - ssh_keys_passphrase_protected
-+
-+    # RHEL-08-010110
-+    - set_password_hashing_algorithm_logindefs
-+
-+    # RHEL-08-010120
-+    - accounts_password_all_shadowed_sha512
-+
-+    # RHEL-08-010121
-+    - no_empty_passwords_etc_shadow
-+
-+    # RHEL-08-010130
-+    - set_password_hashing_min_rounds_logindefs
-+
-+    # RHEL-08-010140
-+    - grub2_uefi_password
-+
-+    # RHEL-08-010141
-+    - grub2_uefi_admin_username
-+
-+    # RHEL-08-010149
-+    - grub2_admin_username
-+
-+    # RHEL-08-010150
-+    - grub2_password
-+
-+    # RHEL-08-010151
-+    - require_singleuser_auth
-+
-+    # RHEL-08-010152
-+    - require_emergency_target_auth
-+
-+    # RHEL-08-010159
-+    - set_password_hashing_algorithm_passwordauth
-+
-+    # RHEL-08-010160
-+    - set_password_hashing_algorithm_systemauth
-+
-+    # RHEL-08-010161
-+    - kerberos_disable_no_keytab
-+
-+    # RHEL-08-010162
-+    - package_krb5-workstation_removed
-+
-+    # RHEL-08-010170
-+    - selinux_state
-+
-+    # RHEL-08-010171
-+    - package_policycoreutils_installed
-+
-+    # RHEL-08-010190
-+    - dir_perms_world_writable_sticky_bits
-+
-+    # RHEL-08-010200
-+    - sshd_set_keepalive
-+    # RHEL-08-010201
-+    - sshd_set_idle_timeout
-+
-+    # RHEL-08-010210
-+    - file_permissions_var_log_messages
-+
-+    # RHEL-08-010220
-+    - file_owner_var_log_messages
-+
-+    # RHEL-08-010230
-+    - file_groupowner_var_log_messages
-+
-+    # RHEL-08-010240
-+    - file_permissions_var_log
-+
-+    # RHEL-08-010250
-+    - file_owner_var_log
-+
-+    # RHEL-08-010260
-+    - file_groupowner_var_log
-+
-+    # RHEL-08-010287
-+    - configure_ssh_crypto_policy
-+
-+    # RHEL-08-010290
-+    - harden_sshd_macs_opensshserver_conf_crypto_policy
-+
-+    # RHEL-08-010291
-+    - harden_sshd_ciphers_opensshserver_conf_crypto_policy
-+
-+    # RHEL-08-010292
-+    - sshd_use_strong_rng
-+
-+    # RHEL-08-010293
-+    - configure_openssl_crypto_policy
-+
-+    # RHEL-08-010294
-+    - configure_openssl_tls_crypto_policy
-+
-+    # RHEL-08-010295
-+    - configure_gnutls_tls_crypto_policy
-+
-+    # RHEL-08-010296
-+    - harden_sshd_macs_openssh_conf_crypto_policy
-+
-+    # RHEL-08-010297
-+    - harden_sshd_ciphers_openssh_conf_crypto_policy
-+
-+    # RHEL-08-010300
-+    - file_permissions_binary_dirs
-+
-+    # RHEL-08-010310
-+    - file_ownership_binary_dirs
-+
-+    # RHEL-08-010320
-+    - file_groupownership_system_commands_dirs
-+
-+    # RHEL-08-010330
-+    - file_permissions_library_dirs
-+
-+    # RHEL-08-010331
-+    - dir_permissions_library_dirs
-+
-+    # RHEL-08-010340
-+    - file_ownership_library_dirs
-+
-+    # RHEL-08-010341
-+    - dir_ownership_library_dirs
-+
-+    # RHEL-08-010350
-+    - root_permissions_syslibrary_files
-+
-+    # RHEL-08-010351
-+    - dir_group_ownership_library_dirs
-+
-+    # RHEL-08-010358
-+    - package_mailx_installed
-+
-+    # RHEL-08-010359
-+    - package_aide_installed
-+    - aide_build_database
-+
-+    # RHEL-08-010360
-+    - aide_scan_notification
-+
-+    # RHEL-08-010370
-+    - enable_gpgcheck_for_all_repositories
-+
-+    # Necessary for package installs after gpgcheck is enabled
-+    - ensure_almalinux_gpgkey_installed
-+
-+    # RHEL-08-010371
-+    - ensure_gpgcheck_local_packages
-+
-+    # RHEL-08-010372
-+    - sysctl_kernel_kexec_load_disabled
-+
-+    # RHEL-08-010373
-+    - sysctl_fs_protected_symlinks
-+
-+    # RHEL-08-010374
-+    - sysctl_fs_protected_hardlinks
-+
-+    # RHEL-08-010375
-+    - sysctl_kernel_dmesg_restrict
-+
-+    # RHEL-08-010376
-+    - sysctl_kernel_perf_event_paranoid
-+
-+    # RHEL-08-010379
-+    - sudoers_default_includedir
-+
-+    # RHEL-08-010380
-+    - sudo_remove_nopasswd
-+
-+    # RHEL-08-010381
-+    - sudo_remove_no_authenticate
-+
-+    # RHEL-08-010382
-+    - sudo_restrict_privilege_elevation_to_authorized
-+
-+    # RHEL-08-010383
-+    - sudoers_validate_passwd
-+
-+    # RHEL-08-010384
-+    - sudo_require_reauthentication
-+    - var_sudo_timestamp_timeout=always_prompt
-+
-+    # RHEL-08-010385
-+    - disallow_bypass_password_sudo
-+
-+    # RHEL-08-010390
-+    - install_smartcard_packages
-+
-+    # RHEL-08-010400
-+    - sssd_certificate_verification
-+
-+    # RHEL-08-010410
-+    - package_opensc_installed
-+
-+    # RHEL-08-010420
-+    - bios_enable_execution_restrictions
-+
-+    # RHEL-08-010421
-+    - grub2_page_poison_argument
-+
-+    # RHEL-08-010422
-+    - grub2_vsyscall_argument
-+
-+    # RHEL-08-010423
-+    - grub2_init_on_free
-+
-+    # RHEL-08-010430
-+    - sysctl_kernel_randomize_va_space
-+
-+    # RHEL-08-010440
-+    - clean_components_post_updating
-+
-+    # RHEL-08-010450
-+    - selinux_policytype
-+
-+    # RHEL-08-010455
-+    - selinux_context_elevation_for_sudo
-+
-+    # RHEL-08-010460
-+    - no_host_based_files
-+
-+    # RHEL-08-010470
-+    - no_user_host_based_files
-+
-+    # RHEL-08-010471
-+    # Not applicable for RHEL 8.4+
-+    - service_rngd_enabled
-+
-+    # RHEL-08-010472
-+    - package_rng-tools_installed
-+
-+    # RHEL-08-010480
-+    - file_permissions_sshd_pub_key
-+
-+    # RHEL-08-010490
-+    - file_permissions_sshd_private_key
-+
-+    # RHEL-08-010500
-+    - sshd_enable_strictmodes
-+
-+    # RHEL-08-010520
-+    - sshd_disable_user_known_hosts
-+
-+    # RHEL-08-010521
-+    - sshd_disable_kerb_auth
-+
-+    # RHEL-08-010522
-+    - sshd_disable_gssapi_auth
-+
-+    # RHEL-08-010540
-+    - partition_for_var
-+
-+    # RHEL-08-010541
-+    - partition_for_var_log
-+
-+    # RHEL-08-010542
-+    - partition_for_var_log_audit
-+
-+    # RHEL-08-010543
-+    - partition_for_tmp
-+
-+    # RHEL-08-010544
-+    - partition_for_var_tmp
-+
-+    # RHEL-08-010550
-+    - sshd_disable_root_login
-+
-+    # RHEL-08-010561
-+    - service_rsyslog_enabled
-+
-+    # RHEL-08-010570
-+    - mount_option_home_nosuid
-+
-+    # RHEL-08-010571
-+    - mount_option_boot_nosuid
-+
-+    # RHEL-08-010572
-+    - mount_option_boot_efi_nosuid
-+
-+    # RHEL-08-010580
-+    - mount_option_nodev_nonroot_local_partitions
-+
-+    # RHEL-08-010590
-+    - mount_option_home_noexec
-+
-+    # RHEL-08-010600
-+    - mount_option_nodev_removable_partitions
-+
-+    # RHEL-08-010610
-+    - mount_option_noexec_removable_partitions
-+
-+    # RHEL-08-010620
-+    - mount_option_nosuid_removable_partitions
-+
-+    # RHEL-08-010630
-+    - mount_option_noexec_remote_filesystems
-+
-+    # RHEL-08-010640
-+    - mount_option_nodev_remote_filesystems
-+
-+    # RHEL-08-010650
-+    - mount_option_nosuid_remote_filesystems
-+
-+    # RHEL-08-010660
-+    - accounts_user_dot_no_world_writable_programs
-+
-+    # RHEL-08-010670
-+    - service_kdump_disabled
-+
-+    # RHEL-08-010671
-+    - sysctl_kernel_core_pattern
-+
-+    # RHEL-08-010672
-+    - service_systemd-coredump_disabled
-+
-+    # RHEL-08-010673
-+    - disable_users_coredumps
-+
-+    # RHEL-08-010674
-+    - coredump_disable_storage
-+
-+    # RHEL-08-010675
-+    - coredump_disable_backtraces
-+
-+    # RHEL-08-010680
-+    - network_configure_name_resolution
-+
-+    # RHEL-08-010690
-+    - accounts_user_home_paths_only
-+
-+    # RHEL-08-010700
-+    - dir_perms_world_writable_root_owned
-+
-+    # RHEL-08-010710
-+    - dir_perms_world_writable_system_owned_group
-+
-+    # RHEL-08-010720
-+    - accounts_user_interactive_home_directory_defined
-+
-+    # RHEL-08-010730
-+    - file_permissions_home_directories
-+
-+    # RHEL-08-010731
-+    - accounts_users_home_files_permissions
-+
-+    # RHEL-08-010740
-+    - file_groupownership_home_directories
-+
-+    # RHEL-08-010741
-+    - accounts_users_home_files_groupownership
-+
-+    # RHEL-08-010750
-+    - accounts_user_interactive_home_directory_exists
-+
-+    # RHEL-08-010760
-+    - accounts_have_homedir_login_defs
-+
-+    # RHEL-08-010770
-+    - file_permission_user_init_files_root
-+    - var_user_initialization_files_regex=all_dotfiles
-+    - rootfiles_configured
-+
-+    # RHEL-08-010780
-+    - no_files_unowned_by_user
-+
-+    # RHEL-08-010790
-+    - file_permissions_ungroupowned
-+
-+    # RHEL-08-010800
-+    - partition_for_home
-+
-+    # RHEL-08-010820
-+    - gnome_gdm_disable_automatic_login
-+
-+    # RHEL-08-010830
-+    - sshd_do_not_permit_user_env
-+
-+    # RHEL-08-020000
-+    - account_temp_expire_date
-+
-+    # RHEL-08-020010, RHEL-08-020011
-+    - accounts_passwords_pam_faillock_deny
-+
-+    # RHEL-08-020012, RHEL-08-020013
-+    - accounts_passwords_pam_faillock_interval
-+
-+    # RHEL-08-020014, RHEL-08-020015
-+    - accounts_passwords_pam_faillock_unlock_time
-+
-+    # RHEL-08-020016, RHEL-08-020017
-+    - accounts_passwords_pam_faillock_dir
-+
-+    # # RHEL-08-020018, RHEL-08-020019
-+    - accounts_passwords_pam_faillock_silent
-+
-+    # RHEL-08-020020, RHEL-08-020021
-+    - accounts_passwords_pam_faillock_audit
-+
-+    # RHEL-08-020022, RHEL-08-020023
-+    - accounts_passwords_pam_faillock_deny_root
-+
-+    # RHEL-08-020024
-+    - accounts_max_concurrent_login_sessions
-+
-+    # RHEL-08-020025
-+    - account_password_pam_faillock_system_auth
-+
-+    # RHEL-08-020026
-+    - account_password_pam_faillock_password_auth
-+
-+    # RHEL-08-020027, RHEL-08-020028
-+    - account_password_selinux_faillock_dir
-+
-+    # RHEL-08-020030
-+    - dconf_gnome_screensaver_lock_enabled
-+
-+    # RHEL-08-020031, RHEL-08-020080
-+    - dconf_gnome_screensaver_lock_delay
-+    - var_screensaver_lock_delay=5_seconds
-+
-+    # RHEL-08-020032
-+    - dconf_gnome_disable_user_list
-+
-+    # RHEL-08-020035
-+    - logind_session_timeout
-+    - var_logind_session_timeout=10_minutes
-+
-+    # RHEL-08-020050
-+    - dconf_gnome_lock_screen_on_smartcard_removal
-+
-+    # RHEL-08-020060
-+    - dconf_gnome_screensaver_idle_delay
-+
-+    # RHEL-08-020080
-+    - dconf_gnome_screensaver_user_locks
-+
-+    # RHEL-08-020081
-+    - dconf_gnome_session_idle_user_locks
-+
-+    # RHEL-08-020082
-+    - dconf_gnome_screensaver_lock_locked
-+
-+    # RHEL-08-020090
-+    - sssd_enable_certmap
-+
-+    # RHEL-08-020100
-+    - accounts_password_pam_pwquality_password_auth
-+
-+    # RHEL-08-020101
-+    - accounts_password_pam_pwquality_system_auth
-+
-+    # RHEL-08-020104
-+    - accounts_password_pam_retry
-+
-+    # RHEL-08-020110
-+    - accounts_password_pam_ucredit
-+
-+    # RHEL-08-020120
-+    - accounts_password_pam_lcredit
-+
-+    # RHEL-08-020130
-+    - accounts_password_pam_dcredit
-+
-+    # RHEL-08-020140
-+    - accounts_password_pam_maxclassrepeat
-+
-+    # RHEL-08-020150
-+    - accounts_password_pam_maxrepeat
-+
-+    # RHEL-08-020160
-+    - accounts_password_pam_minclass
-+
-+    # RHEL-08-020170
-+    - accounts_password_pam_difok
-+
-+    # RHEL-08-020180
-+    - accounts_password_set_min_life_existing
-+
-+    # RHEL-08-020190
-+    - accounts_minimum_age_login_defs
-+
-+    # RHEL-08-020200
-+    - accounts_maximum_age_login_defs
-+
-+    # RHEL-08-020210
-+    - accounts_password_set_max_life_existing
-+
-+    # RHEL-08-020230
-+    - accounts_password_pam_minlen
-+
-+    # RHEL-08-020231
-+    - accounts_password_minlen_login_defs
-+
-+    # RHEL-08-020240
-+    - account_unique_id
-+
-+    # RHEL-08-020250
-+    - sssd_enable_smartcards
-+
-+    # RHEL-08-020260
-+    - account_disable_post_pw_expiration
-+
-+    # RHEL-08-020270
-+    - account_temp_expire_date
-+
-+    # RHEL-08-020280
-+    - accounts_password_pam_ocredit
-+
-+    # RHEL-08-020290
-+    - sssd_offline_cred_expiration
-+
-+    # RHEL-08-020300
-+    - accounts_password_pam_dictcheck
-+
-+    # RHEL-08-020310
-+    - accounts_logon_fail_delay
-+
-+    # RHEL-08-020320
-+    - accounts_authorized_local_users
-+
-+    # RHEL-08-020330
-+    - sshd_disable_empty_passwords
-+
-+    # RHEL-08-020331
-+    - no_empty_passwords
-+
-+    # RHEL-08-020332
-+
-+    # RHEL-08-020340
-+    - display_login_attempts
-+
-+    # RHEL-08-020350
-+    - sshd_print_last_log
-+
-+    # RHEL-08-020351
-+    - accounts_umask_etc_login_defs
-+
-+    # RHEL-08-020352
-+    - accounts_umask_interactive_users
-+
-+    # RHEL-08-020353
-+    - accounts_umask_etc_bashrc
-+    - accounts_umask_etc_csh_cshrc
-+    - accounts_umask_etc_profile
-+
-+    # RHEL-08-030000
-+    - audit_rules_suid_privilege_function
-+
-+    # RHEL-08-030010
-+    - rsyslog_cron_logging
-+
-+    # RHEL-08-030020
-+    - auditd_data_retention_action_mail_acct
-+
-+    # RHEL-08-030030
-+    - postfix_client_configure_mail_alias_postmaster
-+    - package_postfix_installed
-+
-+    # RHEL-08-030040
-+    - auditd_data_disk_error_action
-+
-+    # RHEL-08-030060
-+    - auditd_data_disk_full_action
-+
-+    # RHEL-08-030061
-+    - auditd_local_events
-+
-+    # RHEL-08-030062
-+    - auditd_name_format
-+    - var_auditd_name_format=stig
-+
-+    # RHEL-08-030063
-+    - auditd_log_format
-+
-+    # RHEL-08-030070
-+    - file_permissions_var_log_audit
-+
-+    # RHEL-08-030080
-+    - file_ownership_var_log_audit_stig
-+
-+    # RHEL-08-030090
-+    - file_group_ownership_var_log_audit
-+
-+    # RHEL-08-030100
-+    - directory_ownership_var_log_audit
-+
-+    # RHEL-08-030110
-+    - directory_group_ownership_var_log_audit
-+
-+    # RHEL-08-030120
-+    - directory_permissions_var_log_audit
-+
-+    # *** NOTE *** #
-+    # Audit rules are currently under review as to how best to approach
-+    # them. We are working with DISA and our internal audit experts to
-+    # provide a final solution soon.
-+    # ************ #
-+
-+    # RHEL-08-030121
-+    - audit_rules_immutable
-+
-+    # RHEL-08-030122
-+    - audit_rules_immutable_login_uids
-+
-+    # RHEL-08-030130
-+    - audit_rules_usergroup_modification_shadow
-+
-+    # RHEL-08-030140
-+    - audit_rules_usergroup_modification_opasswd
-+
-+    # RHEL-08-030150
-+    - audit_rules_usergroup_modification_passwd
-+
-+    # RHEL-08-030160
-+    - audit_rules_usergroup_modification_gshadow
-+
-+    # RHEL-08-030170
-+    - audit_rules_usergroup_modification_group
-+
-+    # RHEL-08-030171
-+    - audit_rules_sudoers
-+
-+    # RHEL-08-030172
-+    - audit_rules_sudoers_d
-+
-+    # RHEL-08-030180
-+    - package_audit_installed
-+
-+    # RHEL-08-030181
-+    - service_auditd_enabled
-+
-+    # RHEL-08-030190
-+    - audit_rules_privileged_commands_su
-+
-+    # RHEL-08-030200
-+    - audit_rules_dac_modification_lremovexattr
-+    - audit_rules_dac_modification_removexattr
-+    - audit_rules_dac_modification_lsetxattr
-+    - audit_rules_dac_modification_fsetxattr
-+    - audit_rules_dac_modification_fremovexattr
-+    - audit_rules_dac_modification_setxattr
-+
-+    # RHEL-08-030250
-+    - audit_rules_privileged_commands_chage
-+
-+    # RHEL-08-030260
-+    - audit_rules_execution_chcon
-+
-+
-+    # RHEL-08-030280
-+    - audit_rules_privileged_commands_ssh_agent
-+
-+    # RHEL-08-030290
-+    - audit_rules_privileged_commands_passwd
-+
-+    # RHEL-08-030300
-+    - audit_rules_privileged_commands_mount
-+
-+    # RHEL-08-030301
-+    - audit_rules_privileged_commands_umount
-+
-+    # RHEL-08-030302
-+    - audit_rules_media_export
-+
-+    # RHEL-08-030310
-+    - audit_rules_privileged_commands_unix_update
-+
-+    # RHEL-08-030311
-+    - audit_rules_privileged_commands_postdrop
-+
-+    # RHEL-08-030312
-+    - audit_rules_privileged_commands_postqueue
-+
-+    # RHEL-08-030313
-+    - audit_rules_execution_semanage
-+
-+    # RHEL-08-030314
-+    - audit_rules_execution_setfiles
-+
-+    # RHEL-08-030315
-+    - audit_rules_privileged_commands_userhelper
-+
-+    # RHEL-08-030316
-+    - audit_rules_execution_setsebool
-+
-+    # RHEL-08-030317
-+    - audit_rules_privileged_commands_unix_chkpwd
-+
-+    # RHEL-08-030320
-+    - audit_rules_privileged_commands_ssh_keysign
-+
-+    # RHEL-08-030330
-+    - audit_rules_execution_setfacl
-+
-+    # RHEL-08-030340
-+    - audit_rules_privileged_commands_pam_timestamp_check
-+
-+    # RHEL-08-030350
-+    - audit_rules_privileged_commands_newgrp
-+
-+    # RHEL-08-030360
-+    - audit_rules_kernel_module_loading_init
-+    - audit_rules_kernel_module_loading_finit
-+
-+    # RHEL-08-030361
-+    - audit_rules_file_deletion_events_rename
-+    - audit_rules_file_deletion_events_renameat
-+    - audit_rules_file_deletion_events_rmdir
-+    - audit_rules_file_deletion_events_unlink
-+    - audit_rules_file_deletion_events_unlinkat
-+
-+    # RHEL-08-030370
-+    - audit_rules_privileged_commands_gpasswd
-+
-+    # RHEL-08-030390
-+    - audit_rules_kernel_module_loading_delete
-+
-+    # RHEL-08-030400
-+    - audit_rules_privileged_commands_crontab
-+
-+    # RHEL-08-030410
-+    - audit_rules_privileged_commands_chsh
-+
-+    # RHEL-08-030420
-+    - audit_rules_unsuccessful_file_modification_truncate
-+    - audit_rules_unsuccessful_file_modification_openat
-+    - audit_rules_unsuccessful_file_modification_open
-+    - audit_rules_unsuccessful_file_modification_open_by_handle_at
-+    - audit_rules_unsuccessful_file_modification_ftruncate
-+    - audit_rules_unsuccessful_file_modification_creat
-+
-+    # RHEL-08-030480
-+    - audit_rules_dac_modification_chown
-+    - audit_rules_dac_modification_lchown
-+    - audit_rules_dac_modification_fchownat
-+    - audit_rules_dac_modification_fchown
-+
-+    # RHEL-08-030490
-+    - audit_rules_dac_modification_chmod
-+    - audit_rules_dac_modification_fchmodat
-+    - audit_rules_dac_modification_fchmod
-+
-+    # RHEL-08-030550
-+    - audit_rules_privileged_commands_sudo
-+
-+    # RHEL-08-030560
-+    - audit_rules_privileged_commands_usermod
-+
-+    # RHEL-08-030570
-+    - audit_rules_execution_chacl
-+
-+    # RHEL-08-030580
-+    - audit_rules_privileged_commands_kmod
-+
-+    # RHEL-08-030590
-+    - audit_rules_login_events_faillock
-+
-+    # RHEL-08-030600
-+    - audit_rules_login_events_lastlog
-+
-+    # RHEL-08-030601
-+    - grub2_audit_argument
-+
-+    # RHEL-08-030602
-+    - grub2_audit_backlog_limit_argument
-+
-+    # RHEL-08-030603
-+    - configure_usbguard_auditbackend
-+
-+    # RHEL-08-030610
-+    - file_permissions_etc_audit_auditd
-+    - file_permissions_etc_audit_rulesd
-+
-+    # RHEL-08-030620
-+    - file_audit_tools_permissions
-+
-+    # RHEL-08-030630
-+    - file_audit_tools_ownership
-+
-+    # RHEL-08-030640
-+    - file_audit_tools_group_ownership
-+
-+    # RHEL-08-030650
-+    - aide_check_audit_tools
-+
-+    # RHEL-08-030660
-+    - auditd_audispd_configure_sufficiently_large_partition
-+
-+    # RHEL-08-030670
-+    - package_rsyslog_installed
-+
-+    # RHEL-08-030680
-+    - package_rsyslog-gnutls_installed
-+
-+    # RHEL-08-030690
-+    - rsyslog_remote_loghost
-+
-+    # RHEL-08-030700
-+    - auditd_overflow_action
-+
-+    # RHEL-08-030710
-+    - rsyslog_encrypt_offload_defaultnetstreamdriver
-+    - rsyslog_encrypt_offload_actionsendstreamdrivermode
-+
-+    # RHEL-08-030720
-+    - rsyslog_encrypt_offload_actionsendstreamdriverauthmode
-+
-+    # RHEL-08-030730
-+    - auditd_data_retention_space_left_percentage
-+
-+    # RHEL-08-030731
-+    - auditd_data_retention_space_left_action
-+
-+    # RHEL-08-030740
-+    # 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
-+
-+    # RHEL-08-030742
-+    - chronyd_no_chronyc_network
-+
-+    # RHEL-08-040000
-+    - package_telnet-server_removed
-+
-+    # RHEL-08-040001
-+    - package_abrt_removed
-+    - package_abrt-addon-ccpp_removed
-+    - package_abrt-addon-kerneloops_removed
-+    - package_python3-abrt-addon_removed
-+    - package_abrt-cli_removed
-+    - package_abrt-plugin-sosreport_removed
-+    - package_libreport-plugin-rhtsupport_removed
-+    - package_libreport-plugin-logger_removed
-+
-+    # RHEL-08-040002
-+    - package_sendmail_removed
-+
-+    # RHEL-08-040003
-+    ### NOTE: Will be removed in V1R2, merged into RHEL-08-040370
-+
-+    # RHEL-08-040004
-+    - grub2_pti_argument
-+
-+    # RHEL-08-040020
-+    - kernel_module_uvcvideo_disabled
-+
-+    # RHEL-08-040021
-+    - kernel_module_atm_disabled
-+
-+    # RHEL-08-040022
-+    - kernel_module_can_disabled
-+
-+    # RHEL-08-040023
-+    - kernel_module_sctp_disabled
-+
-+    # RHEL-08-040024
-+    - kernel_module_tipc_disabled
-+
-+    # RHEL-08-040025
-+    - kernel_module_cramfs_disabled
-+
-+    # RHEL-08-040026
-+    - kernel_module_firewire-core_disabled
-+
-+    # RHEL-08-040030
-+    - configure_firewalld_ports
-+
-+    # RHEL-08-040060
-+    ### NOTE: Removed in V1R2
-+
-+    # RHEL-08-040070
-+    - service_autofs_disabled
-+
-+    # RHEL-08-040080
-+    - kernel_module_usb-storage_disabled
-+
-+    # RHEL-08-040090
-+    - configured_firewalld_default_deny
-+    - set_firewalld_default_zone
-+
-+    # RHEL-08-040100
-+    - package_firewalld_installed
-+
-+    # RHEL-08-040101
-+    - service_firewalld_enabled
-+
-+    # RHEL-08-040110
-+    - wireless_disable_interfaces
-+
-+    # RHEL-08-040111
-+    - kernel_module_bluetooth_disabled
-+
-+    # RHEL-08-040120
-+    - mount_option_dev_shm_nodev
-+
-+    # RHEL-08-040121
-+    - mount_option_dev_shm_nosuid
-+
-+    # RHEL-08-040122
-+    - mount_option_dev_shm_noexec
-+
-+    # RHEL-08-040123
-+    - mount_option_tmp_nodev
-+
-+    # RHEL-08-040124
-+    - mount_option_tmp_nosuid
-+
-+    # RHEL-08-040125
-+    - mount_option_tmp_noexec
-+
-+    # RHEL-08-040126
-+    - mount_option_var_log_nodev
-+
-+    # RHEL-08-040127
-+    - mount_option_var_log_nosuid
-+
-+    # RHEL-08-040128
-+    - mount_option_var_log_noexec
-+
-+    # RHEL-08-040129
-+    - mount_option_var_log_audit_nodev
-+
-+    # RHEL-08-040130
-+    - mount_option_var_log_audit_nosuid
-+
-+    # RHEL-08-040131
-+    - mount_option_var_log_audit_noexec
-+
-+    # RHEL-08-040132
-+    - mount_option_var_tmp_nodev
-+
-+    # RHEL-08-040133
-+    - mount_option_var_tmp_nosuid
-+
-+    # RHEL-08-040134
-+    - mount_option_var_tmp_noexec
-+
-+    # RHEL-08-040135
-+    - package_fapolicyd_installed
-+
-+    # RHEL-08-040136
-+    - service_fapolicyd_enabled
-+
-+    # RHEL-08-040137
-+    - fapolicy_default_deny
-+
-+    # RHEL-08-040139
-+    - package_usbguard_installed
-+
-+    # RHEL-08-040140
-+    - usbguard_generate_policy
-+
-+    # RHEL-08-040141
-+    - service_usbguard_enabled
-+
-+    # RHEL-08-040150
-+    - firewalld-backend
-+
-+    # RHEL-08-040159
-+    - package_openssh-server_installed
-+
-+    # RHEL-08-040160
-+    - service_sshd_enabled
-+
-+    # RHEL-08-040161
-+    - sshd_rekey_limit
-+
-+    # RHEL-08-040170
-+    - disable_ctrlaltdel_reboot
-+
-+    # RHEL-08-040171
-+    - dconf_gnome_disable_ctrlaltdel_reboot
-+
-+    # RHEL-08-040172
-+    - disable_ctrlaltdel_burstaction
-+
-+    # RHEL-08-040180
-+    - service_debug-shell_disabled
-+
-+    # RHEL-08-040190
-+    - package_tftp-server_removed
-+
-+    # RHEL-08-040200
-+    - accounts_no_uid_except_zero
-+
-+    # RHEL-08-040209
-+    - sysctl_net_ipv4_conf_default_accept_redirects
-+
-+    # RHEL-08-040210
-+    - sysctl_net_ipv6_conf_default_accept_redirects
-+
-+    # RHEL-08-040220
-+    - sysctl_net_ipv4_conf_all_send_redirects
-+
-+    # RHEL-08-040230
-+    - sysctl_net_ipv4_icmp_echo_ignore_broadcasts
-+
-+    # RHEL-08-040239
-+    - sysctl_net_ipv4_conf_all_accept_source_route
-+
-+    # RHEL-08-040240
-+    - sysctl_net_ipv6_conf_all_accept_source_route
-+
-+    # RHEL-08-040249
-+    - sysctl_net_ipv4_conf_default_accept_source_route
-+
-+    # RHEL-08-040250
-+    - sysctl_net_ipv6_conf_default_accept_source_route
-+
-+    # RHEL-08-040259
-+    - sysctl_net_ipv4_conf_all_forwarding
-+
-+    # RHEL-08-040260
-+    - sysctl_net_ipv6_conf_all_forwarding
-+
-+    # RHEL-08-040261
-+    - sysctl_net_ipv6_conf_all_accept_ra
-+
-+    # RHEL-08-040262
-+    - sysctl_net_ipv6_conf_default_accept_ra
-+
-+    # RHEL-08-040270
-+    - sysctl_net_ipv4_conf_default_send_redirects
-+
-+    # RHEL-08-040279
-+    - sysctl_net_ipv4_conf_all_accept_redirects
-+
-+    # RHEL-08-040280
-+    - sysctl_net_ipv6_conf_all_accept_redirects
-+
-+    # RHEL-08-040281
-+    - sysctl_kernel_unprivileged_bpf_disabled
-+
-+    # RHEL-08-040282
-+    - sysctl_kernel_yama_ptrace_scope
-+
-+    # RHEL-08-040283
-+    - sysctl_kernel_kptr_restrict
-+
-+    # RHEL-08-040284
-+    - sysctl_user_max_user_namespaces_no_remediation
-+
-+    # RHEL-08-040285
-+    - sysctl_net_ipv4_conf_all_rp_filter
-+
-+    # RHEL-08-040286
-+    - sysctl_net_core_bpf_jit_harden
-+
-+    # RHEL-08-040290
-+    - postfix_prevent_unrestricted_relay
-+
-+    # RHEL-08-040300
-+    - aide_verify_ext_attributes
-+
-+    # RHEL-08-040310
-+    - aide_verify_acls
-+
-+    # RHEL-08-040320
-+    - xwindows_remove_packages
-+
-+    # RHEL-08-040321
-+    - xwindows_runlevel_target
-+
-+    # RHEL-08-040330
-+    - network_sniffer_disabled
-+
-+    # RHEL-08-040340
-+    - sshd_disable_x11_forwarding
-+
-+    # RHEL-08-040341
-+    - sshd_x11_use_localhost
-+
-+    # RHEL-08-040342
-+    - sshd_use_approved_kex_ordered_stig
-+
-+    # RHEL-08-040350
-+    - tftp_uses_secure_mode_systemd
-+
-+    # RHEL-08-040360
-+    - package_vsftpd_removed
-+
-+    # RHEL-08-040370
-+    - package_gssproxy_removed
-+
-+    # RHEL-08-040380
-+    - package_iprutils_removed
-+
-+    # RHEL-08-040390
-+    - package_tuned_removed
-+
-+    # RHEL-08-040400
-+    - selinux_user_login_roles
-+
-+    # RHEL-08-010163
-+    - package_krb5-server_removed
++    - stig_rhel8:all
 diff --git a/products/almalinux8/profiles/stig_gui.profile b/products/almalinux8/profiles/stig_gui.profile
 new file mode 100644
-index 000000000..8eb0242fb
+index 000000000..b71f23676
 --- /dev/null
 +++ b/products/almalinux8/profiles/stig_gui.profile
-@@ -0,0 +1,46 @@
+@@ -0,0 +1,47 @@
++---
 +documentation_complete: true
 +
 +metadata:
-+    version: V2R3
++    version: V2R4
 +    SMEs:
 +        - mab879
 +        - ggbecker
 +
-+reference: https://public.cyber.mil/stigs/downloads/?_dl_facet_stigs=operating-systems%2Cunix-linux
++reference: https://www.cyber.mil/stigs/downloads/?_dl_facet_stigs=operating-systems%2Cunix-linux
 +
 +title: 'DISA STIG with GUI for Red Hat Enterprise Linux 8'
 +
 +description: |-
 +    This profile contains configuration checks that align to the
-+    DISA STIG with GUI for Red Hat Enterprise Linux 8 V2R3.
++    DISA STIG with GUI for Red Hat Enterprise Linux 8 V2R4.
 +
 +    In addition to being applicable to Red Hat Enterprise Linux 8, this
 +    configuration baseline is applicable to the operating system tier of
@@ -18309,12 +11606,12 @@ index 000000000..f156a6695
 +
 diff --git a/products/almalinux8/transforms/xccdf2table-profileccirefs.xslt b/products/almalinux8/transforms/xccdf2table-profileccirefs.xslt
 new file mode 100644
-index 000000000..30419e92b
+index 000000000..9d8d3e5fa
 --- /dev/null
 +++ b/products/almalinux8/transforms/xccdf2table-profileccirefs.xslt
 @@ -0,0 +1,9 @@
 +
-+
++
 +
 +
 +
@@ -18363,7 +11660,7 @@ index 000000000..1d94fd870
 +
 +
 diff --git a/shared/checks/oval/sysctl_kernel_ipv6_disable.xml b/shared/checks/oval/sysctl_kernel_ipv6_disable.xml
-index 42b866d3b..8560a7220 100644
+index b718ded26..7f42310de 100644
 --- a/shared/checks/oval/sysctl_kernel_ipv6_disable.xml
 +++ b/shared/checks/oval/sysctl_kernel_ipv6_disable.xml
 @@ -16,6 +16,7 @@
@@ -18373,38 +11670,38 @@ index 42b866d3b..8560a7220 100644
 +multi_platform_almalinux
  	multi_platform_rhv
  	multi_platform_sle
-     multi_platform_slmicro5
-diff --git a/shared/references/disa-stig-almalinux8-v2r2-xccdf-scap.xml b/shared/references/disa-stig-almalinux8-v2r2-xccdf-scap.xml
+     multi_platform_slmicro
+diff --git a/shared/references/disa-stig-almalinux8-v2r4-xccdf-manual.xml b/shared/references/disa-stig-almalinux8-v2r4-xccdf-manual.xml
 new file mode 120000
-index 000000000..b35d1960b
+index 000000000..7b59256b3
 --- /dev/null
-+++ b/shared/references/disa-stig-almalinux8-v2r2-xccdf-scap.xml
++++ b/shared/references/disa-stig-almalinux8-v2r4-xccdf-manual.xml
 @@ -0,0 +1 @@
-+disa-stig-rhel8-v2r2-xccdf-scap.xml
++disa-stig-rhel8-v2r4-xccdf-manual.xml
 \ No newline at end of file
-diff --git a/shared/references/disa-stig-almalinux8-v2r3-xccdf-manual.xml b/shared/references/disa-stig-almalinux8-v2r3-xccdf-manual.xml
+diff --git a/shared/references/disa-stig-almalinux8-v2r4-xccdf-scap.xml b/shared/references/disa-stig-almalinux8-v2r4-xccdf-scap.xml
 new file mode 120000
-index 000000000..d3aae96d6
+index 000000000..20d17c72f
 --- /dev/null
-+++ b/shared/references/disa-stig-almalinux8-v2r3-xccdf-manual.xml
++++ b/shared/references/disa-stig-almalinux8-v2r4-xccdf-scap.xml
 @@ -0,0 +1 @@
-+disa-stig-rhel8-v2r3-xccdf-manual.xml
++disa-stig-rhel8-v2r4-xccdf-scap.xml
 \ No newline at end of file
-diff --git a/shared/references/disa-stig-almalinux9-v2r4-xccdf-manual.xml b/shared/references/disa-stig-almalinux9-v2r4-xccdf-manual.xml
+diff --git a/shared/references/disa-stig-almalinux9-v2r5-xccdf-manual.xml b/shared/references/disa-stig-almalinux9-v2r5-xccdf-manual.xml
 new file mode 120000
-index 000000000..1f8134c9a
+index 000000000..1efa56321
 --- /dev/null
-+++ b/shared/references/disa-stig-almalinux9-v2r4-xccdf-manual.xml
++++ b/shared/references/disa-stig-almalinux9-v2r5-xccdf-manual.xml
 @@ -0,0 +1 @@
-+disa-stig-rhel9-v2r4-xccdf-manual.xml
++disa-stig-rhel9-v2r5-xccdf-manual.xml
 \ No newline at end of file
-diff --git a/shared/references/disa-stig-almalinux9-v2r4-xccdf-scap.xml b/shared/references/disa-stig-almalinux9-v2r4-xccdf-scap.xml
+diff --git a/shared/references/disa-stig-almalinux9-v2r5-xccdf-scap.xml b/shared/references/disa-stig-almalinux9-v2r5-xccdf-scap.xml
 new file mode 120000
-index 000000000..0f5bbc678
+index 000000000..f3602d379
 --- /dev/null
-+++ b/shared/references/disa-stig-almalinux9-v2r4-xccdf-scap.xml
++++ b/shared/references/disa-stig-almalinux9-v2r5-xccdf-scap.xml
 @@ -0,0 +1 @@
-+disa-stig-rhel9-v2r4-xccdf-scap.xml
++disa-stig-rhel9-v2r5-xccdf-scap.xml
 \ No newline at end of file
 diff --git a/shared/references/disa-stig-ol7-v3r1-xccdf-manual.xml b/shared/references/disa-stig-ol7-v3r1-xccdf-manual.xml
 index e83699662..1efabcf62 100644
@@ -18579,2933 +11876,10 @@ index 3e1d42930..ec0e423c3 100644
            ^\s*GRUB2_PASSWORD=(\S+)\b
            1
          
-diff --git a/shared/references/disa-stig-rhel8-v2r2-xccdf-scap.xml b/shared/references/disa-stig-rhel8-v2r2-xccdf-scap.xml
-index bbc44024b..2a616849a 100644
---- a/shared/references/disa-stig-rhel8-v2r2-xccdf-scap.xml
-+++ b/shared/references/disa-stig-rhel8-v2r2-xccdf-scap.xml
-@@ -3134,7 +3134,7 @@ SHA_CRYPT_MIN_ROUNDS 100000
-           
-           
-           CCI-000213
--          Configure the system to require a grub bootloader password for the grub superusers account with the grub2-setpassword command, which creates/overwrites the /boot/efi/EFI/redhat/user.cfg file.
-+          Configure the system to require a grub bootloader password for the grub superusers account with the grub2-setpassword command, which creates/overwrites the /boot/efi/EFI/almalinux/user.cfg file.
- 
- Generate an encrypted grub2 password for the grub superusers account with the following command:
- 
-@@ -12106,8 +12106,8 @@ $ sudo systemctl restart systemd-logind
-             
-           
-           
--            
--            
-+            
-+            
-           
-         
-         
-@@ -14998,7 +14998,8 @@ $ sudo systemctl restart systemd-logind
-           
-             The system is RHEL 8.1 or lower
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             
-           
-@@ -15010,7 +15011,8 @@ $ sudo systemctl restart systemd-logind
-           
-             The system is RHEL 8.2 or higher
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             
-           
-@@ -15059,7 +15061,8 @@ $ sudo systemctl restart systemd-logind
-           
-             The system is RHEL 8.3 or lower
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             
-           
-@@ -15071,7 +15074,8 @@ $ sudo systemctl restart systemd-logind
-           
-             The system is RHEL 8.4 or higher
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             
-           
-@@ -15123,7 +15127,8 @@ $ sudo systemctl restart systemd-logind
-           
-             RHEL-08-010000 - RHEL 8 must be a vendor-supported release.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             An operating system release is considered "supported" if the vendor continues to provide security patches for the product. With an unsupported release, it will not be possible to resolve security issues discovered in the system software.
- 
-@@ -15138,7 +15143,8 @@ Note: The life-cycle time spans and dates are subject to adjustment.
-             RHEL-08-010070 - All RHEL 8 remote access methods must be monitored.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Remote access services, such as those providing remote access to network devices and information systems, which lack automated monitoring capabilities, increase risk and make remote user access management difficult at best.
- 
-@@ -15154,7 +15160,8 @@ Automated monitoring of remote access sessions allows organizations to detect cy
-           
-             RHEL-08-010110 - RHEL 8 must encrypt all stored passwords with a FIPS 140-2 approved cryptographic hashing algorithm.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Passwords need to be protected at all times, and encryption is the standard method for protecting passwords. If passwords are not encrypted, they can be plainly read (i.e., clear text) and easily compromised.
- 
-@@ -15170,7 +15177,8 @@ FIPS 140-2 is the current standard for validating that mechanisms used to access
-           
-             RHEL-08-010120 - RHEL 8 must employ FIPS 140-2 approved cryptographic hashing algorithms for all stored passwords.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The system must use a strong hashing algorithm to store the password.
- 
-@@ -15184,7 +15192,8 @@ Passwords need to be protected at all times, and encryption is the standard meth
-           
-             RHEL-08-010130 - The RHEL 8 shadow password suite must be configured to use a sufficient number of hashing rounds.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The system must use a strong hashing algorithm to store the password. The system must use a sufficient number of hashing rounds to ensure the required level of entropy.
- 
-@@ -15198,7 +15207,8 @@ Passwords need to be protected at all times, and encryption is the standard meth
-           
-             RHEL-08-010140 - RHEL 8 operating systems booted with United Extensible Firmware Interface (UEFI) must require authentication upon booting into single-user mode and maintenance.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If the system does not require valid authentication before it boots into single-user or maintenance mode, anyone who invokes single-user or maintenance mode is granted privileged access to all files on the system. GRUB 2 is the default boot loader for RHEL 8 and is designed to require a password to boot into single-user mode or make modifications to the boot menu.
-           
-@@ -15210,7 +15220,8 @@ Passwords need to be protected at all times, and encryption is the standard meth
-           
-             RHEL-08-010150 - RHEL 8 operating systems booted with a BIOS must require authentication upon booting into single-user and maintenance modes.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If the system does not require valid authentication before it boots into single-user or maintenance mode, anyone who invokes single-user or maintenance mode is granted privileged access to all files on the system. GRUB 2 is the default boot loader for RHEL 8 and is designed to require a password to boot into single-user mode or make modifications to the boot menu.
-           
-@@ -15222,7 +15233,8 @@ Passwords need to be protected at all times, and encryption is the standard meth
-           
-             RHEL-08-010151 - RHEL 8 operating systems must require authentication upon booting into rescue mode.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If the system does not require valid root authentication before it boots into emergency or rescue mode, anyone who invokes emergency or rescue mode is granted privileged access to all files on the system.
-           
-@@ -15234,7 +15246,8 @@ Passwords need to be protected at all times, and encryption is the standard meth
-           
-             RHEL-08-010160 - The RHEL 8 pam_unix.so module must be configured in the password-auth file to use a FIPS 140-2 approved cryptographic hashing algorithm for system authentication.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Unapproved mechanisms that are used for authentication to the cryptographic module are not verified and therefore cannot be relied upon to provide confidentiality or integrity, and DoD data may be compromised.
- 
-@@ -15250,7 +15263,8 @@ FIPS 140-2 is the current standard for validating that mechanisms used to access
-           
-             RHEL-08-010161 - RHEL 8 must prevent system daemons from using Kerberos for authentication.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Unapproved mechanisms that are used for authentication to the cryptographic module are not verified and therefore cannot be relied upon to provide confidentiality or integrity, and DoD data may be compromised.
- 
-@@ -15268,7 +15282,8 @@ FIPS 140-2 is the current standard for validating that mechanisms used to access
-           
-             RHEL-08-010162 - The krb5-workstation package must not be installed on RHEL 8.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Unapproved mechanisms that are used for authentication to the cryptographic module are not verified and therefore cannot be relied upon to provide confidentiality or integrity, and DoD data may be compromised.
- 
-@@ -15286,7 +15301,8 @@ FIPS 140-2 is the current standard for validating that mechanisms used to access
-           
-             RHEL-08-010170 - RHEL 8 must use a Linux Security Module configured to enforce limits on system services.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without verification of the security functions, security functions may not operate correctly and the failure may go unnoticed. Security function is defined as the hardware, software, and/or firmware of the information system responsible for enforcing the system security policy and supporting the isolation of code and data on which the protection is based. Security functionality includes, but is not limited to, establishing system accounts, configuring access authorizations (i.e., permissions, privileges), setting events to be audited, and setting intrusion detection parameters.
- 
-@@ -15300,7 +15316,8 @@ This requirement applies to operating systems performing security function verif
-           
-             RHEL-08-010171 - RHEL 8 must have policycoreutils package installed.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without verification of the security functions, security functions may not operate correctly and the failure may go unnoticed. Security function is defined as the hardware, software, and/or firmware of the information system responsible for enforcing the system security policy and supporting the isolation of code and data on which the protection is based. Security functionality includes, but is not limited to, establishing system accounts, configuring access authorizations (i.e., permissions, privileges), setting events to be audited, and setting intrusion detection parameters.
- 
-@@ -15314,7 +15331,8 @@ Policycoreutils contains the policy core utilities that are required for basic o
-           
-             RHEL-08-010200 - RHEL 8 must be configured so that all network connections associated with SSH traffic are terminated at the end of the session or after 10 minutes of inactivity, except to fulfill documented and validated mission requirements.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Terminating an idle SSH session within a short time period reduces the window of opportunity for unauthorized personnel to take control of a management session enabled on the console or console port that has been left unattended. In addition, quickly terminating an idle SSH session will also free up resources committed by the managed network element.
- 
-@@ -15332,7 +15350,8 @@ Satisfies: SRG-OS-000163-GPOS-00072, SRG-OS-000126-GPOS-00066, SRG-OS-000279-GPO
-           
-             RHEL-08-010210 - The RHEL 8 /var/log/messages file must have mode 0640 or less permissive.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Only authorized personnel should be aware of errors and the details of the errors. Error messages are an indicator of an organization's operational state or can identify the RHEL 8 system or platform. Additionally, Personally Identifiable Information (PII) and operational information must not be revealed through error messages to unauthorized personnel or their designated representatives.
- 
-@@ -15346,7 +15365,8 @@ The structure and content of error messages must be carefully considered by the
-           
-             RHEL-08-010220 - The RHEL 8 /var/log/messages file must be owned by root.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Only authorized personnel should be aware of errors and the details of the errors. Error messages are an indicator of an organization's operational state or can identify the RHEL 8 system or platform. Additionally, Personally Identifiable Information (PII) and operational information must not be revealed through error messages to unauthorized personnel or their designated representatives.
- 
-@@ -15360,7 +15380,8 @@ The structure and content of error messages must be carefully considered by the
-           
-             RHEL-08-010230 - The RHEL 8 /var/log/messages file must be group-owned by root.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Only authorized personnel should be aware of errors and the details of the errors. Error messages are an indicator of an organization's operational state or can identify the RHEL 8 system or platform. Additionally, Personally Identifiable Information (PII) and operational information must not be revealed through error messages to unauthorized personnel or their designated representatives.
- 
-@@ -15374,7 +15395,8 @@ The structure and content of error messages must be carefully considered by the
-           
-             RHEL-08-010240 - The RHEL 8 /var/log directory must have mode 0755 or less permissive.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Only authorized personnel should be aware of errors and the details of the errors. Error messages are an indicator of an organization's operational state or can identify the RHEL 8 system or platform. Additionally, Personally Identifiable Information (PII) and operational information must not be revealed through error messages to unauthorized personnel or their designated representatives.
- 
-@@ -15388,7 +15410,8 @@ The structure and content of error messages must be carefully considered by the
-           
-             RHEL-08-010250 - The RHEL 8 /var/log directory must be owned by root.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Only authorized personnel should be aware of errors and the details of the errors. Error messages are an indicator of an organization's operational state or can identify the RHEL 8 system or platform. Additionally, Personally Identifiable Information (PII) and operational information must not be revealed through error messages to unauthorized personnel or their designated representatives.
- 
-@@ -15402,7 +15425,8 @@ The structure and content of error messages must be carefully considered by the
-           
-             RHEL-08-010260 - The RHEL 8 /var/log directory must be group-owned by root.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Only authorized personnel should be aware of errors and the details of the errors. Error messages are an indicator of an organization's operational state or can identify the RHEL 8 system or platform. Additionally, Personally Identifiable Information (PII) and operational information must not be revealed through error messages to unauthorized personnel or their designated representatives.
- 
-@@ -15416,7 +15440,8 @@ The structure and content of error messages must be carefully considered by the
-           
-             RHEL-08-010292 - RHEL 8 must ensure the SSH server uses strong entropy.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The most important characteristic of a random number generator is its randomness, namely its ability to deliver random numbers that are impossible to predict.  Entropy in computer security is associated with the unpredictability of a source of randomness.  The random source with high entropy tends to achieve a uniform distribution of random values.  Random number generators are one of the most important building blocks of cryptosystems.
- 
-@@ -15430,7 +15455,8 @@ The SSH implementation in RHEL8 uses the OPENSSL library, which does not use hig
-           
-             RHEL-08-010294 - The RHEL 8 operating system must implement DoD-approved TLS encryption in the OpenSSL package.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without cryptographic integrity protections, information can be altered by unauthorized users without detection.
- 
-@@ -15450,7 +15476,8 @@ Satisfies: SRG-OS-000250-GPOS-00093, SRG-OS-000393-GPOS-00173, SRG-OS-000394-GPO
-           
-             RHEL-08-010300 - RHEL 8 system commands must have mode 755 or less permissive.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If RHEL 8 were to allow any user to make changes to software libraries, then those changes might be implemented without undergoing the appropriate testing and approvals that are part of a robust change management process.
- 
-@@ -15464,7 +15491,8 @@ This requirement applies to RHEL 8 with software libraries that are accessible a
-           
-             RHEL-08-010310 - RHEL 8 system commands must be owned by root.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If RHEL 8 were to allow any user to make changes to software libraries, then those changes might be implemented without undergoing the appropriate testing and approvals that are part of a robust change management process.
- 
-@@ -15478,7 +15506,8 @@ This requirement applies to RHEL 8 with software libraries that are accessible a
-           
-             RHEL-08-010320 - RHEL 8 system commands must be group-owned by root or a system account.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If RHEL 8 were to allow any user to make changes to software libraries, then those changes might be implemented without undergoing the appropriate testing and approvals that are part of a robust change management process.
- 
-@@ -15492,7 +15521,8 @@ This requirement applies to RHEL 8 with software libraries that are accessible a
-           
-             RHEL-08-010330 - RHEL 8 library files must have mode 755 or less permissive.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If RHEL 8 were to allow any user to make changes to software libraries, then those changes might be implemented without undergoing the appropriate testing and approvals that are part of a robust change management process.
- 
-@@ -15506,7 +15536,8 @@ This requirement applies to RHEL 8 with software libraries that are accessible a
-           
-             RHEL-08-010340 - RHEL 8 library files must be owned by root.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If RHEL 8 were to allow any user to make changes to software libraries, then those changes might be implemented without undergoing the appropriate testing and approvals that are part of a robust change management process.
- 
-@@ -15520,7 +15551,8 @@ This requirement applies to RHEL 8 with software libraries that are accessible a
-           
-             RHEL-08-010350 - RHEL 8 library files must be group-owned by root or a system account.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If RHEL 8 were to allow any user to make changes to software libraries, then those changes might be implemented without undergoing the appropriate testing and approvals that are part of a robust change management process.
- 
-@@ -15534,7 +15566,8 @@ This requirement applies to RHEL 8 with software libraries that are accessible a
-           
-             RHEL-08-010370 - RHEL 8 must prevent the installation of software, patches, service packs, device drivers, or operating system components from a repository without verification they have been digitally signed using a certificate that is issued by a Certificate Authority (CA) that is recognized and approved by the organization.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Changes to any software components can have significant effects on the overall security of the operating system. This requirement ensures the software has not been tampered with and that it has been provided by a trusted vendor.
- 
-@@ -15550,7 +15583,8 @@ Verifying the authenticity of the software prior to installation validates the i
-           
-             RHEL-08-010371 - RHEL 8 must prevent the installation of software, patches, service packs, device drivers, or operating system components of local packages without verification they have been digitally signed using a certificate that is issued by a Certificate Authority (CA) that is recognized and approved by the organization.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Changes to any software components can have significant effects on the overall security of the operating system. This requirement ensures the software has not been tampered with and that it has been provided by a trusted vendor.
- 
-@@ -15566,7 +15600,8 @@ Verifying the authenticity of the software prior to installation validates the i
-           
-             RHEL-08-010372 - RHEL 8 must prevent the loading of a new kernel for later execution.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Changes to any software components can have significant effects on the overall security of the operating system. This requirement ensures the software has not been tampered with and that it has been provided by a trusted vendor.
- 
-@@ -15588,7 +15623,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-010373 - RHEL 8 must enable kernel parameters to enforce discretionary access control on symlinks.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Discretionary Access Control (DAC) is based on the notion that individual users are "owners" of objects and therefore have discretion over who should be authorized to access the object and in which mode (e.g., read or write). Ownership is usually acquired as a consequence of creating the object or via specified ownership assignment. DAC allows the owner to determine who will have access to objects they control. An example of DAC includes user-controlled file permissions.
- 
-@@ -15614,7 +15650,8 @@ Satisfies: SRG-OS-000312-GPOS-00122, SRG-OS-000312-GPOS-00123, SRG-OS-000312-GPO
-           
-             RHEL-08-010374 - RHEL 8 must enable kernel parameters to enforce discretionary access control on hardlinks.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Discretionary Access Control (DAC) is based on the notion that individual users are "owners" of objects and therefore have discretion over who should be authorized to access the object and in which mode (e.g., read or write). Ownership is usually acquired as a consequence of creating the object or via specified ownership assignment. DAC allows the owner to determine who will have access to objects they control. An example of DAC includes user-controlled file permissions.
- 
-@@ -15640,7 +15677,8 @@ Satisfies: SRG-OS-000312-GPOS-00122, SRG-OS-000312-GPOS-00123, SRG-OS-000312-GPO
-           
-             RHEL-08-010375 - RHEL 8 must restrict access to the kernel message buffer.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Preventing unauthorized information transfers mitigates the risk of information, including encrypted representations of information, produced by the actions of prior users/roles (or the actions of processes acting on behalf of prior users/roles) from being available to any current users/roles (or current processes) that obtain access to shared system resources (e.g., registers, main memory, hard disks) after those resources have been released back to information systems. The control of information in shared resources is also commonly referred to as object reuse and residual information protection.
- 
-@@ -15666,7 +15704,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-010376 - RHEL 8 must prevent kernel profiling by unprivileged users.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Preventing unauthorized information transfers mitigates the risk of information, including encrypted representations of information, produced by the actions of prior users/roles (or the actions of processes acting on behalf of prior users/roles) from being available to any current users/roles (or current processes) that obtain access to shared system resources (e.g., registers, main memory, hard disks) after those resources have been released back to information systems. The control of information in shared resources is also commonly referred to as object reuse and residual information protection.
- 
-@@ -15692,7 +15731,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-010380 - RHEL 8 must require users to provide a password for privilege escalation.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without reauthentication, users may access resources or perform tasks for which they do not have authorization.
- 
-@@ -15708,7 +15748,8 @@ Satisfies: SRG-OS-000373-GPOS-00156, SRG-OS-000373-GPOS-00157, SRG-OS-000373-GPO
-           
-             RHEL-08-010381 - RHEL 8 must require users to reauthenticate for privilege escalation.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without reauthentication, users may access resources or perform tasks for which they do not have authorization.
- 
-@@ -15724,7 +15765,8 @@ Satisfies: SRG-OS-000373-GPOS-00156, SRG-OS-000373-GPOS-00157, SRG-OS-000373-GPO
-           
-             RHEL-08-010390 - RHEL 8 must have the packages required for multifactor authentication installed.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Using an authentication device, such as a DoD Common Access Card (CAC) or token that is separate from the information system, ensures that even if the information system is compromised, credentials stored on the authentication device will not be affected.
- 
-@@ -15744,7 +15786,8 @@ This requirement only applies to components where this is specific to the functi
-           
-             RHEL-08-010430 - RHEL 8 must implement address space layout randomization (ASLR) to protect its memory from unauthorized code execution.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Some adversaries launch attacks with the intent of executing code in non-executable regions of memory or in memory locations that are prohibited. Security safeguards employed to protect memory include, for example, data execution prevention and address space layout randomization. Data execution prevention safeguards can be either hardware-enforced or software-enforced with hardware providing the greater strength of mechanism.
- 
-@@ -15766,7 +15809,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-010440 - YUM must remove all software components after updated versions have been installed on RHEL 8.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Previous versions of software components that are not removed from the information system after updates have been installed may be exploited by adversaries. Some information technology products may remove older versions of software automatically from the information system.
-           
-@@ -15778,7 +15822,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-010450 - RHEL 8 must enable the SELinux targeted policy.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without verification of the security functions, security functions may not operate correctly and the failure may go unnoticed. Security function is defined as the hardware, software, and/or firmware of the information system responsible for enforcing the system security policy and supporting the isolation of code and data on which the protection is based. Security functionality includes, but is not limited to, establishing system accounts, configuring access authorizations (i.e., permissions, privileges), setting events to be audited, and setting intrusion detection parameters.
- 
-@@ -15792,7 +15837,8 @@ This requirement applies to operating systems performing security function verif
-           
-             RHEL-08-010460 - There must be no shosts.equiv files on the RHEL 8 operating system.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The "shosts.equiv" files are used to configure host-based authentication for the system via SSH. Host-based authentication is not sufficient for preventing unauthorized access to the system, as it does not require interactive identification and authentication of a connection request, or for the use of two-factor authentication.
-           
-@@ -15804,7 +15850,8 @@ This requirement applies to operating systems performing security function verif
-           
-             RHEL-08-010470 - There must be no .shosts files on the RHEL 8 operating system.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The ".shosts" files are used to configure host-based authentication for individual users or the system via SSH. Host-based authentication is not sufficient for preventing unauthorized access to the system, as it does not require interactive identification and authentication of a connection request, or for the use of two-factor authentication.
-           
-@@ -15816,7 +15863,8 @@ This requirement applies to operating systems performing security function verif
-           
-             RHEL-08-010480 - The RHEL 8 SSH public host key files must have mode 0644 or less permissive.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If a public host key file is modified by an unauthorized user, the SSH service may be compromised.
-           
-@@ -15828,7 +15876,8 @@ This requirement applies to operating systems performing security function verif
-           
-             RHEL-08-010490 - The RHEL 8 SSH private host key files must have mode 0640 or less permissive.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If an unauthorized user obtains the private SSH host key file, the host could be impersonated.
-           
-@@ -15840,7 +15889,8 @@ This requirement applies to operating systems performing security function verif
-           
-             RHEL-08-010500 - The RHEL 8 SSH daemon must perform strict mode checking of home directory configuration files.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If other users have access to modify user-specific SSH configuration files, they may be able to log on to the system as another user.
-           
-@@ -15852,7 +15902,8 @@ This requirement applies to operating systems performing security function verif
-           
-             RHEL-08-010520 - The RHEL 8 SSH daemon must not allow authentication using known host’s authentication.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Configuring this setting for the SSH daemon provides additional assurance that remote logon via SSH will require a password, even in the event of misconfiguration elsewhere.
-           
-@@ -15864,7 +15915,8 @@ This requirement applies to operating systems performing security function verif
-           
-             RHEL-08-010521 - The RHEL 8 SSH daemon must not allow Kerberos authentication, except to fulfill documented and validated mission requirements.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Configuring these settings for the SSH daemon provides additional assurance that remote logon via SSH will not use unused methods of authentication, even in the event of misconfiguration elsewhere.
-           
-@@ -15876,7 +15928,8 @@ This requirement applies to operating systems performing security function verif
-           
-             RHEL-08-010540 - RHEL 8 must use a separate file system for /var.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The use of separate file systems for different paths can protect the system from failures resulting from a file system becoming full or failing.
-           
-@@ -15888,7 +15941,8 @@ This requirement applies to operating systems performing security function verif
-           
-             RHEL-08-010541 - RHEL 8 must use a separate file system for /var/log.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The use of separate file systems for different paths can protect the system from failures resulting from a file system becoming full or failing.
-           
-@@ -15900,7 +15954,8 @@ This requirement applies to operating systems performing security function verif
-           
-             RHEL-08-010542 - RHEL 8 must use a separate file system for the system audit data path.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The use of separate file systems for different paths can protect the system from failures resulting from a file system becoming full or failing.
-           
-@@ -15912,7 +15967,8 @@ This requirement applies to operating systems performing security function verif
-           
-             RHEL-08-010543 - A separate RHEL 8 filesystem must be used for the /tmp directory.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The use of separate file systems for different paths can protect the system from failures resulting from a file system becoming full or failing.
-           
-@@ -15924,7 +15980,8 @@ This requirement applies to operating systems performing security function verif
-           
-             RHEL-08-010550 - RHEL 8 must not permit direct logons to the root account using remote access via SSH.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Even though the communications channel may be encrypted, an additional layer of security is gained by extending the policy of not logging on directly as root. In addition, logging on with a user-specific account provides individual accountability of actions performed on the system.
-           
-@@ -15936,7 +15993,8 @@ This requirement applies to operating systems performing security function verif
-           
-             RHEL-08-010561 - The rsyslog service must be running in RHEL 8.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Configuring RHEL 8 to implement organization-wide security implementation guides and security checklists ensures compliance with federal standards and establishes a common security baseline across the DoD that reflects the most restrictive security posture consistent with operational requirements.
- 
-@@ -15950,7 +16008,8 @@ Configuration settings are the set of parameters that can be changed in hardware
-           
-             RHEL-08-010570 - RHEL 8 must prevent files with the setuid and setgid bit set from being executed on file systems that contain user home directories.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The "nosuid" mount option causes the system not to execute "setuid" and "setgid" files with owner privileges. This option must be used for mounting any file system not containing approved "setuid" and "setguid" files. Executing files from untrusted file systems increases the opportunity for unprivileged users to attain unauthorized administrative access.
-           
-@@ -15962,7 +16021,8 @@ Configuration settings are the set of parameters that can be changed in hardware
-           
-             RHEL-08-010571 - RHEL 8 must prevent files with the setuid and setgid bit set from being executed on the /boot directory.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The "nosuid" mount option causes the system not to execute "setuid" and "setgid" files with owner privileges. This option must be used for mounting any file system not containing approved "setuid" and "setguid" files. Executing files from untrusted file systems increases the opportunity for unprivileged users to attain unauthorized administrative access.
-           
-@@ -15974,7 +16034,8 @@ Configuration settings are the set of parameters that can be changed in hardware
-           
-             RHEL-08-010580 - RHEL 8 must prevent special devices on non-root local partitions.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The "nodev" mount option causes the system to not interpret character or block special devices. Executing character or block special devices from untrusted file systems increases the opportunity for unprivileged users to attain unauthorized administrative access.  The only legitimate location for device files is the /dev directory located on the root partition.
-           
-@@ -15986,7 +16047,8 @@ Configuration settings are the set of parameters that can be changed in hardware
-           
-             RHEL-08-010630 - RHEL 8 must prevent code from being executed on file systems that are imported via Network File System (NFS).
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The "noexec" mount option causes the system not to execute binary files. This option must be used for mounting any file system not containing approved binary as they may be incompatible. Executing files from untrusted file systems increases the opportunity for unprivileged users to attain unauthorized administrative access.
-           
-@@ -15998,7 +16060,8 @@ Configuration settings are the set of parameters that can be changed in hardware
-           
-             RHEL-08-010640 - RHEL 8 must prevent special devices on file systems that are imported via Network File System (NFS).
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The "nodev" mount option causes the system to not interpret character or block special devices. Executing character or block special devices from untrusted file systems increases the opportunity for unprivileged users to attain unauthorized administrative access.
-           
-@@ -16010,7 +16073,8 @@ Configuration settings are the set of parameters that can be changed in hardware
-           
-             RHEL-08-010650 - RHEL 8 must prevent files with the setuid and setgid bit set from being executed on file systems that are imported via Network File System (NFS).
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The "nosuid" mount option causes the system not to execute "setuid" and "setgid" files with owner privileges. This option must be used for mounting any file system not containing approved "setuid" and "setguid" files. Executing files from untrusted file systems increases the opportunity for unprivileged users to attain unauthorized administrative access.
-           
-@@ -16022,7 +16086,8 @@ Configuration settings are the set of parameters that can be changed in hardware
-           
-             RHEL-08-010671 - RHEL 8 must disable the kernel.core_pattern.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -16042,7 +16107,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-010672 - RHEL 8 must disable acquiring, saving, and processing core dumps.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -16058,7 +16124,8 @@ When the kernel invokes systemd-coredumpt to handle a core dump, it runs in priv
-           
-             RHEL-08-010673 - RHEL 8 must disable core dumps for all users.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -16072,7 +16139,8 @@ A core dump includes a memory image taken at the time the operating system termi
-           
-             RHEL-08-010674 - RHEL 8 must disable storing core dumps.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -16086,7 +16154,8 @@ A core dump includes a memory image taken at the time the operating system termi
-           
-             RHEL-08-010675 - RHEL 8 must disable core dump backtraces.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -16100,7 +16169,8 @@ A core dump includes a memory image taken at the time the operating system termi
-           
-             RHEL-08-010680 - For RHEL 8 systems using Domain Name Servers (DNS) resolution, at least two name servers must be configured.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             To provide availability for name resolution services, multiple redundant name servers are mandated. A failure in name resolution could lead to the failure of security functions requiring name resolution, which may include time synchronization, centralized authentication, and remote system logging.
-           
-@@ -16112,7 +16182,8 @@ A core dump includes a memory image taken at the time the operating system termi
-           
-             RHEL-08-010720 - All RHEL 8 local interactive users must have a home directory assigned in the /etc/passwd file.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If local interactive users are not assigned a valid home directory, there is no place for the storage and control of files they should own.
-           
-@@ -16124,7 +16195,8 @@ A core dump includes a memory image taken at the time the operating system termi
-           
-             RHEL-08-010730 - All RHEL 8 local interactive user home directories must have mode 0750 or less permissive.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Excessive permissions on local interactive user home directories may allow unauthorized access to user files by other users.
-           
-@@ -16136,7 +16208,8 @@ A core dump includes a memory image taken at the time the operating system termi
-           
-             RHEL-08-010760 - All RHEL 8 local interactive user accounts must be assigned a home directory upon creation.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If local interactive users are not assigned a valid home directory, there is no place for the storage and control of files they should own.
-           
-@@ -16148,7 +16221,8 @@ A core dump includes a memory image taken at the time the operating system termi
-           
-             RHEL-08-010770 - All RHEL 8 local initialization files must have mode 0740 or less permissive.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Local initialization files are used to configure the user's shell environment upon logon. Malicious modification of these files could compromise accounts upon logon.
-           
-@@ -16160,7 +16234,8 @@ A core dump includes a memory image taken at the time the operating system termi
-           
-             RHEL-08-010800 - A separate RHEL 8 filesystem must be used for user home directories (such as /home or an equivalent).
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The use of separate file systems for different paths can protect the system from failures resulting from a file system becoming full or failing.
-           
-@@ -16172,7 +16247,8 @@ A core dump includes a memory image taken at the time the operating system termi
-           
-             RHEL-08-010820 - Unattended or automatic logon via the RHEL 8 graphical user interface must not be allowed.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Failure to restrict system access to authenticated users negatively impacts operating system security.
-           
-@@ -16184,7 +16260,8 @@ A core dump includes a memory image taken at the time the operating system termi
-           
-             RHEL-08-010830 - RHEL 8 must not allow users to override SSH environment variables.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             SSH environment options potentially allow users to bypass access restriction in some configurations.
-           
-@@ -16196,7 +16273,8 @@ A core dump includes a memory image taken at the time the operating system termi
-           
-             RHEL-08-020010 - RHEL 8 must automatically lock an account when three unsuccessful logon attempts occur.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
- 
-@@ -16214,7 +16292,8 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
-           
-             RHEL-08-020011 - RHEL 8 must automatically lock an account when three unsuccessful logon attempts occur.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
- 
-@@ -16232,7 +16311,8 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
-           
-             RHEL-08-020012 - RHEL 8 must automatically lock an account when three unsuccessful logon attempts occur during a 15-minute time period.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
- 
-@@ -16250,7 +16330,8 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
-           
-             RHEL-08-020013 - RHEL 8 must automatically lock an account when three unsuccessful logon attempts occur during a 15-minute time period.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
- 
-@@ -16268,7 +16349,8 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
-           
-             RHEL-08-020014 - RHEL 8 must automatically lock an account until the locked account is released by an administrator when three unsuccessful logon attempts occur during a 15-minute time period.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
- 
-@@ -16286,7 +16368,8 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
-           
-             RHEL-08-020015 - RHEL 8 must automatically lock an account until the locked account is released by an administrator when three unsuccessful logon attempts occur during a 15-minute time period.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
- 
-@@ -16304,7 +16387,8 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
-           
-             RHEL-08-020018 - RHEL 8 must prevent system messages from being presented when three unsuccessful logon attempts occur.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
- 
-@@ -16322,7 +16406,8 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
-           
-             RHEL-08-020019 - RHEL 8 must prevent system messages from being presented when three unsuccessful logon attempts occur.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
- 
-@@ -16340,7 +16425,8 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
-           
-             RHEL-08-020020 - RHEL 8 must log user name information when unsuccessful logon attempts occur.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
- 
-@@ -16360,7 +16446,8 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
-           
-             RHEL-08-020021 - RHEL 8 must log user name information when unsuccessful logon attempts occur.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
- 
-@@ -16378,7 +16465,8 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
-           
-             RHEL-08-020022 - RHEL 8 must include root when automatically locking an account until the locked account is released by an administrator when three unsuccessful logon attempts occur during a 15-minute time period.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
- 
-@@ -16398,7 +16486,8 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
-           
-             RHEL-08-020023 - RHEL 8 must include root when automatically locking an account until the locked account is released by an administrator when three unsuccessful logon attempts occur during a 15-minute time period.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
- 
-@@ -16416,7 +16505,8 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
-           
-             RHEL-08-020024 - RHEL 8 must limit the number of concurrent sessions to ten for all accounts and/or account types.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Operating system management includes the ability to control the number of users and user sessions that utilize an operating system. Limiting the number of allowed users and sessions per user is helpful in reducing the risks related to DoS attacks.
- 
-@@ -16430,7 +16520,8 @@ This requirement addresses concurrent sessions for information system accounts a
-           
-             RHEL-08-020030 - RHEL 8 must enable a user session lock until that user re-establishes access using established identification and authentication procedures for graphical user sessions.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             A session lock is a temporary action taken when a user stops work and moves away from the immediate physical vicinity of the information system but does not want to log out because of the temporary nature of the absence.
- 
-@@ -16448,7 +16539,8 @@ Satisfies: SRG-OS-000028-GPOS-00009, SRG-OS-000030-GPOS-00011
-           
-             RHEL-08-020050 - RHEL 8 must be able to initiate directly a session lock for all connection types using smartcard when the smartcard is removed.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             A session lock is a temporary action taken when a user stops work and moves away from the immediate physical vicinity of the information system but does not want to log out because of the temporary nature of the absence.
- 
-@@ -16464,7 +16556,8 @@ Satisfies: SRG-OS-000028-GPOS-00009, SRG-OS-000030-GPOS-00011
-           
-             RHEL-08-020080 - RHEL 8 must prevent a user from overriding the session lock-delay setting for the graphical user interface.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             A session time-out lock is a temporary action taken when a user stops work and moves away from the immediate physical vicinity of the information system but does not log out because of the temporary nature of the absence. Rather than relying on the user to manually lock their operating system session prior to vacating the vicinity, operating systems need to be able to identify when a user's session has idled and take action to initiate the session lock.
- 
-@@ -16484,7 +16577,8 @@ Satisfies: SRG-OS-000029-GPOS-00010, SRG-OS-000031-GPOS-00012, SRG-OS-000480-GPO
-           
-             RHEL-08-020100 - RHEL 8 must ensure the password complexity module is enabled in the password-auth file.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Use of a complex password helps to increase the time and resources required to compromise the password. Password complexity, or strength, is a measure of the effectiveness of a password in resisting attempts at guessing and brute-force attacks. "pwquality" enforces complex password construction configuration and has the ability to limit brute-force attacks on the system.
- 
-@@ -16500,7 +16594,8 @@ RHEL 8 utilizes "pwquality" as a mechanism to enforce password complexity. This
-           
-             RHEL-08-020110 - RHEL 8 must enforce password complexity by requiring that at least one uppercase character be used.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Use of a complex password helps to increase the time and resources required to compromise the password. Password complexity, or strength, is a measure of the effectiveness of a password in resisting attempts at guessing and brute-force attacks.
- 
-@@ -16516,7 +16611,8 @@ RHEL 8 utilizes pwquality as a mechanism to enforce password complexity. Note th
-           
-             RHEL-08-020120 - RHEL 8 must enforce password complexity by requiring that at least one lower-case character be used.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Use of a complex password helps to increase the time and resources required to compromise the password. Password complexity, or strength, is a measure of the effectiveness of a password in resisting attempts at guessing and brute-force attacks.
- 
-@@ -16532,7 +16628,8 @@ RHEL 8 utilizes pwquality as a mechanism to enforce password complexity. Note th
-           
-             RHEL-08-020130 - RHEL 8 must enforce password complexity by requiring that at least one numeric character be used.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Use of a complex password helps to increase the time and resources required to compromise the password. Password complexity, or strength, is a measure of the effectiveness of a password in resisting attempts at guessing and brute-force attacks.
- 
-@@ -16548,7 +16645,8 @@ RHEL 8 utilizes "pwquality" as a mechanism to enforce password complexity. Note
-           
-             RHEL-08-020140 - RHEL 8 must require the maximum number of repeating characters of the same character class be limited to four when passwords are changed.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Use of a complex password helps to increase the time and resources required to compromise the password. Password complexity, or strength, is a measure of the effectiveness of a password in resisting attempts at guessing and brute-force attacks.
- 
-@@ -16564,7 +16662,8 @@ RHEL 8 utilizes "pwquality" as a mechanism to enforce password complexity. The "
-           
-             RHEL-08-020150 - RHEL 8 must require the maximum number of repeating characters be limited to three when passwords are changed.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Use of a complex password helps to increase the time and resources required to compromise the password. Password complexity, or strength, is a measure of the effectiveness of a password in resisting attempts at guessing and brute-force attacks.
- 
-@@ -16580,7 +16679,8 @@ RHEL 8 utilizes "pwquality" as a mechanism to enforce password complexity. The "
-           
-             RHEL-08-020160 - RHEL 8 must require the change of at least four character classes when passwords are changed.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Use of a complex password helps to increase the time and resources required to compromise the password. Password complexity, or strength, is a measure of the effectiveness of a password in resisting attempts at guessing and brute-force attacks.
- 
-@@ -16596,7 +16696,8 @@ RHEL 8 utilizes "pwquality" as a mechanism to enforce password complexity. The "
-           
-             RHEL-08-020170 - RHEL 8 must require the change of at least 8 characters when passwords are changed.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Use of a complex password helps to increase the time and resources required to compromise the password. Password complexity, or strength, is a measure of the effectiveness of a password in resisting attempts at guessing and brute-force attacks.
- 
-@@ -16612,7 +16713,8 @@ RHEL 8 utilizes "pwquality" as a mechanism to enforce password complexity. The "
-           
-             RHEL-08-020180 - RHEL 8 passwords must have a 24 hours/1 day minimum password lifetime restriction in /etc/shadow.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Enforcing a minimum password lifetime helps to prevent repeated password changes to defeat the password reuse or history enforcement requirement. If users are allowed to immediately and continually change their password, the password could be repeatedly changed in a short period of time to defeat the organization's policy regarding password reuse.
-           
-@@ -16624,7 +16726,8 @@ RHEL 8 utilizes "pwquality" as a mechanism to enforce password complexity. The "
-           
-             RHEL-08-020190 - RHEL 8 passwords for new users or password changes must have a 24 hours/1 day minimum password lifetime restriction in /etc/login.defs.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Enforcing a minimum password lifetime helps to prevent repeated password changes to defeat the password reuse or history enforcement requirement. If users are allowed to immediately and continually change their password, the password could be repeatedly changed in a short period of time to defeat the organization's policy regarding password reuse.
-           
-@@ -16636,7 +16739,8 @@ RHEL 8 utilizes "pwquality" as a mechanism to enforce password complexity. The "
-           
-             RHEL-08-020200 - RHEL 8 user account passwords must have a 60-day maximum password lifetime restriction.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Any password, no matter how complex, can eventually be cracked. Therefore, passwords need to be changed periodically. If RHEL 8 does not limit the lifetime of passwords and force users to change their passwords, there is the risk that RHEL 8 passwords could be compromised.
-           
-@@ -16648,7 +16752,8 @@ RHEL 8 utilizes "pwquality" as a mechanism to enforce password complexity. The "
-           
-             RHEL-08-020210 - RHEL 8 user account passwords must be configured so that existing passwords are restricted to a 60-day maximum lifetime.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Any password, no matter how complex, can eventually be cracked. Therefore, passwords need to be changed periodically. If RHEL 8 does not limit the lifetime of passwords and force users to change their passwords, there is the risk that RHEL 8 passwords could be compromised.
-           
-@@ -16660,7 +16765,8 @@ RHEL 8 utilizes "pwquality" as a mechanism to enforce password complexity. The "
-           
-             RHEL-08-020230 - RHEL 8 passwords must have a minimum of 15 characters.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The shorter the password, the lower the number of possible combinations that need to be tested before the password is compromised.
- 
-@@ -16680,7 +16786,8 @@ The DoD minimum password requirement is 15 characters.
-           
-             RHEL-08-020231 - RHEL 8 passwords for new users must have a minimum of 15 characters.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The shorter the password, the lower the number of possible combinations that need to be tested before the password is compromised.
- 
-@@ -16696,7 +16803,8 @@ The DoD minimum password requirement is 15 characters.
-           
-             RHEL-08-020240 - RHEL 8 duplicate User IDs (UIDs) must not exist for interactive users.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             To ensure accountability and prevent unauthenticated access, interactive users must be identified and authenticated to prevent potential misuse and compromise of the system.
- 
-@@ -16716,7 +16824,8 @@ Satisfies: SRG-OS-000104-GPOS-00051, SRG-OS-000121-GPOS-00062, SRG-OS-000042-GPO
-           
-             RHEL-08-020260 - RHEL 8 account identifiers (individuals, groups, roles, and devices) must be disabled after 35 days of inactivity.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Inactive identifiers pose a risk to systems and applications because attackers may exploit an inactive identifier and potentially obtain undetected access to the system. Owners of inactive accounts will not notice if unauthorized access to their user account has been obtained.
- 
-@@ -16730,7 +16839,8 @@ RHEL 8 needs to track periods of inactivity and disable application identifiers
-           
-             RHEL-08-020280 - All RHEL 8 passwords must contain at least one special character.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Use of a complex password helps to increase the time and resources required to compromise the password. Password complexity, or strength, is a measure of the effectiveness of a password in resisting attempts at guessing and brute-force attacks.
- 
-@@ -16746,7 +16856,8 @@ RHEL 8 utilizes "pwquality" as a mechanism to enforce password complexity. Note
-           
-             RHEL-08-020290 - RHEL 8 must prohibit the use of cached authentications after one day.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If cached authentication information is out-of-date, the validity of the authentication information may be questionable.
- 
-@@ -16760,7 +16871,8 @@ RHEL 8 includes multiple options for configuring authentication, but this requir
-           
-             RHEL-08-020300 - RHEL 8 must prevent the use of dictionary words for passwords.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If RHEL 8 allows the user to select passwords based on dictionary words, this increases the chances of password compromise by increasing the opportunity for successful guesses, and brute-force attacks.
-           
-@@ -16772,7 +16884,8 @@ RHEL 8 includes multiple options for configuring authentication, but this requir
-           
-             RHEL-08-020310 - RHEL 8 must enforce a delay of at least four seconds between logon prompts following a failed logon attempt.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Configuring the operating system to implement organization-wide security implementation guides and security checklists verifies compliance with federal standards and establishes a common security baseline across the DoD that reflects the most restrictive security posture consistent with operational requirements.
- 
-@@ -16786,7 +16899,8 @@ Configuration settings are the set of parameters that can be changed in hardware
-           
-             RHEL-08-020330 - RHEL 8 must not allow accounts configured with blank or null passwords.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If an account has an empty password, anyone could log on and run commands with the privileges of that account. Accounts with empty passwords should never be used in operational environments.
-           
-@@ -16798,7 +16912,8 @@ Configuration settings are the set of parameters that can be changed in hardware
-           
-             RHEL-08-020340 - RHEL 8 must display the date and time of the last successful account logon upon logon.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Providing users with feedback on when account accesses last occurred facilitates user recognition and reporting of unauthorized account use.
-           
-@@ -16810,7 +16925,8 @@ Configuration settings are the set of parameters that can be changed in hardware
-           
-             RHEL-08-020350 - RHEL 8 must display the date and time of the last successful account logon upon an SSH logon.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Providing users with feedback on when account accesses via SSH last occurred facilitates user recognition and reporting of unauthorized account use.
-           
-@@ -16822,7 +16938,8 @@ Configuration settings are the set of parameters that can be changed in hardware
-           
-             RHEL-08-020351 - RHEL 8 must define default permissions for all authenticated users in such a way that the user can only read and modify their own files.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Setting the most restrictive default permissions ensures that when new accounts are created, they do not have unnecessary access.
-           
-@@ -16834,7 +16951,8 @@ Configuration settings are the set of parameters that can be changed in hardware
-           
-             RHEL-08-030000 - The RHEL 8 audit system must be configured to audit the execution of privileged functions and prevent all software from executing at higher privilege levels than users executing the software.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Misuse of privileged functions, either intentionally or unintentionally by authorized users, or by unauthorized external entities that have compromised information system accounts, is a serious and ongoing concern and can have significant adverse impacts on organizations. Auditing the use of privileged functions is one way to detect such misuse and identify the risk from insider threats and the advanced persistent threat.
- 
-@@ -16848,7 +16966,8 @@ Satisfies: SRG-OS-000326-GPOS-00126, SRG-OS-000327-GPOS-00127
-           
-             RHEL-08-030020 - The RHEL 8 System Administrator (SA) and Information System Security Officer (ISSO) (at a minimum) must be alerted of an audit processing failure event.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is critical for the appropriate personnel to be aware if a system is at risk of failing to process audit logs as required. Without this notification, the security personnel may be unaware of an impending failure of the audit capability, and system operation may be adversely affected.
- 
-@@ -16864,7 +16983,8 @@ This requirement applies to each audit data storage repository (i.e., distinct i
-           
-             RHEL-08-030030 - The RHEL 8 Information System Security Officer (ISSO) and System Administrator (SA) (at a minimum) must have mail aliases to be notified of an audit processing failure.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is critical for the appropriate personnel to be aware if a system is at risk of failing to process audit logs as required. Without this notification, the security personnel may be unaware of an impending failure of the audit capability, and system operation may be adversely affected.
- 
-@@ -16880,7 +17000,8 @@ This requirement applies to each audit data storage repository (i.e., distinct i
-           
-             RHEL-08-030040 - The RHEL 8 System must take appropriate action when an audit processing failure occurs.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is critical for the appropriate personnel to be aware if a system is at risk of failing to process audit logs as required. Without this notification, the security personnel may be unaware of an impending failure of the audit capability, and system operation may be adversely affected.
- 
-@@ -16896,7 +17017,8 @@ This requirement applies to each audit data storage repository (i.e., distinct i
-           
-             RHEL-08-030060 - The RHEL 8 audit system must take appropriate action when the audit storage volume is full.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is critical that when RHEL 8 is at risk of failing to process audit logs as required, it takes action to mitigate the failure. Audit processing failures include software/hardware errors; failures in the audit capturing mechanisms; and audit storage capacity being reached or exceeded. Responses to audit failure depend upon the nature of the failure mode.
- 
-@@ -16914,7 +17036,8 @@ When availability is an overriding concern, other approved actions in response t
-           
-             RHEL-08-030061 - The RHEL 8 audit system must audit local events.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without establishing what type of events occurred, the source of events, where events occurred, and the outcome of events, it would be difficult to establish, correlate, and investigate the events leading up to an outage or attack.
- 
-@@ -16928,7 +17051,8 @@ Audit record content that may be necessary to satisfy this requirement includes,
-           
-             RHEL-08-030062 - RHEL 8 must label all off-loaded audit logs before sending them to the central log server.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without establishing what type of events occurred, the source of events, where events occurred, and the outcome of events, it would be difficult to establish, correlate, and investigate the events leading up to an outage or attack.
- 
-@@ -16946,7 +17070,8 @@ When audit logs are not labeled before they are sent to a central log server, th
-           
-             RHEL-08-030063 - RHEL 8 must resolve audit information before writing to disk.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without establishing what type of events occurred, the source of events, where events occurred, and the outcome of events, it would be difficult to establish, correlate, and investigate the events leading up to an outage or attack.
- 
-@@ -16962,7 +17087,8 @@ Enriched logging aids in making sense of who, what, and when events occur on a s
-           
-             RHEL-08-030070 - RHEL 8 audit logs must have a mode of 0600 or less permissive to prevent unauthorized read access.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Only authorized personnel should be aware of errors and the details of the errors. Error messages are an indicator of an organization's operational state or can identify the RHEL 8 system or platform. Additionally, Personally Identifiable Information (PII) and operational information must not be revealed through error messages to unauthorized personnel or their designated representatives.
- 
-@@ -16978,7 +17104,8 @@ Satisfies: SRG-OS-000057-GPOS-00027, SRG-OS-000058-GPOS-00028, SRG-OS-000059-GPO
-           
-             RHEL-08-030080 - RHEL 8 audit logs must be owned by root to prevent unauthorized read access.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Only authorized personnel should be aware of errors and the details of the errors. Error messages are an indicator of an organization's operational state or can identify the RHEL 8 system or platform. Additionally, Personally Identifiable Information (PII) and operational information must not be revealed through error messages to unauthorized personnel or their designated representatives.
- 
-@@ -16994,7 +17121,8 @@ Satisfies: SRG-OS-000057-GPOS-00027, SRG-OS-000058-GPOS-00028, SRG-OS-000059-GPO
-           
-             RHEL-08-030090 - RHEL 8 audit logs must be group-owned by root to prevent unauthorized read access.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Unauthorized disclosure of audit records can reveal system and configuration data to attackers, thus compromising its confidentiality.
- 
-@@ -17010,7 +17138,8 @@ Satisfies: SRG-OS-000057-GPOS-00027, SRG-OS-000058-GPOS-00028, SRG-OS-000059-GPO
-           
-             RHEL-08-030100 - RHEL 8 audit log directory must be owned by root to prevent unauthorized read access.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Unauthorized disclosure of audit records can reveal system and configuration data to attackers, thus compromising its confidentiality.
- 
-@@ -17026,7 +17155,8 @@ Satisfies: SRG-OS-000057-GPOS-00027, SRG-OS-000058-GPOS-00028, SRG-OS-000059-GPO
-           
-             RHEL-08-030110 - RHEL 8 audit log directory must be group-owned by root to prevent unauthorized read access.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Unauthorized disclosure of audit records can reveal system and configuration data to attackers, thus compromising its confidentiality.
- 
-@@ -17042,7 +17172,8 @@ Satisfies: SRG-OS-000057-GPOS-00027, SRG-OS-000058-GPOS-00028, SRG-OS-000059-GPO
-           
-             RHEL-08-030120 - RHEL 8 audit log directory must have a mode of 0700 or less permissive to prevent unauthorized read access.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Unauthorized disclosure of audit records can reveal system and configuration data to attackers, thus compromising its confidentiality.
- 
-@@ -17058,7 +17189,8 @@ Satisfies: SRG-OS-000057-GPOS-00027, SRG-OS-000058-GPOS-00028, SRG-OS-000059-GPO
-           
-             RHEL-08-030121 - RHEL 8 audit system must protect auditing rules from unauthorized change.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Unauthorized disclosure of audit records can reveal system and configuration data to attackers, thus compromising its confidentiality.
- 
-@@ -17076,7 +17208,8 @@ Satisfies: SRG-OS-000057-GPOS-00027, SRG-OS-000058-GPOS-00028, SRG-OS-000059-GPO
-           
-             RHEL-08-030122 - RHEL 8 audit system must protect logon UIDs from unauthorized change.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Unauthorized disclosure of audit records can reveal system and configuration data to attackers, thus compromising its confidentiality.
- 
-@@ -17094,7 +17227,8 @@ Satisfies: SRG-OS-000057-GPOS-00027, SRG-OS-000058-GPOS-00028, SRG-OS-000059-GPO
-           
-             RHEL-08-030130 - RHEL 8 must generate audit records for all account creations, modifications, disabling, and termination events that affect /etc/shadow.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17110,7 +17244,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000004-GPOS-00004, SRG-OS-000037-GPO
-           
-             RHEL-08-030140 - RHEL 8 must generate audit records for all account creations, modifications, disabling, and termination events that affect /etc/security/opasswd.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17126,7 +17261,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000004-GPOS-00004, SRG-OS-000037-GPO
-           
-             RHEL-08-030150 - RHEL 8 must generate audit records for all account creations, modifications, disabling, and termination events that affect /etc/passwd.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17142,7 +17278,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000004-GPOS-00004, SRG-OS-000037-GPO
-           
-             RHEL-08-030160 - RHEL 8 must generate audit records for all account creations, modifications, disabling, and termination events that affect /etc/gshadow.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17158,7 +17295,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000004-GPOS-00004, SRG-OS-000037-GPO
-           
-             RHEL-08-030170 - RHEL 8 must generate audit records for all account creations, modifications, disabling, and termination events that affect /etc/group.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17174,7 +17312,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000004-GPOS-00004, SRG-OS-000037-GPO
-           
-             RHEL-08-030171 - RHEL 8 must generate audit records for all account creations, modifications, disabling, and termination events that affect /etc/sudoers.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17190,7 +17329,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000004-GPOS-00004, SRG-OS-000037-GPO
-           
-             RHEL-08-030172 - RHEL 8 must generate audit records for all account creations, modifications, disabling, and termination events that affect /etc/sudoers.d/.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17206,7 +17346,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000004-GPOS-00004, SRG-OS-000037-GPO
-           
-             RHEL-08-030180 - The RHEL 8 audit package must be installed.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without establishing what type of events occurred, the source of events, where events occurred, and the outcome of events, it would be difficult to establish, correlate, and investigate the events leading up to an outage or attack.
- 
-@@ -17224,7 +17365,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000038-GPO
-           
-             RHEL-08-030190 - Successful/unsuccessful uses of the su command in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17242,7 +17384,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030200 - The RHEL 8 audit system must be configured to audit any usage of the setxattr, fsetxattr, lsetxattr, removexattr, fremovexattr, and lremovexattr system calls.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17269,7 +17412,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030250 - Successful/unsuccessful uses of the chage command in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17287,7 +17431,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030260 - Successful/unsuccessful uses of the chcon command in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17305,7 +17450,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030280 - Successful/unsuccessful uses of the ssh-agent in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17323,7 +17469,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030290 - Successful/unsuccessful uses of the passwd command in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17341,7 +17488,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030300 - Successful/unsuccessful uses of the mount command in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17359,7 +17507,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030301 - Successful/unsuccessful uses of the umount command in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17377,7 +17526,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030302 - Successful/unsuccessful uses of the mount syscall in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17395,7 +17545,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030310 - Successful/unsuccessful uses of the unix_update in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Reconstruction of harmful events or forensic analysis is not possible if audit records do not contain enough information.
- 
-@@ -17413,7 +17564,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030311 - Successful/unsuccessful uses of postdrop in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Reconstruction of harmful events or forensic analysis is not possible if audit records do not contain enough information.
- 
-@@ -17431,7 +17583,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030312 - Successful/unsuccessful uses of postqueue in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Reconstruction of harmful events or forensic analysis is not possible if audit records do not contain enough information.
- 
-@@ -17449,7 +17602,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030313 - Successful/unsuccessful uses of semanage in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Reconstruction of harmful events or forensic analysis is not possible if audit records do not contain enough information.
- 
-@@ -17467,7 +17621,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030314 - Successful/unsuccessful uses of setfiles in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Reconstruction of harmful events or forensic analysis is not possible if audit records do not contain enough information.
- 
-@@ -17485,7 +17640,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030315 - Successful/unsuccessful uses of userhelper in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Reconstruction of harmful events or forensic analysis is not possible if audit records do not contain enough information.
- 
-@@ -17503,7 +17659,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030316 - Successful/unsuccessful uses of setsebool in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Reconstruction of harmful events or forensic analysis is not possible if audit records do not contain enough information.
- 
-@@ -17521,7 +17678,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030317 - Successful/unsuccessful uses of unix_chkpwd in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Reconstruction of harmful events or forensic analysis is not possible if audit records do not contain enough information.
- 
-@@ -17539,7 +17697,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030320 - Successful/unsuccessful uses of the ssh-keysign in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17557,7 +17716,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030330 - Successful/unsuccessful uses of the setfacl command in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17575,7 +17735,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030340 - Successful/unsuccessful uses of the pam_timestamp_check command in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17593,7 +17754,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030350 - Successful/unsuccessful uses of the newgrp command in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17611,7 +17773,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030360 - Successful/unsuccessful uses of the init_module and finit_module system calls in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17631,7 +17794,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030361 - Successful/unsuccessful uses of the rename, unlink, rmdir, renameat, and unlinkat system calls in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17656,7 +17820,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030370 - Successful/unsuccessful uses of the gpasswd command in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17674,7 +17839,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030390 - Successful/unsuccessful uses of the delete_module command in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17692,7 +17858,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030400 - Successful/unsuccessful uses of the crontab command in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17710,7 +17877,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030410 - Successful/unsuccessful uses of the chsh command in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17728,7 +17896,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030420 - Successful/unsuccessful uses of the truncate, ftruncate, creat, open, openat, and open_by_handle_at system calls in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17753,7 +17922,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030480 - Successful/unsuccessful uses of the chown, fchown, fchownat, and lchown system calls in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17777,7 +17947,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030490 - Successful/unsuccessful uses of the chmod, fchmod, and fchmodat system calls in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17800,7 +17971,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030550 - Successful/unsuccessful uses of the sudo command in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17818,7 +17990,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030560 - Successful/unsuccessful uses of the usermod command in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17836,7 +18009,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030570 - Successful/unsuccessful uses of the chacl command in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17854,7 +18028,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030580 - Successful/unsuccessful uses of the kmod command in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without the capability to generate audit records, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17882,7 +18057,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030600 - Successful/unsuccessful modifications to the lastlog file in RHEL 8 must generate an audit record.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without the capability to generate audit records, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
- 
-@@ -17910,7 +18086,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030610 - RHEL 8 must allow only the Information System Security Manager (ISSM) (or individuals or roles appointed by the ISSM) to select which auditable events are to be audited.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without the capability to restrict the roles and individuals that can select which events are audited, unauthorized personnel may be able to prevent the auditing of critical events. Misconfigured audits may degrade the system's performance by overwhelming the audit log. Misconfigured audits may also make it more difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
-           
-@@ -17922,7 +18099,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
-           
-             RHEL-08-030620 - RHEL 8 audit tools must have a mode of 0755 or less permissive.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Protecting audit information also includes identifying and protecting the tools used to view and manipulate log data. Therefore, protecting audit tools is necessary to prevent unauthorized operation on audit information.
- 
-@@ -17938,7 +18116,8 @@ Audit tools include, but are not limited to, vendor-provided and open source aud
-           
-             RHEL-08-030630 - RHEL 8 audit tools must be owned by root.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Protecting audit information also includes identifying and protecting the tools used to view and manipulate log data. Therefore, protecting audit tools is necessary to prevent unauthorized operation on audit information.
- 
-@@ -17956,7 +18135,8 @@ Satisfies: SRG-OS-000256-GPOS-00097, SRG-OS-000257-GPOS-00098, SRG-OS-000258-GPO
-           
-             RHEL-08-030640 - RHEL 8 audit tools must be group-owned by root.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Protecting audit information also includes identifying and protecting the tools used to view and manipulate log data. Therefore, protecting audit tools is necessary to prevent unauthorized operation on audit information.
- 
-@@ -17974,7 +18154,8 @@ Satisfies: SRG-OS-000256-GPOS-00097, SRG-OS-000257-GPOS-00098, SRG-OS-000258-GPO
-           
-             RHEL-08-030670 - RHEL 8 must have the packages required for offloading audit logs installed.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Information stored in one location is vulnerable to accidental or incidental deletion or alteration.
- 
-@@ -17997,7 +18178,8 @@ Note that a port number was given as there is no standard port for RELP.
-             RHEL-08-030680 - RHEL 8 must have the packages required for encrypting offloaded audit logs installed.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Information stored in one location is vulnerable to accidental or incidental deletion or alteration.
- 
-@@ -18020,7 +18202,8 @@ Note that a port number was given as there is no standard port for RELP.
-             RHEL-08-030700 - RHEL 8 must take appropriate action when the internal event queue is full.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Information stored in one location is vulnerable to accidental or incidental deletion or alteration.
- 
-@@ -18038,7 +18221,8 @@ Satisfies: SRG-OS-000342-GPOS-00133, SRG-OS-000479-GPOS-00224
-           
-             RHEL-08-030720 - RHEL 8 must authenticate the remote logging server for off-loading audit logs.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Information stored in one location is vulnerable to accidental or incidental deletion or alteration.
- 
-@@ -18062,7 +18246,8 @@ Satisfies: SRG-OS-000342-GPOS-00133, SRG-OS-000479-GPOS-00224
-           
-             RHEL-08-030730 - RHEL 8 must take action when allocated audit record storage volume reaches 75 percent of the repository maximum audit record storage capacity.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If security personnel are not notified immediately when storage volume reaches 75 percent utilization, they are unable to plan for audit record storage capacity expansion.
-           
-@@ -18074,7 +18259,8 @@ Satisfies: SRG-OS-000342-GPOS-00133, SRG-OS-000479-GPOS-00224
-           
-             RHEL-08-030741 - RHEL 8 must disable the chrony daemon from acting as a server.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Inaccurate time stamps make it more difficult to correlate events and can lead to an inaccurate analysis. Determining the correct time a particular event occurred on a system is critical when conducting forensic analysis and investigating system events. Sources outside the configured acceptable allowance (drift) may be inaccurate.
- 
-@@ -18092,7 +18278,8 @@ Note that USNO offers authenticated NTP service to DoD and U.S. Government agenc
-           
-             RHEL-08-030742 - RHEL 8 must disable network management of the chrony daemon.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Inaccurate time stamps make it more difficult to correlate events and can lead to an inaccurate analysis. Determining the correct time a particular event occurred on a system is critical when conducting forensic analysis and investigating system events. Sources outside the configured acceptable allowance (drift) may be inaccurate.
- 
-@@ -18110,7 +18297,8 @@ Note that USNO offers authenticated NTP service to DoD and U.S. Government agenc
-           
-             RHEL-08-040000 - RHEL 8 must not have the telnet-server package installed.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -18132,7 +18320,8 @@ If a privileged user were to log on using this service, the privileged user pass
-           
-             RHEL-08-040001 - RHEL 8 must not have any automated bug reporting tools installed.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -18150,7 +18339,8 @@ Verify the operating system is configured to disable non-essential capabilities.
-           
-             RHEL-08-040002 - RHEL 8 must not have the sendmail package installed.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -18168,7 +18358,8 @@ Verify the operating system is configured to disable non-essential capabilities.
-           
-             RHEL-08-040010 - RHEL 8 must not have the rsh-server package installed.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -18188,7 +18379,8 @@ Satisfies: SRG-OS-000095-GPOS-00049, SRG-OS-000074-GPOS-00042
-           
-             RHEL-08-040021 - RHEL 8 must disable the asynchronous transfer mode (ATM) protocol.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -18204,7 +18396,8 @@ The Asynchronous Transfer Mode (ATM) is a protocol operating on network, data li
-           
-             RHEL-08-040022 - RHEL 8 must disable the controller area network (CAN) protocol.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -18220,7 +18413,8 @@ The Controller Area Network (CAN) is a serial communications protocol, which was
-           
-             RHEL-08-040023 - RHEL 8 must disable the stream control transmission protocol (SCTP).
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -18236,7 +18430,8 @@ The Stream Control Transmission Protocol (SCTP) is a transport layer protocol, d
-           
-             RHEL-08-040024 - RHEL 8 must disable the transparent inter-process communication (TIPC) protocol.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -18252,7 +18447,8 @@ The Transparent Inter-Process Communication (TIPC) protocol is designed to provi
-           
-             RHEL-08-040025 - RHEL 8 must disable mounting of cramfs.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -18268,7 +18464,8 @@ Compressed ROM/RAM file system (or cramfs) is a read-only file system designed f
-           
-             RHEL-08-040026 - RHEL 8 must disable IEEE 1394 (FireWire) Support.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -18282,7 +18479,8 @@ The IEEE 1394 (FireWire) is a serial bus standard for high-speed real-time commu
-           
-             RHEL-08-040070 - The RHEL 8 file system automounter must be disabled unless required.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Automatically mounting file systems permits easy introduction of unknown devices, thereby facilitating malicious activity.
-           
-@@ -18294,7 +18492,8 @@ The IEEE 1394 (FireWire) is a serial bus standard for high-speed real-time commu
-           
-             RHEL-08-040080 - RHEL 8 must be configured to disable USB mass storage.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             USB mass storage permits easy introduction of unknown devices, thereby facilitating malicious activity.
- 
-@@ -18308,7 +18507,8 @@ Satisfies: SRG-OS-000114-GPOS-00059, SRG-OS-000378-GPOS-00163
-           
-             RHEL-08-040100 - A firewall must be installed on RHEL 8.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             "Firewalld" provides an easy and effective way to block/limit remote access to the system via ports, services, and protocols.
- 
-@@ -18326,7 +18526,8 @@ RHEL 8 functionality (e.g., RDP) must be capable of taking enforcement action if
-           
-             RHEL-08-040111 - RHEL 8 Bluetooth must be disabled.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without protection of communications with wireless peripherals, confidentiality and integrity may be compromised because unprotected communications can be intercepted and either read, altered, or used to compromise the RHEL 8 operating system.
- 
-@@ -18342,7 +18543,8 @@ Protecting the confidentiality and integrity of communications with wireless per
-           
-             RHEL-08-040120 - RHEL 8 must mount /dev/shm with the nodev option.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
- 
-@@ -18360,7 +18562,8 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
-           
-             RHEL-08-040121 - RHEL 8 must mount /dev/shm with the nosuid option.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
- 
-@@ -18376,7 +18579,8 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
-           
-             RHEL-08-040122 - RHEL 8 must mount /dev/shm with the noexec option.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
- 
-@@ -18394,7 +18598,8 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
-           
-             RHEL-08-040123 - RHEL 8 must mount /tmp with the nodev option.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
- 
-@@ -18412,7 +18617,8 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
-           
-             RHEL-08-040124 - RHEL 8 must mount /tmp with the nosuid option.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
- 
-@@ -18428,7 +18634,8 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
-           
-             RHEL-08-040125 - RHEL 8 must mount /tmp with the noexec option.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
- 
-@@ -18446,7 +18653,8 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
-           
-             RHEL-08-040126 - RHEL 8 must mount /var/log with the nodev option.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
- 
-@@ -18464,7 +18672,8 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
-           
-             RHEL-08-040127 - RHEL 8 must mount /var/log with the nosuid option.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
- 
-@@ -18482,7 +18691,8 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
-           
-             RHEL-08-040128 - RHEL 8 must mount /var/log with the noexec option.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
- 
-@@ -18500,7 +18710,8 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
-           
-             RHEL-08-040129 - RHEL 8 must mount /var/log/audit with the nodev option.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
- 
-@@ -18518,7 +18729,8 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
-           
-             RHEL-08-040130 - RHEL 8 must mount /var/log/audit with the nosuid option.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
- 
-@@ -18536,7 +18748,8 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
-           
-             RHEL-08-040131 - RHEL 8 must mount /var/log/audit with the noexec option.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
- 
-@@ -18554,7 +18767,8 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
-           
-             RHEL-08-040132 - RHEL 8 must mount /var/tmp with the nodev option.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
- 
-@@ -18572,7 +18786,8 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
-           
-             RHEL-08-040133 - RHEL 8 must mount /var/tmp with the nosuid option.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
- 
-@@ -18590,7 +18805,8 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
-           
-             RHEL-08-040134 - RHEL 8 must mount /var/tmp with the noexec option.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
- 
-@@ -18608,7 +18824,8 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
-           
-             RHEL-08-040135 - The RHEL 8 fapolicy module must be installed.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
- 
-@@ -18630,7 +18847,8 @@ Satisfies: SRG-OS-000368-GPOS-00154, SRG-OS-000370-GPOS-00155, SRG-OS-000480-GPO
-           
-             RHEL-08-040150 - A firewall must be able to protect against or limit the effects of Denial of Service (DoS) attacks by ensuring RHEL 8 can implement rate-limiting measures on impacted network interfaces.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             DoS is a condition when a resource is not available for legitimate users. When this occurs, the organization either cannot accomplish its mission or must operate at degraded capacity.
- 
-@@ -18646,7 +18864,8 @@ Since version 0.6.0, "firewalld" has incorporated "nftables" as its backend supp
-           
-             RHEL-08-040160 - All RHEL 8 networked systems must have and implement SSH to protect the confidentiality and integrity of transmitted and received information, as well as information during preparation for transmission.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without protection of the transmitted information, confidentiality and integrity may be compromised because unprotected communications can be intercepted and either read or altered. 
- 
-@@ -18664,7 +18883,8 @@ Satisfies: SRG-OS-000423-GPOS-00187, SRG-OS-000424-GPOS-00188, SRG-OS-000425-GPO
-           
-             RHEL-08-040161 - RHEL 8 must force a frequent session key renegotiation for SSH connections to the server.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without protection of the transmitted information, confidentiality and integrity may be compromised because unprotected communications can be intercepted and either read or altered. 
- 
-@@ -18684,7 +18904,8 @@ Satisfies: SRG-OS-000033-GPOS-00014, SRG-OS-000420-GPOS-00186, SRG-OS-000424-GPO
-           
-             RHEL-08-040170 - The x86 Ctrl-Alt-Delete key sequence must be disabled on RHEL 8.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             A locally logged-on user, who presses Ctrl-Alt-Delete when at the console, can reboot the system. If accidentally pressed, as could happen in the case of a mixed OS environment, this can create the risk of short-term loss of availability of systems due to unintentional reboot. In a graphical user environment, risk of unintentional reboot from the Ctrl-Alt-Delete sequence is reduced because the user will be prompted before any action is taken.
-           
-@@ -18696,7 +18917,8 @@ Satisfies: SRG-OS-000033-GPOS-00014, SRG-OS-000420-GPOS-00186, SRG-OS-000424-GPO
-           
-             RHEL-08-040171 - The x86 Ctrl-Alt-Delete key sequence in RHEL 8 must be disabled if a graphical user interface is installed.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             A locally logged-on user, who presses Ctrl-Alt-Delete, when at the console, can reboot the system. If accidentally pressed, as could happen in the case of a mixed OS environment, this can create the risk of short-term loss of availability of systems due to unintentional reboot. In a graphical user environment, risk of unintentional reboot from the Ctrl-Alt-Delete sequence is reduced because the user will be prompted before any action is taken.
-           
-@@ -18708,7 +18930,8 @@ Satisfies: SRG-OS-000033-GPOS-00014, SRG-OS-000420-GPOS-00186, SRG-OS-000424-GPO
-           
-             RHEL-08-040172 - The systemd Ctrl-Alt-Delete burst key sequence in RHEL 8 must be disabled.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             A locally logged-on user who presses Ctrl-Alt-Delete when at the console can reboot the system. If accidentally pressed, as could happen in the case of a mixed OS environment, this can create the risk of short-term loss of availability of systems due to unintentional reboot. In a graphical user environment, risk of unintentional reboot from the Ctrl-Alt-Delete sequence is reduced because the user will be prompted before any action is taken.
-           
-@@ -18720,7 +18943,8 @@ Satisfies: SRG-OS-000033-GPOS-00014, SRG-OS-000420-GPOS-00186, SRG-OS-000424-GPO
-           
-             RHEL-08-040180 - The debug-shell systemd service must be disabled on RHEL 8.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The debug-shell requires no authentication and provides root privileges to anyone who has physical access to the machine.  While this feature is disabled by default, masking it adds an additional layer of assurance that it will not be enabled via a dependency in systemd.  This also prevents attackers with physical access from trivially bypassing security on the machine through valid troubleshooting configurations and gaining root access when the system is rebooted.
-           
-@@ -18732,7 +18956,8 @@ Satisfies: SRG-OS-000033-GPOS-00014, SRG-OS-000420-GPOS-00186, SRG-OS-000424-GPO
-           
-             RHEL-08-040190 - The Trivial File Transfer Protocol (TFTP) server package must not be installed if not required for RHEL 8 operational support.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If TFTP is required for operational support (such as the transmission of router configurations) its use must be documented with the Information System Security Officer (ISSO), restricted to only authorized personnel, and have access control rules established.
-           
-@@ -18744,7 +18969,8 @@ Satisfies: SRG-OS-000033-GPOS-00014, SRG-OS-000420-GPOS-00186, SRG-OS-000424-GPO
-           
-             RHEL-08-040200 - The root account must be the only account having unrestricted access to the RHEL 8 system.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If an account other than root also has a User Identifier (UID) of "0", it has root authority, giving that account unrestricted access to the entire operating system. Multiple accounts with a UID of "0" afford an opportunity for potential intruders to guess a password for a privileged account.
-           
-@@ -18756,7 +18982,8 @@ Satisfies: SRG-OS-000033-GPOS-00014, SRG-OS-000420-GPOS-00186, SRG-OS-000424-GPO
-           
-             RHEL-08-040210 - RHEL 8 must prevent IPv6 Internet Control Message Protocol (ICMP) redirect messages from being accepted.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             ICMP redirect messages are used by routers to inform hosts that a more direct route exists for a particular destination. These messages modify the host's route table and are unauthenticated. An illicit ICMP redirect message could result in a man-in-the-middle attack.
- 
-@@ -18776,7 +19003,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-040220 - RHEL 8 must not send Internet Control Message Protocol (ICMP) redirects.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             ICMP redirect messages are used by routers to inform hosts that a more direct route exists for a particular destination. These messages contain information from the system's route table, possibly revealing portions of the network topology.
- 
-@@ -18798,7 +19026,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-040230 - RHEL 8 must not respond to Internet Control Message Protocol (ICMP) echoes sent to a broadcast address.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Responding to broadcast ICMP echoes facilitates network mapping and provides a vector for amplification attacks.
- 
-@@ -18819,7 +19048,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-040240 - RHEL 8 must not forward IPv6 source-routed packets.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Source-routed packets allow the source of the packet to suggest that routers forward the packet along a different path than configured on the router, which can be used to bypass network security measures. This requirement applies only to the forwarding of source-routed traffic, such as when forwarding is enabled and the system is functioning as a router.
- 
-@@ -18839,7 +19069,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-040250 - RHEL 8 must not forward IPv6 source-routed packets by default.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Source-routed packets allow the source of the packet to suggest that routers forward the packet along a different path than configured on the router, which can be used to bypass network security measures. This requirement applies only to the forwarding of source-routed traffic, such as when forwarding is enabled and the system is functioning as a router.
- 
-@@ -18859,7 +19090,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-040260 - RHEL 8 must not enable IPv6 packet forwarding unless the system is a router.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Routing protocol daemons are typically used on routers to exchange network topology information with other routers. If this software is used when not required, system network information may be unnecessarily transmitted across the network.
- 
-@@ -18879,7 +19111,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-040261 - RHEL 8 must not accept router advertisements on all IPv6 interfaces.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Routing protocol daemons are typically used on routers to exchange network topology information with other routers. If this software is used when not required, system network information may be unnecessarily transmitted across the network.
- 
-@@ -18901,7 +19134,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-040262 - RHEL 8 must not accept router advertisements on all IPv6 interfaces by default.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Routing protocol daemons are typically used on routers to exchange network topology information with other routers. If this software is used when not required, system network information may be unnecessarily transmitted across the network.
- 
-@@ -18923,7 +19157,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-040270 - RHEL 8 must not allow interfaces to perform Internet Control Message Protocol (ICMP) redirects by default.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             ICMP redirect messages are used by routers to inform hosts that a more direct route exists for a particular destination. These messages contain information from the system's route table, possibly revealing portions of the network topology.
- 
-@@ -18945,7 +19180,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-040280 - RHEL 8 must ignore IPv6 Internet Control Message Protocol (ICMP) redirect messages.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             ICMP redirect messages are used by routers to inform hosts that a more direct route exists for a particular destination. These messages modify the host's route table and are unauthenticated. An illicit ICMP redirect message could result in a man-in-the-middle attack.
- 
-@@ -18965,7 +19201,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-040281 - RHEL 8 must disable access to network bpf syscall from unprivileged processes.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -18985,7 +19222,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-040282 - RHEL 8 must restrict usage of ptrace to descendant  processes.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -19005,7 +19243,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-040283 - RHEL 8 must restrict exposed kernel pointer addresses access.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -19025,7 +19264,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-040284 - RHEL 8 must disable the use of user namespaces.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -19045,7 +19285,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-040285 - RHEL 8 must use reverse path filtering on all IPv4 interfaces.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -19065,7 +19306,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-040290 - RHEL 8 must be configured to prevent unrestricted mail relaying.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If unrestricted mail relaying is permitted, unauthorized senders could use this host as a mail relay for the purpose of sending spam or other unauthorized activity.
-           
-@@ -19077,7 +19319,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-040320 - The graphical display manager must not be installed on RHEL 8 unless approved.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Internet services that are not required for system or application processes must not be active to decrease the attack surface of the system. Graphical display managers have a long history of security vulnerabilities and must not be used, unless approved and documented.
-           
-@@ -19089,7 +19332,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-040330 - RHEL 8 network interfaces must not be in promiscuous mode.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Network interfaces in promiscuous mode allow for the capture of all network traffic visible to the system. If unauthorized individuals can access these applications, it may allow them to collect information such as logon IDs, passwords, and key exchanges between systems.
- 
-@@ -19103,7 +19347,8 @@ If the system is being used to perform a network troubleshooting function, the u
-           
-             RHEL-08-040340 - RHEL 8 remote X connections for interactive users must be disabled unless to fulfill documented and validated mission requirements.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The security risk of using X11 forwarding is that the client's X11 display server may be exposed to attack when the SSH client requests forwarding.  A system administrator may have a stance in which they want to protect clients that may expose themselves to attack by unwittingly requesting X11 forwarding, which can warrant a "no" setting.
- 
-@@ -19119,7 +19364,8 @@ If X11 services are not required for the system's intended function, they should
-           
-             RHEL-08-040341 - The RHEL 8 SSH daemon must prevent remote hosts from connecting to the proxy display.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             When X11 forwarding is enabled, there may be additional exposure to the server and client displays if the sshd proxy display is configured to listen on the wildcard address.  By default, sshd binds the forwarding server to the loopback address and sets the hostname part of the DIPSLAY environment variable to localhost.  This prevents remote hosts from connecting to the proxy display.
-           
-@@ -19131,7 +19377,8 @@ If X11 services are not required for the system's intended function, they should
-           
-             RHEL-08-040350 - If the Trivial File Transfer Protocol (TFTP) server is required, the RHEL 8 TFTP daemon must be configured to operate in secure mode.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Restricting TFTP to a specific directory prevents remote users from copying, transferring, or overwriting system files.
-           
-@@ -19143,7 +19390,8 @@ If X11 services are not required for the system's intended function, they should
-           
-             RHEL-08-040360 - A File Transfer Protocol (FTP) server package must not be installed unless mission essential on RHEL 8.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The FTP service provides an unencrypted remote access that does not provide for the confidentiality and integrity of user passwords or the remote session. If a privileged user were to log on using this service, the privileged user password could be compromised. SSH or other encrypted file transfer methods must be used in place of this service.
-           
-@@ -19155,7 +19403,8 @@ If X11 services are not required for the system's intended function, they should
-           
-             RHEL-08-040370 - The gssproxy package must not be installed unless mission essential on RHEL 8.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -19171,7 +19420,8 @@ The gssproxy package is a proxy for GSS API credential handling and could expose
-           
-             RHEL-08-040380 - The iprutils package must not be installed unless mission essential on RHEL 8.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -19187,7 +19437,8 @@ The iprutils package provides a suite of utilities to manage and configure SCSI
-           
-             RHEL-08-040390 - The tuned package must not be installed unless mission essential on RHEL 8.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -19203,7 +19454,8 @@ The tuned package contains a daemon that tunes the system settings dynamically.
-           
-             RHEL-08-010163 - The krb5-server package must not be installed on RHEL 8.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Unapproved mechanisms that are used for authentication to the cryptographic module are not verified and therefore cannot be relied upon to provide confidentiality or integrity, and DoD data may be compromised.
- 
-@@ -19221,7 +19473,8 @@ FIPS 140-2 is the current standard for validating that mechanisms used to access
-           
-             RHEL-08-010382 - RHEL 8 must restrict privilege elevation to authorized personnel.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The sudo command allows a user to execute programs with elevated (administrator) privileges. It prompts the user for their password and confirms your request to execute a command by checking a file, called sudoers. If the "sudoers" file is not configured correctly, any user defined on the system can initiate privileged actions on the target system.
-           
-@@ -19233,7 +19486,8 @@ FIPS 140-2 is the current standard for validating that mechanisms used to access
-           
-             RHEL-08-010383 - RHEL 8 must use the invoking user's password for privilege escalation when using "sudo".
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The sudoers security policy requires that users authenticate themselves before they can use sudo. When sudoers requires authentication, it validates the invoking user's credentials. If the rootpw, targetpw, or runaspw flags are defined and not disabled, by default the operating system will prompt the invoking user for the "root" user password. 
- For more information on each of the listed configurations, reference the sudoers(5) manual page.
-@@ -19246,7 +19500,8 @@ For more information on each of the listed configurations, reference the sudoers
-           
-             RHEL-08-010384 - RHEL 8 must require re-authentication when using the "sudo" command.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without re-authentication, users may access resources or perform tasks for which they do not have authorization. 
- 
-@@ -19262,7 +19517,8 @@ If the value is set to an integer less than 0, the user's time stamp will not ex
-           
-             RHEL-08-010049 - RHEL 8 must display a banner before granting local or remote access to the system via a graphical user logon.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Display of a standardized and approved use notification before granting access to the operating system ensures privacy and security notification verbiage used is consistent with applicable federal laws, Executive Orders, directives, policies, regulations, standards, and guidance.
- 
-@@ -19278,7 +19534,8 @@ Satisfies: SRG-OS-000023-GPOS-00006, SRG-OS-000228-GPOS-00088
-           
-             RHEL-08-010152 - RHEL 8 operating systems must require authentication upon booting into emergency mode.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If the system does not require valid root authentication before it boots into emergency or rescue mode, anyone who invokes emergency or rescue mode is granted privileged access to all files on the system.
-           
-@@ -19290,7 +19547,8 @@ Satisfies: SRG-OS-000023-GPOS-00006, SRG-OS-000228-GPOS-00088
-           
-             RHEL-08-010159 - The RHEL 8 pam_unix.so module must be configured in the system-auth file to use a FIPS 140-2 approved cryptographic hashing algorithm for system authentication.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Unapproved mechanisms that are used for authentication to the cryptographic module are not verified and therefore cannot be relied upon to provide confidentiality or integrity, and DoD data may be compromised.
- 
-@@ -19306,7 +19564,8 @@ FIPS 140-2 is the current standard for validating that mechanisms used to access
-           
-             RHEL-08-010201 - The RHEL 8 SSH daemon must be configured with a timeout interval.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Terminating an idle SSH session within a short time period reduces the window of opportunity for unauthorized personnel to take control of a management session enabled on the console or console port that has been left unattended. In addition, quickly terminating an idle SSH session will also free up resources committed by the managed network element.
- 
-@@ -19324,7 +19583,8 @@ Satisfies: SRG-OS-000163-GPOS-00072, SRG-OS-000126-GPOS-00066, SRG-OS-000279-GPO
-           
-             RHEL-08-010472 - RHEL 8 must have the packages required to use the hardware random number generator entropy gatherer service.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The most important characteristic of a random number generator is its randomness, namely its ability to deliver random numbers that are impossible to predict.  Entropy in computer security is associated with the unpredictability of a source of randomness.  The random source with high entropy tends to achieve a uniform distribution of random values.  Random number generators are one of the most important building blocks of cryptosystems.  
- 
-@@ -19338,7 +19598,8 @@ The rngd service feeds random data from hardware device to kernel random device.
-           
-             RHEL-08-010522 - The RHEL 8 SSH daemon must not allow GSSAPI authentication, except to fulfill documented and validated mission requirements.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Configuring this setting for the SSH daemon provides additional assurance that remote logon via SSH will require a password, even in the event of misconfiguration elsewhere.
-           
-@@ -19350,7 +19611,8 @@ The rngd service feeds random data from hardware device to kernel random device.
-           
-             RHEL-08-010544 - RHEL 8 must use a separate file system for /var/tmp.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The use of separate file systems for different paths can protect the system from failures resulting from a file system becoming full or failing.
-           
-@@ -19362,7 +19624,8 @@ The rngd service feeds random data from hardware device to kernel random device.
-           
-             RHEL-08-010572 - RHEL 8 must prevent files with the setuid and setgid bit set from being executed on the /boot/efi directory.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The "nosuid" mount option causes the system not to execute "setuid" and "setgid" files with owner privileges. This option must be used for mounting any file system not containing approved "setuid" and "setguid" files. Executing files from untrusted file systems increases the opportunity for unprivileged users to attain unauthorized administrative access.
-           
-@@ -19374,7 +19637,8 @@ The rngd service feeds random data from hardware device to kernel random device.
-           
-             RHEL-08-020032 - RHEL 8 must disable the user list at logon for graphical user interfaces.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Leaving the user list enabled is a security risk since it allows anyone with physical access to the system to enumerate known user accounts without authenticated access to the system.
-           
-@@ -19386,7 +19650,8 @@ The rngd service feeds random data from hardware device to kernel random device.
-           
-             RHEL-08-020082 - RHEL 8 must prevent a user from overriding the screensaver lock-enabled setting for the graphical user interface.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             A session time-out lock is a temporary action taken when a user stops work and moves away from the immediate physical vicinity of the information system but does not log out because of the temporary nature of the absence. Rather than relying on the user to manually lock their operating system session prior to vacating the vicinity, operating systems need to be able to identify when a user's session has idled and take action to initiate the session lock.
- 
-@@ -19406,7 +19671,8 @@ Satisfies: SRG-OS-000029-GPOS-00010, SRG-OS-000031-GPOS-00012, SRG-OS-000480-GPO
-           
-             RHEL-08-020332 - RHEL 8 must not allow blank or null passwords in the password-auth file.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If an account has an empty password, anyone could log on and run commands with the privileges of that account. Accounts with empty passwords should never be used in operational environments.
-           
-@@ -19418,7 +19684,8 @@ Satisfies: SRG-OS-000029-GPOS-00010, SRG-OS-000031-GPOS-00012, SRG-OS-000480-GPO
-           
-             RHEL-08-030181 - RHEL 8 audit records must contain information to establish what type of events occurred, the source of events, where events occurred, and the outcome of events.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without establishing what type of events occurred, the source of events, where events occurred, and the outcome of events, it would be difficult to establish, correlate, and investigate the events leading up to an outage or attack.
- 
-@@ -19436,7 +19703,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000038-GPO
-           
-             RHEL-08-030731 - RHEL 8 must notify the System Administrator (SA) and Information System Security Officer (ISSO) (at a minimum) when allocated audit record storage volume 75 percent utilization.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If security personnel are not notified immediately when storage volume reaches 75 percent utilization, they are unable to plan for audit record storage capacity expansion.
-           
-@@ -19448,7 +19716,8 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000038-GPO
-           
-             RHEL-08-040101 - A firewall must be active on RHEL 8.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             "Firewalld" provides an easy and effective way to block/limit remote access to the system via ports, services, and protocols.
- 
-@@ -19465,7 +19734,8 @@ RHEL 8 functionality (e.g., RDP) must be capable of taking enforcement action if
-           
-             RHEL-08-040136 - The RHEL 8 fapolicy module must be enabled.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
- 
-@@ -19487,7 +19757,8 @@ Satisfies: SRG-OS-000368-GPOS-00154, SRG-OS-000370-GPOS-00155, SRG-OS-000480-GPO
-           
-             RHEL-08-040139 - RHEL 8 must have the USBGuard installed.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without authenticating devices, unidentified or unknown devices may be introduced, thereby facilitating malicious activity.
- Peripherals include, but are not limited to, such devices as flash drives, external storage, and printers.
-@@ -19503,7 +19774,8 @@ The System Administrator (SA) must work with the site Information System Securit
-           
-             RHEL-08-040141 - RHEL 8 must enable the USBGuard.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without authenticating devices, unidentified or unknown devices may be introduced, thereby facilitating malicious activity.
- 
-@@ -19521,7 +19793,8 @@ The System Administrator (SA) must work with the site Information System Securit
-           
-             RHEL-08-040159 - All RHEL 8 networked systems must have SSH installed.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without protection of the transmitted information, confidentiality and integrity may be compromised because unprotected communications can be intercepted and either read or altered. 
- 
-@@ -19539,7 +19812,8 @@ Satisfies: SRG-OS-000423-GPOS-00187, SRG-OS-000424-GPOS-00188, SRG-OS-000425-GPO
-           
-             RHEL-08-040209 - RHEL 8 must prevent IPv4 Internet Control Message Protocol (ICMP) redirect messages from being accepted.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             ICMP redirect messages are used by routers to inform hosts that a more direct route exists for a particular destination. These messages modify the host's route table and are unauthenticated. An illicit ICMP redirect message could result in a man-in-the-middle attack.
- 
-@@ -19559,7 +19833,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-040239 - RHEL 8 must not forward IPv4 source-routed packets.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Source-routed packets allow the source of the packet to suggest that routers forward the packet along a different path than configured on the router, which can be used to bypass network security measures. This requirement applies only to the forwarding of source-routed traffic, such as when forwarding is enabled and the system is functioning as a router.
- 
-@@ -19579,7 +19854,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-040249 - RHEL 8 must not forward IPv4 source-routed packets by default.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Source-routed packets allow the source of the packet to suggest that routers forward the packet along a different path than configured on the router, which can be used to bypass network security measures. This requirement applies only to the forwarding of source-routed traffic, such as when forwarding is enabled and the system is functioning as a router.
- 
-@@ -19599,7 +19875,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-040279 - RHEL 8 must ignore IPv4 Internet Control Message Protocol (ICMP) redirect messages.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             ICMP redirect messages are used by routers to inform hosts that a more direct route exists for a particular destination. These messages modify the host's route table and are unauthenticated. An illicit ICMP redirect message could result in a man-in-the-middle attack.
- 
-@@ -19619,7 +19896,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-040286 - RHEL 8 must enable hardening for the Berkeley Packet Filter Just-in-time compiler.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
- 
-@@ -19641,7 +19919,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-010121 - The RHEL 8 operating system must not have accounts configured with blank or null passwords.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If an account has an empty password, anyone could log on and run commands with the privileges of that account. Accounts with empty passwords should never be used in operational environments.
-           
-@@ -19653,7 +19932,8 @@ The sysctl --system command will load settings from all system configuration fil
-           
-             RHEL-08-010331 - RHEL 8 library directories must have mode 755 or less permissive.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If RHEL 8 were to allow any user to make changes to software libraries, then those changes might be implemented without undergoing the appropriate testing and approvals that are part of a robust change management process.
- 
-@@ -19667,7 +19947,8 @@ This requirement applies to RHEL 8 with software libraries that are accessible a
-           
-             RHEL-08-010341 - RHEL 8 library directories must be owned by root.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If RHEL 8 were to allow any user to make changes to software libraries, then those changes might be implemented without undergoing the appropriate testing and approvals that are part of a robust change management process.
- 
-@@ -19681,7 +19962,8 @@ This requirement applies to RHEL 8 with software libraries that are accessible a
-           
-             RHEL-08-010351 - RHEL 8 library directories must be group-owned by root or a system account.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             If RHEL 8 were to allow any user to make changes to software libraries, then those changes might be implemented without undergoing the appropriate testing and approvals that are part of a robust change management process.
- 
-@@ -19695,7 +19977,8 @@ This requirement applies to RHEL 8 with software libraries that are accessible a
-           
-             RHEL-08-010385 - The RHEL 8 operating system must not be configured to bypass password requirements for privilege escalation.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Without re-authentication, users may access resources or perform tasks for which they do not have authorization. 
- 
-@@ -19711,7 +19994,8 @@ Satisfies: SRG-OS-000373-GPOS-00156, SRG-OS-000373-GPOS-00157, SRG-OS-000373-GPO
-           
-             RHEL-08-020101 - RHEL 8 must ensure the password complexity module is enabled in the system-auth file.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Use of a complex password helps to increase the time and resources required to compromise the password. Password complexity, or strength, is a measure of the effectiveness of a password in resisting attempts at guessing and brute-force attacks. "pwquality" enforces complex password construction configuration and has the ability to limit brute-force attacks on the system.
- 
-@@ -19727,7 +20011,8 @@ RHEL 8 uses "pwquality" as a mechanism to enforce password complexity. This is s
-           
-             RHEL-08-040321 - The graphical display manager must not be the default target on RHEL 8 unless approved.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Internet services that are not required for system or application processes must not be active to decrease the attack surface of the system. Graphical display managers have a long history of security vulnerabilities and must not be used, unless approved and documented.
-           
-@@ -19739,7 +20024,8 @@ RHEL 8 uses "pwquality" as a mechanism to enforce password complexity. This is s
-           
-             RHEL-08-020035 - RHEL 8 must terminate idle user sessions.
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             Terminating an idle session within a short time period reduces the window of opportunity for unauthorized personnel to take control of a management session enabled on the console or console port that has been left unattended.
-           
-@@ -19802,11 +20088,11 @@ RHEL 8 uses "pwquality" as a mechanism to enforce password complexity. This is s
-         
-           
-         
--        
-+        
-           
-           
-         
--        
-+        
-           
-           
-         
-@@ -21745,12 +22031,12 @@ RHEL 8 uses "pwquality" as a mechanism to enforce password complexity. This is s
-           1
-         
-         
--          /boot/efi/EFI/redhat/grub.cfg
-+          /boot/efi/EFI/almalinux/grub.cfg
-           ^\s*set\s+superusers\s*=\s*"(\w+)"\s*$
-           1
-         
-         
--          /boot/efi/EFI/redhat/user.cfg
-+          /boot/efi/EFI/almalinux/user.cfg
-           ^\s*GRUB2_PASSWORD=(\S+)\b
-           1
-         
-@@ -25379,7 +25665,8 @@ RHEL 8 uses "pwquality" as a mechanism to enforce password complexity. This is s
-           
-             RHEL 8 is installed
-             
--              Red Hat Enterprise Linux 8
-+              Red Hat Enterprise Linux 8
-+AlmaLinux OS 8
-             
-             
-             RHEL 8 is installed
-diff --git a/shared/references/disa-stig-rhel8-v2r3-xccdf-manual.xml b/shared/references/disa-stig-rhel8-v2r3-xccdf-manual.xml
-index 7fa5cfb17..4024119f2 100644
---- a/shared/references/disa-stig-rhel8-v2r3-xccdf-manual.xml
-+++ b/shared/references/disa-stig-rhel8-v2r3-xccdf-manual.xml
+diff --git a/shared/references/disa-stig-rhel8-v2r4-xccdf-manual.xml b/shared/references/disa-stig-rhel8-v2r4-xccdf-manual.xml
+index ea46d8343..ae0897b61 100644
+--- a/shared/references/disa-stig-rhel8-v2r4-xccdf-manual.xml
++++ b/shared/references/disa-stig-rhel8-v2r4-xccdf-manual.xml
 @@ -370,7 +370,7 @@ SHA_CRYPT_MIN_ROUNDS 100000
+           
+           
+           CCI-000213
+-          Configure the system to require a grub bootloader password for the grub superusers account with the grub2-setpassword command, which creates/overwrites the /boot/efi/EFI/redhat/user.cfg file.
++          Configure the system to require a grub bootloader password for the grub superusers account with the grub2-setpassword command, which creates/overwrites the /boot/efi/EFI/almalinux/user.cfg file.
+ 
+ Generate an encrypted grub2 password for the grub superusers account with the following command:
+ 
+@@ -12049,8 +12049,8 @@ $ sudo systemctl restart systemd-logind
+             
+           
+           
+-            
+-            
++            
++            
+           
+         
+         
+@@ -14877,6 +14877,7 @@ $ sudo systemctl restart systemd-logind
+             The system is RHEL 8.1 or lower
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             
+           
+@@ -14889,6 +14890,7 @@ $ sudo systemctl restart systemd-logind
+             The system is RHEL 8.2 or higher
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             
+           
+@@ -14938,6 +14940,7 @@ $ sudo systemctl restart systemd-logind
+             The system is RHEL 8.3 or lower
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             
+           
+@@ -14950,6 +14953,7 @@ $ sudo systemctl restart systemd-logind
+             The system is RHEL 8.4 or higher
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             
+           
+@@ -15002,6 +15006,7 @@ $ sudo systemctl restart systemd-logind
+             RHEL-08-010000 - RHEL 8 must be a vendor-supported release.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             An operating system release is considered "supported" if the vendor continues to provide security patches for the product. With an unsupported release, it will not be possible to resolve security issues discovered in the system software.
+ 
+@@ -15017,6 +15022,7 @@ Note: The life-cycle time spans and dates are subject to adjustment.RHEL-08-010070 - All RHEL 8 remote access methods must be monitored.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Remote access services, such as those providing remote access to network devices and information systems, which lack automated monitoring capabilities, increase risk and make remote user access management difficult at best.
+ 
+@@ -15033,6 +15039,7 @@ Automated monitoring of remote access sessions allows organizations to detect cy
+             RHEL-08-010110 - RHEL 8 must encrypt all stored passwords with a FIPS 140-2 approved cryptographic hashing algorithm.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Passwords need to be protected at all times, and encryption is the standard method for protecting passwords. If passwords are not encrypted, they can be plainly read (i.e., clear text) and easily compromised.
+ 
+@@ -15049,6 +15056,7 @@ FIPS 140-2 is the current standard for validating that mechanisms used to access
+             RHEL-08-010120 - RHEL 8 must employ FIPS 140-2 approved cryptographic hashing algorithms for all stored passwords.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The system must use a strong hashing algorithm to store the password.
+ 
+@@ -15063,6 +15071,7 @@ Passwords need to be protected at all times, and encryption is the standard meth
+             RHEL-08-010130 - The RHEL 8 shadow password suite must be configured to use a sufficient number of hashing rounds.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The system must use a strong hashing algorithm to store the password. The system must use a sufficient number of hashing rounds to ensure the required level of entropy.
+ 
+@@ -15077,6 +15086,7 @@ Passwords need to be protected at all times, and encryption is the standard meth
+             RHEL-08-010140 - RHEL 8 operating systems booted with United Extensible Firmware Interface (UEFI) must require authentication upon booting into single-user mode and maintenance.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If the system does not require valid authentication before it boots into single-user or maintenance mode, anyone who invokes single-user or maintenance mode is granted privileged access to all files on the system. GRUB 2 is the default boot loader for RHEL 8 and is designed to require a password to boot into single-user mode or make modifications to the boot menu.
+           
+@@ -15089,6 +15099,7 @@ Passwords need to be protected at all times, and encryption is the standard meth
+             RHEL-08-010150 - RHEL 8 operating systems booted with a BIOS must require authentication upon booting into single-user and maintenance modes.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If the system does not require valid authentication before it boots into single-user or maintenance mode, anyone who invokes single-user or maintenance mode is granted privileged access to all files on the system. GRUB 2 is the default boot loader for RHEL 8 and is designed to require a password to boot into single-user mode or make modifications to the boot menu.
+           
+@@ -15101,6 +15112,7 @@ Passwords need to be protected at all times, and encryption is the standard meth
+             RHEL-08-010151 - RHEL 8 operating systems must require authentication upon booting into rescue mode.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If the system does not require valid root authentication before it boots into emergency or rescue mode, anyone who invokes emergency or rescue mode is granted privileged access to all files on the system.
+           
+@@ -15113,6 +15125,7 @@ Passwords need to be protected at all times, and encryption is the standard meth
+             RHEL-08-010160 - The RHEL 8 pam_unix.so module must be configured in the password-auth file to use a FIPS 140-2 approved cryptographic hashing algorithm for system authentication.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Unapproved mechanisms that are used for authentication to the cryptographic module are not verified and therefore cannot be relied upon to provide confidentiality or integrity, and DoD data may be compromised.
+ 
+@@ -15129,6 +15142,7 @@ FIPS 140-2 is the current standard for validating that mechanisms used to access
+             RHEL-08-010161 - RHEL 8 must prevent system daemons from using Kerberos for authentication.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Unapproved mechanisms that are used for authentication to the cryptographic module are not verified and therefore cannot be relied upon to provide confidentiality or integrity, and DoD data may be compromised.
+ 
+@@ -15147,6 +15161,7 @@ FIPS 140-2 is the current standard for validating that mechanisms used to access
+             RHEL-08-010162 - The krb5-workstation package must not be installed on RHEL 8.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Unapproved mechanisms that are used for authentication to the cryptographic module are not verified and therefore cannot be relied upon to provide confidentiality or integrity, and DoD data may be compromised.
+ 
+@@ -15165,6 +15180,7 @@ FIPS 140-2 is the current standard for validating that mechanisms used to access
+             RHEL-08-010170 - RHEL 8 must use a Linux Security Module configured to enforce limits on system services.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without verification of the security functions, security functions may not operate correctly and the failure may go unnoticed. Security function is defined as the hardware, software, and/or firmware of the information system responsible for enforcing the system security policy and supporting the isolation of code and data on which the protection is based. Security functionality includes, but is not limited to, establishing system accounts, configuring access authorizations (i.e., permissions, privileges), setting events to be audited, and setting intrusion detection parameters.
+ 
+@@ -15179,6 +15195,7 @@ This requirement applies to operating systems performing security function verif
+             RHEL-08-010171 - RHEL 8 must have policycoreutils package installed.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without verification of the security functions, security functions may not operate correctly and the failure may go unnoticed. Security function is defined as the hardware, software, and/or firmware of the information system responsible for enforcing the system security policy and supporting the isolation of code and data on which the protection is based. Security functionality includes, but is not limited to, establishing system accounts, configuring access authorizations (i.e., permissions, privileges), setting events to be audited, and setting intrusion detection parameters.
+ 
+@@ -15193,6 +15210,7 @@ Policycoreutils contains the policy core utilities that are required for basic o
+             RHEL-08-010200 - RHEL 8 must be configured so that all network connections associated with SSH traffic are terminated at the end of the session or after 10 minutes of inactivity, except to fulfill documented and validated mission requirements.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Terminating an idle SSH session within a short time period reduces the window of opportunity for unauthorized personnel to take control of a management session enabled on the console or console port that has been left unattended. In addition, quickly terminating an idle SSH session will also free up resources committed by the managed network element.
+ 
+@@ -15211,6 +15229,7 @@ Satisfies: SRG-OS-000163-GPOS-00072, SRG-OS-000126-GPOS-00066, SRG-OS-000279-GPO
+             RHEL-08-010210 - The RHEL 8 /var/log/messages file must have mode 0640 or less permissive.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Only authorized personnel should be aware of errors and the details of the errors. Error messages are an indicator of an organization's operational state or can identify the RHEL 8 system or platform. Additionally, Personally Identifiable Information (PII) and operational information must not be revealed through error messages to unauthorized personnel or their designated representatives.
+ 
+@@ -15225,6 +15244,7 @@ The structure and content of error messages must be carefully considered by the
+             RHEL-08-010220 - The RHEL 8 /var/log/messages file must be owned by root.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Only authorized personnel should be aware of errors and the details of the errors. Error messages are an indicator of an organization's operational state or can identify the RHEL 8 system or platform. Additionally, Personally Identifiable Information (PII) and operational information must not be revealed through error messages to unauthorized personnel or their designated representatives.
+ 
+@@ -15239,6 +15259,7 @@ The structure and content of error messages must be carefully considered by the
+             RHEL-08-010230 - The RHEL 8 /var/log/messages file must be group-owned by root.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Only authorized personnel should be aware of errors and the details of the errors. Error messages are an indicator of an organization's operational state or can identify the RHEL 8 system or platform. Additionally, Personally Identifiable Information (PII) and operational information must not be revealed through error messages to unauthorized personnel or their designated representatives.
+ 
+@@ -15253,6 +15274,7 @@ The structure and content of error messages must be carefully considered by the
+             RHEL-08-010240 - The RHEL 8 /var/log directory must have mode 0755 or less permissive.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Only authorized personnel should be aware of errors and the details of the errors. Error messages are an indicator of an organization's operational state or can identify the RHEL 8 system or platform. Additionally, Personally Identifiable Information (PII) and operational information must not be revealed through error messages to unauthorized personnel or their designated representatives.
+ 
+@@ -15267,6 +15289,7 @@ The structure and content of error messages must be carefully considered by the
+             RHEL-08-010250 - The RHEL 8 /var/log directory must be owned by root.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Only authorized personnel should be aware of errors and the details of the errors. Error messages are an indicator of an organization's operational state or can identify the RHEL 8 system or platform. Additionally, Personally Identifiable Information (PII) and operational information must not be revealed through error messages to unauthorized personnel or their designated representatives.
+ 
+@@ -15281,6 +15304,7 @@ The structure and content of error messages must be carefully considered by the
+             RHEL-08-010260 - The RHEL 8 /var/log directory must be group-owned by root.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Only authorized personnel should be aware of errors and the details of the errors. Error messages are an indicator of an organization's operational state or can identify the RHEL 8 system or platform. Additionally, Personally Identifiable Information (PII) and operational information must not be revealed through error messages to unauthorized personnel or their designated representatives.
+ 
+@@ -15295,6 +15319,7 @@ The structure and content of error messages must be carefully considered by the
+             RHEL-08-010292 - RHEL 8 must ensure the SSH server uses strong entropy.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The most important characteristic of a random number generator is its randomness, namely its ability to deliver random numbers that are impossible to predict.  Entropy in computer security is associated with the unpredictability of a source of randomness.  The random source with high entropy tends to achieve a uniform distribution of random values.  Random number generators are one of the most important building blocks of cryptosystems.
+ 
+@@ -15309,6 +15334,7 @@ The SSH implementation in RHEL8 uses the OPENSSL library, which does not use hig
+             RHEL-08-010294 - The RHEL 8 operating system must implement DoD-approved TLS encryption in the OpenSSL package.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without cryptographic integrity protections, information can be altered by unauthorized users without detection.
+ 
+@@ -15329,6 +15355,7 @@ Satisfies: SRG-OS-000250-GPOS-00093, SRG-OS-000393-GPOS-00173, SRG-OS-000394-GPO
+             RHEL-08-010300 - RHEL 8 system commands must have mode 755 or less permissive.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If RHEL 8 were to allow any user to make changes to software libraries, then those changes might be implemented without undergoing the appropriate testing and approvals that are part of a robust change management process.
+ 
+@@ -15343,6 +15370,7 @@ This requirement applies to RHEL 8 with software libraries that are accessible a
+             RHEL-08-010310 - RHEL 8 system commands must be owned by root.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If RHEL 8 were to allow any user to make changes to software libraries, then those changes might be implemented without undergoing the appropriate testing and approvals that are part of a robust change management process.
+ 
+@@ -15357,6 +15385,7 @@ This requirement applies to RHEL 8 with software libraries that are accessible a
+             RHEL-08-010320 - RHEL 8 system commands must be group-owned by root or a system account.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If RHEL 8 were to allow any user to make changes to software libraries, then those changes might be implemented without undergoing the appropriate testing and approvals that are part of a robust change management process.
+ 
+@@ -15371,6 +15400,7 @@ This requirement applies to RHEL 8 with software libraries that are accessible a
+             RHEL-08-010330 - RHEL 8 library files must have mode 755 or less permissive.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If RHEL 8 were to allow any user to make changes to software libraries, then those changes might be implemented without undergoing the appropriate testing and approvals that are part of a robust change management process.
+ 
+@@ -15385,6 +15415,7 @@ This requirement applies to RHEL 8 with software libraries that are accessible a
+             RHEL-08-010340 - RHEL 8 library files must be owned by root.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If RHEL 8 were to allow any user to make changes to software libraries, then those changes might be implemented without undergoing the appropriate testing and approvals that are part of a robust change management process.
+ 
+@@ -15399,6 +15430,7 @@ This requirement applies to RHEL 8 with software libraries that are accessible a
+             RHEL-08-010350 - RHEL 8 library files must be group-owned by root or a system account.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If RHEL 8 were to allow any user to make changes to software libraries, then those changes might be implemented without undergoing the appropriate testing and approvals that are part of a robust change management process.
+ 
+@@ -15413,6 +15445,7 @@ This requirement applies to RHEL 8 with software libraries that are accessible a
+             RHEL-08-010370 - RHEL 8 must prevent the installation of software, patches, service packs, device drivers, or operating system components from a repository without verification they have been digitally signed using a certificate that is issued by a Certificate Authority (CA) that is recognized and approved by the organization.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Changes to any software components can have significant effects on the overall security of the operating system. This requirement ensures the software has not been tampered with and that it has been provided by a trusted vendor.
+ 
+@@ -15429,6 +15462,7 @@ Verifying the authenticity of the software prior to installation validates the i
+             RHEL-08-010371 - RHEL 8 must prevent the installation of software, patches, service packs, device drivers, or operating system components of local packages without verification they have been digitally signed using a certificate that is issued by a Certificate Authority (CA) that is recognized and approved by the organization.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Changes to any software components can have significant effects on the overall security of the operating system. This requirement ensures the software has not been tampered with and that it has been provided by a trusted vendor.
+ 
+@@ -15445,6 +15479,7 @@ Verifying the authenticity of the software prior to installation validates the i
+             RHEL-08-010372 - RHEL 8 must prevent the loading of a new kernel for later execution.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Changes to any software components can have significant effects on the overall security of the operating system. This requirement ensures the software has not been tampered with and that it has been provided by a trusted vendor.
+ 
+@@ -15467,6 +15502,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-010373 - RHEL 8 must enable kernel parameters to enforce discretionary access control on symlinks.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Discretionary Access Control (DAC) is based on the notion that individual users are "owners" of objects and therefore have discretion over who should be authorized to access the object and in which mode (e.g., read or write). Ownership is usually acquired as a consequence of creating the object or via specified ownership assignment. DAC allows the owner to determine who will have access to objects they control. An example of DAC includes user-controlled file permissions.
+ 
+@@ -15493,6 +15529,7 @@ Satisfies: SRG-OS-000312-GPOS-00122, SRG-OS-000312-GPOS-00123, SRG-OS-000312-GPO
+             RHEL-08-010374 - RHEL 8 must enable kernel parameters to enforce discretionary access control on hardlinks.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Discretionary Access Control (DAC) is based on the notion that individual users are "owners" of objects and therefore have discretion over who should be authorized to access the object and in which mode (e.g., read or write). Ownership is usually acquired as a consequence of creating the object or via specified ownership assignment. DAC allows the owner to determine who will have access to objects they control. An example of DAC includes user-controlled file permissions.
+ 
+@@ -15519,6 +15556,7 @@ Satisfies: SRG-OS-000312-GPOS-00122, SRG-OS-000312-GPOS-00123, SRG-OS-000312-GPO
+             RHEL-08-010375 - RHEL 8 must restrict access to the kernel message buffer.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Preventing unauthorized information transfers mitigates the risk of information, including encrypted representations of information, produced by the actions of prior users/roles (or the actions of processes acting on behalf of prior users/roles) from being available to any current users/roles (or current processes) that obtain access to shared system resources (e.g., registers, main memory, hard disks) after those resources have been released back to information systems. The control of information in shared resources is also commonly referred to as object reuse and residual information protection.
+ 
+@@ -15545,6 +15583,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-010376 - RHEL 8 must prevent kernel profiling by unprivileged users.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Preventing unauthorized information transfers mitigates the risk of information, including encrypted representations of information, produced by the actions of prior users/roles (or the actions of processes acting on behalf of prior users/roles) from being available to any current users/roles (or current processes) that obtain access to shared system resources (e.g., registers, main memory, hard disks) after those resources have been released back to information systems. The control of information in shared resources is also commonly referred to as object reuse and residual information protection.
+ 
+@@ -15571,6 +15610,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-010380 - RHEL 8 must require users to provide a password for privilege escalation.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without reauthentication, users may access resources or perform tasks for which they do not have authorization.
+ 
+@@ -15587,6 +15627,7 @@ Satisfies: SRG-OS-000373-GPOS-00156, SRG-OS-000373-GPOS-00157, SRG-OS-000373-GPO
+             RHEL-08-010381 - RHEL 8 must require users to reauthenticate for privilege escalation.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without reauthentication, users may access resources or perform tasks for which they do not have authorization.
+ 
+@@ -15603,6 +15644,7 @@ Satisfies: SRG-OS-000373-GPOS-00156, SRG-OS-000373-GPOS-00157, SRG-OS-000373-GPO
+             RHEL-08-010390 - RHEL 8 must have the packages required for multifactor authentication installed.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Using an authentication device, such as a DoD Common Access Card (CAC) or token that is separate from the information system, ensures that even if the information system is compromised, credentials stored on the authentication device will not be affected.
+ 
+@@ -15623,6 +15665,7 @@ This requirement only applies to components where this is specific to the functi
+             RHEL-08-010430 - RHEL 8 must implement address space layout randomization (ASLR) to protect its memory from unauthorized code execution.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Some adversaries launch attacks with the intent of executing code in non-executable regions of memory or in memory locations that are prohibited. Security safeguards employed to protect memory include, for example, data execution prevention and address space layout randomization. Data execution prevention safeguards can be either hardware-enforced or software-enforced with hardware providing the greater strength of mechanism.
+ 
+@@ -15645,6 +15688,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-010440 - YUM must remove all software components after updated versions have been installed on RHEL 8.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Previous versions of software components that are not removed from the information system after updates have been installed may be exploited by adversaries. Some information technology products may remove older versions of software automatically from the information system.
+           
+@@ -15657,6 +15701,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-010450 - RHEL 8 must enable the SELinux targeted policy.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without verification of the security functions, security functions may not operate correctly and the failure may go unnoticed. Security function is defined as the hardware, software, and/or firmware of the information system responsible for enforcing the system security policy and supporting the isolation of code and data on which the protection is based. Security functionality includes, but is not limited to, establishing system accounts, configuring access authorizations (i.e., permissions, privileges), setting events to be audited, and setting intrusion detection parameters.
+ 
+@@ -15671,6 +15716,7 @@ This requirement applies to operating systems performing security function verif
+             RHEL-08-010460 - There must be no shosts.equiv files on the RHEL 8 operating system.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The "shosts.equiv" files are used to configure host-based authentication for the system via SSH. Host-based authentication is not sufficient for preventing unauthorized access to the system, as it does not require interactive identification and authentication of a connection request, or for the use of two-factor authentication.
+           
+@@ -15683,6 +15729,7 @@ This requirement applies to operating systems performing security function verif
+             RHEL-08-010470 - There must be no .shosts files on the RHEL 8 operating system.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The ".shosts" files are used to configure host-based authentication for individual users or the system via SSH. Host-based authentication is not sufficient for preventing unauthorized access to the system, as it does not require interactive identification and authentication of a connection request, or for the use of two-factor authentication.
+           
+@@ -15695,6 +15742,7 @@ This requirement applies to operating systems performing security function verif
+             RHEL-08-010480 - The RHEL 8 SSH public host key files must have mode 0644 or less permissive.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If a public host key file is modified by an unauthorized user, the SSH service may be compromised.
+           
+@@ -15707,6 +15755,7 @@ This requirement applies to operating systems performing security function verif
+             RHEL-08-010490 - The RHEL 8 SSH private host key files must have mode 0640 or less permissive.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If an unauthorized user obtains the private SSH host key file, the host could be impersonated.
+           
+@@ -15719,6 +15768,7 @@ This requirement applies to operating systems performing security function verif
+             RHEL-08-010500 - The RHEL 8 SSH daemon must perform strict mode checking of home directory configuration files.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If other users have access to modify user-specific SSH configuration files, they may be able to log on to the system as another user.
+           
+@@ -15731,6 +15781,7 @@ This requirement applies to operating systems performing security function verif
+             RHEL-08-010520 - The RHEL 8 SSH daemon must not allow authentication using known host’s authentication.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Configuring this setting for the SSH daemon provides additional assurance that remote logon via SSH will require a password, even in the event of misconfiguration elsewhere.
+           
+@@ -15743,6 +15794,7 @@ This requirement applies to operating systems performing security function verif
+             RHEL-08-010521 - The RHEL 8 SSH daemon must not allow Kerberos authentication, except to fulfill documented and validated mission requirements.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Configuring these settings for the SSH daemon provides additional assurance that remote logon via SSH will not use unused methods of authentication, even in the event of misconfiguration elsewhere.
+           
+@@ -15755,6 +15807,7 @@ This requirement applies to operating systems performing security function verif
+             RHEL-08-010540 - RHEL 8 must use a separate file system for /var.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The use of separate file systems for different paths can protect the system from failures resulting from a file system becoming full or failing.
+           
+@@ -15767,6 +15820,7 @@ This requirement applies to operating systems performing security function verif
+             RHEL-08-010541 - RHEL 8 must use a separate file system for /var/log.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The use of separate file systems for different paths can protect the system from failures resulting from a file system becoming full or failing.
+           
+@@ -15779,6 +15833,7 @@ This requirement applies to operating systems performing security function verif
+             RHEL-08-010542 - RHEL 8 must use a separate file system for the system audit data path.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The use of separate file systems for different paths can protect the system from failures resulting from a file system becoming full or failing.
+           
+@@ -15791,6 +15846,7 @@ This requirement applies to operating systems performing security function verif
+             RHEL-08-010543 - A separate RHEL 8 filesystem must be used for the /tmp directory.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The use of separate file systems for different paths can protect the system from failures resulting from a file system becoming full or failing.
+           
+@@ -15803,6 +15859,7 @@ This requirement applies to operating systems performing security function verif
+             RHEL-08-010550 - RHEL 8 must not permit direct logons to the root account using remote access via SSH.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Even though the communications channel may be encrypted, an additional layer of security is gained by extending the policy of not logging on directly as root. In addition, logging on with a user-specific account provides individual accountability of actions performed on the system.
+           
+@@ -15815,6 +15872,7 @@ This requirement applies to operating systems performing security function verif
+             RHEL-08-010561 - The rsyslog service must be running in RHEL 8.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Configuring RHEL 8 to implement organization-wide security implementation guides and security checklists ensures compliance with federal standards and establishes a common security baseline across the DoD that reflects the most restrictive security posture consistent with operational requirements.
+ 
+@@ -15829,6 +15887,7 @@ Configuration settings are the set of parameters that can be changed in hardware
+             RHEL-08-010570 - RHEL 8 must prevent files with the setuid and setgid bit set from being executed on file systems that contain user home directories.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The "nosuid" mount option causes the system not to execute "setuid" and "setgid" files with owner privileges. This option must be used for mounting any file system not containing approved "setuid" and "setguid" files. Executing files from untrusted file systems increases the opportunity for unprivileged users to attain unauthorized administrative access.
+           
+@@ -15841,6 +15900,7 @@ Configuration settings are the set of parameters that can be changed in hardware
+             RHEL-08-010571 - RHEL 8 must prevent files with the setuid and setgid bit set from being executed on the /boot directory.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The "nosuid" mount option causes the system not to execute "setuid" and "setgid" files with owner privileges. This option must be used for mounting any file system not containing approved "setuid" and "setguid" files. Executing files from untrusted file systems increases the opportunity for unprivileged users to attain unauthorized administrative access.
+           
+@@ -15853,6 +15913,7 @@ Configuration settings are the set of parameters that can be changed in hardware
+             RHEL-08-010580 - RHEL 8 must prevent special devices on non-root local partitions.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The "nodev" mount option causes the system to not interpret character or block special devices. Executing character or block special devices from untrusted file systems increases the opportunity for unprivileged users to attain unauthorized administrative access.  The only legitimate location for device files is the /dev directory located on the root partition.
+           
+@@ -15865,6 +15926,7 @@ Configuration settings are the set of parameters that can be changed in hardware
+             RHEL-08-010630 - RHEL 8 must prevent code from being executed on file systems that are imported via Network File System (NFS).
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The "noexec" mount option causes the system not to execute binary files. This option must be used for mounting any file system not containing approved binary as they may be incompatible. Executing files from untrusted file systems increases the opportunity for unprivileged users to attain unauthorized administrative access.
+           
+@@ -15877,6 +15939,7 @@ Configuration settings are the set of parameters that can be changed in hardware
+             RHEL-08-010640 - RHEL 8 must prevent special devices on file systems that are imported via Network File System (NFS).
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The "nodev" mount option causes the system to not interpret character or block special devices. Executing character or block special devices from untrusted file systems increases the opportunity for unprivileged users to attain unauthorized administrative access.
+           
+@@ -15889,6 +15952,7 @@ Configuration settings are the set of parameters that can be changed in hardware
+             RHEL-08-010650 - RHEL 8 must prevent files with the setuid and setgid bit set from being executed on file systems that are imported via Network File System (NFS).
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The "nosuid" mount option causes the system not to execute "setuid" and "setgid" files with owner privileges. This option must be used for mounting any file system not containing approved "setuid" and "setguid" files. Executing files from untrusted file systems increases the opportunity for unprivileged users to attain unauthorized administrative access.
+           
+@@ -15901,6 +15965,7 @@ Configuration settings are the set of parameters that can be changed in hardware
+             RHEL-08-010671 - RHEL 8 must disable the kernel.core_pattern.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -15921,6 +15986,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-010672 - RHEL 8 must disable acquiring, saving, and processing core dumps.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -15937,6 +16003,7 @@ When the kernel invokes systemd-coredumpt to handle a core dump, it runs in priv
+             RHEL-08-010673 - RHEL 8 must disable core dumps for all users.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -15951,6 +16018,7 @@ A core dump includes a memory image taken at the time the operating system termi
+             RHEL-08-010674 - RHEL 8 must disable storing core dumps.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -15965,6 +16033,7 @@ A core dump includes a memory image taken at the time the operating system termi
+             RHEL-08-010675 - RHEL 8 must disable core dump backtraces.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -15979,6 +16048,7 @@ A core dump includes a memory image taken at the time the operating system termi
+             RHEL-08-010680 - For RHEL 8 systems using Domain Name Servers (DNS) resolution, at least two name servers must be configured.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             To provide availability for name resolution services, multiple redundant name servers are mandated. A failure in name resolution could lead to the failure of security functions requiring name resolution, which may include time synchronization, centralized authentication, and remote system logging.
+           
+@@ -15991,6 +16061,7 @@ A core dump includes a memory image taken at the time the operating system termi
+             RHEL-08-010720 - All RHEL 8 local interactive users must have a home directory assigned in the /etc/passwd file.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If local interactive users are not assigned a valid home directory, there is no place for the storage and control of files they should own.
+           
+@@ -16003,6 +16074,7 @@ A core dump includes a memory image taken at the time the operating system termi
+             RHEL-08-010730 - All RHEL 8 local interactive user home directories must have mode 0750 or less permissive.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Excessive permissions on local interactive user home directories may allow unauthorized access to user files by other users.
+           
+@@ -16015,6 +16087,7 @@ A core dump includes a memory image taken at the time the operating system termi
+             RHEL-08-010760 - All RHEL 8 local interactive user accounts must be assigned a home directory upon creation.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If local interactive users are not assigned a valid home directory, there is no place for the storage and control of files they should own.
+           
+@@ -16027,6 +16100,7 @@ A core dump includes a memory image taken at the time the operating system termi
+             RHEL-08-010770 - All RHEL 8 local initialization files must have mode 0740 or less permissive.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Local initialization files are used to configure the user's shell environment upon logon. Malicious modification of these files could compromise accounts upon logon.
+           
+@@ -16039,6 +16113,7 @@ A core dump includes a memory image taken at the time the operating system termi
+             RHEL-08-010800 - A separate RHEL 8 filesystem must be used for user home directories (such as /home or an equivalent).
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The use of separate file systems for different paths can protect the system from failures resulting from a file system becoming full or failing.
+           
+@@ -16051,6 +16126,7 @@ A core dump includes a memory image taken at the time the operating system termi
+             RHEL-08-010820 - Unattended or automatic logon via the RHEL 8 graphical user interface must not be allowed.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Failure to restrict system access to authenticated users negatively impacts operating system security.
+           
+@@ -16063,6 +16139,7 @@ A core dump includes a memory image taken at the time the operating system termi
+             RHEL-08-010830 - RHEL 8 must not allow users to override SSH environment variables.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             SSH environment options potentially allow users to bypass access restriction in some configurations.
+           
+@@ -16075,6 +16152,7 @@ A core dump includes a memory image taken at the time the operating system termi
+             RHEL-08-020010 - RHEL 8 must automatically lock an account when three unsuccessful logon attempts occur.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
+ 
+@@ -16093,6 +16171,7 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
+             RHEL-08-020011 - RHEL 8 must automatically lock an account when three unsuccessful logon attempts occur.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
+ 
+@@ -16111,6 +16190,7 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
+             RHEL-08-020012 - RHEL 8 must automatically lock an account when three unsuccessful logon attempts occur during a 15-minute time period.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
+ 
+@@ -16129,6 +16209,7 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
+             RHEL-08-020013 - RHEL 8 must automatically lock an account when three unsuccessful logon attempts occur during a 15-minute time period.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
+ 
+@@ -16147,6 +16228,7 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
+             RHEL-08-020014 - RHEL 8 must automatically lock an account until the locked account is released by an administrator when three unsuccessful logon attempts occur during a 15-minute time period.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
+ 
+@@ -16165,6 +16247,7 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
+             RHEL-08-020015 - RHEL 8 must automatically lock an account until the locked account is released by an administrator when three unsuccessful logon attempts occur during a 15-minute time period.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
+ 
+@@ -16183,6 +16266,7 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
+             RHEL-08-020018 - RHEL 8 must prevent system messages from being presented when three unsuccessful logon attempts occur.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
+ 
+@@ -16201,6 +16285,7 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
+             RHEL-08-020019 - RHEL 8 must prevent system messages from being presented when three unsuccessful logon attempts occur.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
+ 
+@@ -16219,6 +16304,7 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
+             RHEL-08-020020 - RHEL 8 must log user name information when unsuccessful logon attempts occur.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
+ 
+@@ -16239,6 +16325,7 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
+             RHEL-08-020021 - RHEL 8 must log user name information when unsuccessful logon attempts occur.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
+ 
+@@ -16257,6 +16344,7 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
+             RHEL-08-020022 - RHEL 8 must include root when automatically locking an account until the locked account is released by an administrator when three unsuccessful logon attempts occur during a 15-minute time period.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
+ 
+@@ -16277,6 +16365,7 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
+             RHEL-08-020023 - RHEL 8 must include root when automatically locking an account until the locked account is released by an administrator when three unsuccessful logon attempts occur during a 15-minute time period.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             By limiting the number of failed logon attempts, the risk of unauthorized system access via user password guessing, otherwise known as brute-force attacks, is reduced. Limits are imposed by locking the account.
+ 
+@@ -16295,6 +16384,7 @@ Satisfies: SRG-OS-000021-GPOS-00005, SRG-OS-000329-GPOS-00128
+             RHEL-08-020024 - RHEL 8 must limit the number of concurrent sessions to ten for all accounts and/or account types.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Operating system management includes the ability to control the number of users and user sessions that utilize an operating system. Limiting the number of allowed users and sessions per user is helpful in reducing the risks related to DoS attacks.
+ 
+@@ -16309,6 +16399,7 @@ This requirement addresses concurrent sessions for information system accounts a
+             RHEL-08-020050 - RHEL 8 must be able to initiate directly a session lock for all connection types using smartcard when the smartcard is removed.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             A session lock is a temporary action taken when a user stops work and moves away from the immediate physical vicinity of the information system but does not want to log out because of the temporary nature of the absence.
+ 
+@@ -16325,6 +16416,7 @@ Satisfies: SRG-OS-000028-GPOS-00009, SRG-OS-000030-GPOS-00011
+             RHEL-08-020080 - RHEL 8 must prevent a user from overriding the session lock-delay setting for the graphical user interface.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             A session time-out lock is a temporary action taken when a user stops work and moves away from the immediate physical vicinity of the information system but does not log out because of the temporary nature of the absence. Rather than relying on the user to manually lock their operating system session prior to vacating the vicinity, operating systems need to be able to identify when a user's session has idled and take action to initiate the session lock.
+ 
+@@ -16345,6 +16437,7 @@ Satisfies: SRG-OS-000029-GPOS-00010, SRG-OS-000031-GPOS-00012, SRG-OS-000480-GPO
+             RHEL-08-020100 - RHEL 8 must ensure the password complexity module is enabled in the password-auth file.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Use of a complex password helps to increase the time and resources required to compromise the password. Password complexity, or strength, is a measure of the effectiveness of a password in resisting attempts at guessing and brute-force attacks. "pwquality" enforces complex password construction configuration and has the ability to limit brute-force attacks on the system.
+ 
+@@ -16361,6 +16454,7 @@ RHEL 8 utilizes "pwquality" as a mechanism to enforce password complexity. This
+             RHEL-08-020110 - RHEL 8 must enforce password complexity by requiring that at least one uppercase character be used.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Use of a complex password helps to increase the time and resources required to compromise the password. Password complexity, or strength, is a measure of the effectiveness of a password in resisting attempts at guessing and brute-force attacks.
+ 
+@@ -16377,6 +16471,7 @@ RHEL 8 utilizes pwquality as a mechanism to enforce password complexity. Note th
+             RHEL-08-020120 - RHEL 8 must enforce password complexity by requiring that at least one lower-case character be used.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Use of a complex password helps to increase the time and resources required to compromise the password. Password complexity, or strength, is a measure of the effectiveness of a password in resisting attempts at guessing and brute-force attacks.
+ 
+@@ -16393,6 +16488,7 @@ RHEL 8 utilizes pwquality as a mechanism to enforce password complexity. Note th
+             RHEL-08-020130 - RHEL 8 must enforce password complexity by requiring that at least one numeric character be used.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Use of a complex password helps to increase the time and resources required to compromise the password. Password complexity, or strength, is a measure of the effectiveness of a password in resisting attempts at guessing and brute-force attacks.
+ 
+@@ -16409,6 +16505,7 @@ RHEL 8 utilizes "pwquality" as a mechanism to enforce password complexity. Note
+             RHEL-08-020140 - RHEL 8 must require the maximum number of repeating characters of the same character class be limited to four when passwords are changed.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Use of a complex password helps to increase the time and resources required to compromise the password. Password complexity, or strength, is a measure of the effectiveness of a password in resisting attempts at guessing and brute-force attacks.
+ 
+@@ -16425,6 +16522,7 @@ RHEL 8 utilizes "pwquality" as a mechanism to enforce password complexity. The "
+             RHEL-08-020150 - RHEL 8 must require the maximum number of repeating characters be limited to three when passwords are changed.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Use of a complex password helps to increase the time and resources required to compromise the password. Password complexity, or strength, is a measure of the effectiveness of a password in resisting attempts at guessing and brute-force attacks.
+ 
+@@ -16441,6 +16539,7 @@ RHEL 8 utilizes "pwquality" as a mechanism to enforce password complexity. The "
+             RHEL-08-020160 - RHEL 8 must require the change of at least four character classes when passwords are changed.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Use of a complex password helps to increase the time and resources required to compromise the password. Password complexity, or strength, is a measure of the effectiveness of a password in resisting attempts at guessing and brute-force attacks.
+ 
+@@ -16457,6 +16556,7 @@ RHEL 8 utilizes "pwquality" as a mechanism to enforce password complexity. The "
+             RHEL-08-020170 - RHEL 8 must require the change of at least 8 characters when passwords are changed.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Use of a complex password helps to increase the time and resources required to compromise the password. Password complexity, or strength, is a measure of the effectiveness of a password in resisting attempts at guessing and brute-force attacks.
+ 
+@@ -16473,6 +16573,7 @@ RHEL 8 utilizes "pwquality" as a mechanism to enforce password complexity. The "
+             RHEL-08-020180 - RHEL 8 passwords must have a 24 hours/1 day minimum password lifetime restriction in /etc/shadow.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Enforcing a minimum password lifetime helps to prevent repeated password changes to defeat the password reuse or history enforcement requirement. If users are allowed to immediately and continually change their password, the password could be repeatedly changed in a short period of time to defeat the organization's policy regarding password reuse.
+           
+@@ -16485,6 +16586,7 @@ RHEL 8 utilizes "pwquality" as a mechanism to enforce password complexity. The "
+             RHEL-08-020190 - RHEL 8 passwords for new users or password changes must have a 24 hours/1 day minimum password lifetime restriction in /etc/login.defs.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Enforcing a minimum password lifetime helps to prevent repeated password changes to defeat the password reuse or history enforcement requirement. If users are allowed to immediately and continually change their password, the password could be repeatedly changed in a short period of time to defeat the organization's policy regarding password reuse.
+           
+@@ -16497,6 +16599,7 @@ RHEL 8 utilizes "pwquality" as a mechanism to enforce password complexity. The "
+             RHEL-08-020200 - RHEL 8 user account passwords must have a 60-day maximum password lifetime restriction.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Any password, no matter how complex, can eventually be cracked. Therefore, passwords need to be changed periodically. If RHEL 8 does not limit the lifetime of passwords and force users to change their passwords, there is the risk that RHEL 8 passwords could be compromised.
+           
+@@ -16509,6 +16612,7 @@ RHEL 8 utilizes "pwquality" as a mechanism to enforce password complexity. The "
+             RHEL-08-020210 - RHEL 8 user account passwords must be configured so that existing passwords are restricted to a 60-day maximum lifetime.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Any password, no matter how complex, can eventually be cracked. Therefore, passwords need to be changed periodically. If RHEL 8 does not limit the lifetime of passwords and force users to change their passwords, there is the risk that RHEL 8 passwords could be compromised.
+           
+@@ -16521,6 +16625,7 @@ RHEL 8 utilizes "pwquality" as a mechanism to enforce password complexity. The "
+             RHEL-08-020230 - RHEL 8 passwords must have a minimum of 15 characters.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The shorter the password, the lower the number of possible combinations that need to be tested before the password is compromised.
+ 
+@@ -16541,6 +16646,7 @@ The DoD minimum password requirement is 15 characters.
+             RHEL-08-020231 - RHEL 8 passwords for new users must have a minimum of 15 characters.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The shorter the password, the lower the number of possible combinations that need to be tested before the password is compromised.
+ 
+@@ -16557,6 +16663,7 @@ The DoD minimum password requirement is 15 characters.
+             RHEL-08-020240 - RHEL 8 duplicate User IDs (UIDs) must not exist for interactive users.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             To ensure accountability and prevent unauthenticated access, interactive users must be identified and authenticated to prevent potential misuse and compromise of the system.
+ 
+@@ -16577,6 +16684,7 @@ Satisfies: SRG-OS-000104-GPOS-00051, SRG-OS-000121-GPOS-00062, SRG-OS-000042-GPO
+             RHEL-08-020260 - RHEL 8 account identifiers (individuals, groups, roles, and devices) must be disabled after 35 days of inactivity.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Inactive identifiers pose a risk to systems and applications because attackers may exploit an inactive identifier and potentially obtain undetected access to the system. Owners of inactive accounts will not notice if unauthorized access to their user account has been obtained.
+ 
+@@ -16591,6 +16699,7 @@ RHEL 8 needs to track periods of inactivity and disable application identifiers
+             RHEL-08-020280 - All RHEL 8 passwords must contain at least one special character.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Use of a complex password helps to increase the time and resources required to compromise the password. Password complexity, or strength, is a measure of the effectiveness of a password in resisting attempts at guessing and brute-force attacks.
+ 
+@@ -16607,6 +16716,7 @@ RHEL 8 utilizes "pwquality" as a mechanism to enforce password complexity. Note
+             RHEL-08-020290 - RHEL 8 must prohibit the use of cached authentications after one day.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If cached authentication information is out-of-date, the validity of the authentication information may be questionable.
+ 
+@@ -16621,6 +16731,7 @@ RHEL 8 includes multiple options for configuring authentication, but this requir
+             RHEL-08-020300 - RHEL 8 must prevent the use of dictionary words for passwords.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If RHEL 8 allows the user to select passwords based on dictionary words, this increases the chances of password compromise by increasing the opportunity for successful guesses, and brute-force attacks.
+           
+@@ -16633,6 +16744,7 @@ RHEL 8 includes multiple options for configuring authentication, but this requir
+             RHEL-08-020310 - RHEL 8 must enforce a delay of at least four seconds between logon prompts following a failed logon attempt.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Configuring the operating system to implement organization-wide security implementation guides and security checklists verifies compliance with federal standards and establishes a common security baseline across the DoD that reflects the most restrictive security posture consistent with operational requirements.
+ 
+@@ -16647,6 +16759,7 @@ Configuration settings are the set of parameters that can be changed in hardware
+             RHEL-08-020330 - RHEL 8 must not allow accounts configured with blank or null passwords.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If an account has an empty password, anyone could log on and run commands with the privileges of that account. Accounts with empty passwords should never be used in operational environments.
+           
+@@ -16659,6 +16772,7 @@ Configuration settings are the set of parameters that can be changed in hardware
+             RHEL-08-020340 - RHEL 8 must display the date and time of the last successful account logon upon logon.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Providing users with feedback on when account accesses last occurred facilitates user recognition and reporting of unauthorized account use.
+           
+@@ -16671,6 +16785,7 @@ Configuration settings are the set of parameters that can be changed in hardware
+             RHEL-08-020350 - RHEL 8 must display the date and time of the last successful account logon upon an SSH logon.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Providing users with feedback on when account accesses via SSH last occurred facilitates user recognition and reporting of unauthorized account use.
+           
+@@ -16683,6 +16798,7 @@ Configuration settings are the set of parameters that can be changed in hardware
+             RHEL-08-020351 - RHEL 8 must define default permissions for all authenticated users in such a way that the user can only read and modify their own files.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Setting the most restrictive default permissions ensures that when new accounts are created, they do not have unnecessary access.
+           
+@@ -16695,6 +16811,7 @@ Configuration settings are the set of parameters that can be changed in hardware
+             RHEL-08-030000 - The RHEL 8 audit system must be configured to audit the execution of privileged functions and prevent all software from executing at higher privilege levels than users executing the software.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Misuse of privileged functions, either intentionally or unintentionally by authorized users, or by unauthorized external entities that have compromised information system accounts, is a serious and ongoing concern and can have significant adverse impacts on organizations. Auditing the use of privileged functions is one way to detect such misuse and identify the risk from insider threats and the advanced persistent threat.
+ 
+@@ -16709,6 +16826,7 @@ Satisfies: SRG-OS-000326-GPOS-00126, SRG-OS-000327-GPOS-00127
+             RHEL-08-030020 - The RHEL 8 System Administrator (SA) and Information System Security Officer (ISSO) (at a minimum) must be alerted of an audit processing failure event.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is critical for the appropriate personnel to be aware if a system is at risk of failing to process audit logs as required. Without this notification, the security personnel may be unaware of an impending failure of the audit capability, and system operation may be adversely affected.
+ 
+@@ -16725,6 +16843,7 @@ This requirement applies to each audit data storage repository (i.e., distinct i
+             RHEL-08-030030 - The RHEL 8 Information System Security Officer (ISSO) and System Administrator (SA) (at a minimum) must have mail aliases to be notified of an audit processing failure.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is critical for the appropriate personnel to be aware if a system is at risk of failing to process audit logs as required. Without this notification, the security personnel may be unaware of an impending failure of the audit capability, and system operation may be adversely affected.
+ 
+@@ -16741,6 +16860,7 @@ This requirement applies to each audit data storage repository (i.e., distinct i
+             RHEL-08-030040 - The RHEL 8 System must take appropriate action when an audit processing failure occurs.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is critical for the appropriate personnel to be aware if a system is at risk of failing to process audit logs as required. Without this notification, the security personnel may be unaware of an impending failure of the audit capability, and system operation may be adversely affected.
+ 
+@@ -16757,6 +16877,7 @@ This requirement applies to each audit data storage repository (i.e., distinct i
+             RHEL-08-030060 - The RHEL 8 audit system must take appropriate action when the audit storage volume is full.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is critical that when RHEL 8 is at risk of failing to process audit logs as required, it takes action to mitigate the failure. Audit processing failures include software/hardware errors; failures in the audit capturing mechanisms; and audit storage capacity being reached or exceeded. Responses to audit failure depend upon the nature of the failure mode.
+ 
+@@ -16775,6 +16896,7 @@ When availability is an overriding concern, other approved actions in response t
+             RHEL-08-030061 - The RHEL 8 audit system must audit local events.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without establishing what type of events occurred, the source of events, where events occurred, and the outcome of events, it would be difficult to establish, correlate, and investigate the events leading up to an outage or attack.
+ 
+@@ -16789,6 +16911,7 @@ Audit record content that may be necessary to satisfy this requirement includes,
+             RHEL-08-030062 - RHEL 8 must label all off-loaded audit logs before sending them to the central log server.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without establishing what type of events occurred, the source of events, where events occurred, and the outcome of events, it would be difficult to establish, correlate, and investigate the events leading up to an outage or attack.
+ 
+@@ -16807,6 +16930,7 @@ When audit logs are not labeled before they are sent to a central log server, th
+             RHEL-08-030063 - RHEL 8 must resolve audit information before writing to disk.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without establishing what type of events occurred, the source of events, where events occurred, and the outcome of events, it would be difficult to establish, correlate, and investigate the events leading up to an outage or attack.
+ 
+@@ -16823,6 +16947,7 @@ Enriched logging aids in making sense of who, what, and when events occur on a s
+             RHEL-08-030070 - RHEL 8 audit logs must have a mode of 0600 or less permissive to prevent unauthorized read access.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Only authorized personnel should be aware of errors and the details of the errors. Error messages are an indicator of an organization's operational state or can identify the RHEL 8 system or platform. Additionally, Personally Identifiable Information (PII) and operational information must not be revealed through error messages to unauthorized personnel or their designated representatives.
+ 
+@@ -16839,6 +16964,7 @@ Satisfies: SRG-OS-000057-GPOS-00027, SRG-OS-000058-GPOS-00028, SRG-OS-000059-GPO
+             RHEL-08-030080 - RHEL 8 audit logs must be owned by root to prevent unauthorized read access.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Only authorized personnel should be aware of errors and the details of the errors. Error messages are an indicator of an organization's operational state or can identify the RHEL 8 system or platform. Additionally, Personally Identifiable Information (PII) and operational information must not be revealed through error messages to unauthorized personnel or their designated representatives.
+ 
+@@ -16855,6 +16981,7 @@ Satisfies: SRG-OS-000057-GPOS-00027, SRG-OS-000058-GPOS-00028, SRG-OS-000059-GPO
+             RHEL-08-030090 - RHEL 8 audit logs must be group-owned by root to prevent unauthorized read access.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Unauthorized disclosure of audit records can reveal system and configuration data to attackers, thus compromising its confidentiality.
+ 
+@@ -16871,6 +16998,7 @@ Satisfies: SRG-OS-000057-GPOS-00027, SRG-OS-000058-GPOS-00028, SRG-OS-000059-GPO
+             RHEL-08-030100 - RHEL 8 audit log directory must be owned by root to prevent unauthorized read access.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Unauthorized disclosure of audit records can reveal system and configuration data to attackers, thus compromising its confidentiality.
+ 
+@@ -16887,6 +17015,7 @@ Satisfies: SRG-OS-000057-GPOS-00027, SRG-OS-000058-GPOS-00028, SRG-OS-000059-GPO
+             RHEL-08-030110 - RHEL 8 audit log directory must be group-owned by root to prevent unauthorized read access.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Unauthorized disclosure of audit records can reveal system and configuration data to attackers, thus compromising its confidentiality.
+ 
+@@ -16903,6 +17032,7 @@ Satisfies: SRG-OS-000057-GPOS-00027, SRG-OS-000058-GPOS-00028, SRG-OS-000059-GPO
+             RHEL-08-030120 - RHEL 8 audit log directory must have a mode of 0700 or less permissive to prevent unauthorized read access.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Unauthorized disclosure of audit records can reveal system and configuration data to attackers, thus compromising its confidentiality.
+ 
+@@ -16919,6 +17049,7 @@ Satisfies: SRG-OS-000057-GPOS-00027, SRG-OS-000058-GPOS-00028, SRG-OS-000059-GPO
+             RHEL-08-030121 - RHEL 8 audit system must protect auditing rules from unauthorized change.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Unauthorized disclosure of audit records can reveal system and configuration data to attackers, thus compromising its confidentiality.
+ 
+@@ -16937,6 +17068,7 @@ Satisfies: SRG-OS-000057-GPOS-00027, SRG-OS-000058-GPOS-00028, SRG-OS-000059-GPO
+             RHEL-08-030122 - RHEL 8 audit system must protect logon UIDs from unauthorized change.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Unauthorized disclosure of audit records can reveal system and configuration data to attackers, thus compromising its confidentiality.
+ 
+@@ -16955,6 +17087,7 @@ Satisfies: SRG-OS-000057-GPOS-00027, SRG-OS-000058-GPOS-00028, SRG-OS-000059-GPO
+             RHEL-08-030130 - RHEL 8 must generate audit records for all account creations, modifications, disabling, and termination events that affect /etc/shadow.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -16971,6 +17104,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000004-GPOS-00004, SRG-OS-000037-GPO
+             RHEL-08-030140 - RHEL 8 must generate audit records for all account creations, modifications, disabling, and termination events that affect /etc/security/opasswd.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -16987,6 +17121,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000004-GPOS-00004, SRG-OS-000037-GPO
+             RHEL-08-030150 - RHEL 8 must generate audit records for all account creations, modifications, disabling, and termination events that affect /etc/passwd.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17003,6 +17138,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000004-GPOS-00004, SRG-OS-000037-GPO
+             RHEL-08-030160 - RHEL 8 must generate audit records for all account creations, modifications, disabling, and termination events that affect /etc/gshadow.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17019,6 +17155,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000004-GPOS-00004, SRG-OS-000037-GPO
+             RHEL-08-030170 - RHEL 8 must generate audit records for all account creations, modifications, disabling, and termination events that affect /etc/group.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17035,6 +17172,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000004-GPOS-00004, SRG-OS-000037-GPO
+             RHEL-08-030171 - RHEL 8 must generate audit records for all account creations, modifications, disabling, and termination events that affect /etc/sudoers.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17051,6 +17189,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000004-GPOS-00004, SRG-OS-000037-GPO
+             RHEL-08-030172 - RHEL 8 must generate audit records for all account creations, modifications, disabling, and termination events that affect /etc/sudoers.d/.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17067,6 +17206,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000004-GPOS-00004, SRG-OS-000037-GPO
+             RHEL-08-030180 - The RHEL 8 audit package must be installed.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without establishing what type of events occurred, the source of events, where events occurred, and the outcome of events, it would be difficult to establish, correlate, and investigate the events leading up to an outage or attack.
+ 
+@@ -17085,6 +17225,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000038-GPO
+             RHEL-08-030190 - Successful/unsuccessful uses of the su command in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17103,6 +17244,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030200 - The RHEL 8 audit system must be configured to audit any usage of the setxattr, fsetxattr, lsetxattr, removexattr, fremovexattr, and lremovexattr system calls.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17130,6 +17272,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030250 - Successful/unsuccessful uses of the chage command in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17148,6 +17291,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030260 - Successful/unsuccessful uses of the chcon command in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17166,6 +17310,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030280 - Successful/unsuccessful uses of the ssh-agent in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17184,6 +17329,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030290 - Successful/unsuccessful uses of the passwd command in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17202,6 +17348,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030300 - Successful/unsuccessful uses of the mount command in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17220,6 +17367,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030301 - Successful/unsuccessful uses of the umount command in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17238,6 +17386,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030302 - Successful/unsuccessful uses of the mount syscall in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17256,6 +17405,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030310 - Successful/unsuccessful uses of the unix_update in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Reconstruction of harmful events or forensic analysis is not possible if audit records do not contain enough information.
+ 
+@@ -17274,6 +17424,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030311 - Successful/unsuccessful uses of postdrop in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Reconstruction of harmful events or forensic analysis is not possible if audit records do not contain enough information.
+ 
+@@ -17292,6 +17443,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030312 - Successful/unsuccessful uses of postqueue in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Reconstruction of harmful events or forensic analysis is not possible if audit records do not contain enough information.
+ 
+@@ -17310,6 +17462,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030313 - Successful/unsuccessful uses of semanage in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Reconstruction of harmful events or forensic analysis is not possible if audit records do not contain enough information.
+ 
+@@ -17328,6 +17481,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030314 - Successful/unsuccessful uses of setfiles in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Reconstruction of harmful events or forensic analysis is not possible if audit records do not contain enough information.
+ 
+@@ -17346,6 +17500,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030315 - Successful/unsuccessful uses of userhelper in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Reconstruction of harmful events or forensic analysis is not possible if audit records do not contain enough information.
+ 
+@@ -17364,6 +17519,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030316 - Successful/unsuccessful uses of setsebool in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Reconstruction of harmful events or forensic analysis is not possible if audit records do not contain enough information.
+ 
+@@ -17382,6 +17538,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030317 - Successful/unsuccessful uses of unix_chkpwd in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Reconstruction of harmful events or forensic analysis is not possible if audit records do not contain enough information.
+ 
+@@ -17400,6 +17557,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030320 - Successful/unsuccessful uses of the ssh-keysign in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17418,6 +17576,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030330 - Successful/unsuccessful uses of the setfacl command in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17436,6 +17595,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030340 - Successful/unsuccessful uses of the pam_timestamp_check command in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17454,6 +17614,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030350 - Successful/unsuccessful uses of the newgrp command in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17472,6 +17633,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030360 - Successful/unsuccessful uses of the init_module and finit_module system calls in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17492,6 +17654,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030361 - Successful/unsuccessful uses of the rename, unlink, rmdir, renameat, and unlinkat system calls in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17517,6 +17680,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030370 - Successful/unsuccessful uses of the gpasswd command in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17535,6 +17699,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030390 - Successful/unsuccessful uses of the delete_module command in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17553,6 +17718,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030400 - Successful/unsuccessful uses of the crontab command in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17571,6 +17737,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030410 - Successful/unsuccessful uses of the chsh command in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17589,6 +17756,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030420 - Successful/unsuccessful uses of the truncate, ftruncate, creat, open, openat, and open_by_handle_at system calls in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17614,6 +17782,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030480 - Successful/unsuccessful uses of the chown, fchown, fchownat, and lchown system calls in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17638,6 +17807,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030490 - Successful/unsuccessful uses of the chmod, fchmod, and fchmodat system calls in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17661,6 +17831,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030550 - Successful/unsuccessful uses of the sudo command in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17679,6 +17850,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030560 - Successful/unsuccessful uses of the usermod command in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17697,6 +17869,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030570 - Successful/unsuccessful uses of the chacl command in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without generating audit records that are specific to the security and mission needs of the organization, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17715,6 +17888,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030580 - Successful/unsuccessful uses of the kmod command in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without the capability to generate audit records, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17743,6 +17917,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030600 - Successful/unsuccessful modifications to the lastlog file in RHEL 8 must generate an audit record.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without the capability to generate audit records, it would be difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+ 
+@@ -17771,6 +17946,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030610 - RHEL 8 must allow only the Information System Security Manager (ISSM) (or individuals or roles appointed by the ISSM) to select which auditable events are to be audited.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without the capability to restrict the roles and individuals that can select which events are audited, unauthorized personnel may be able to prevent the auditing of critical events. Misconfigured audits may degrade the system's performance by overwhelming the audit log. Misconfigured audits may also make it more difficult to establish, correlate, and investigate the events relating to an incident or identify those responsible for one.
+           
+@@ -17783,6 +17959,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000042-GPO
+             RHEL-08-030620 - RHEL 8 audit tools must have a mode of 0755 or less permissive.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Protecting audit information also includes identifying and protecting the tools used to view and manipulate log data. Therefore, protecting audit tools is necessary to prevent unauthorized operation on audit information.
+ 
+@@ -17799,6 +17976,7 @@ Audit tools include, but are not limited to, vendor-provided and open source aud
+             RHEL-08-030630 - RHEL 8 audit tools must be owned by root.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Protecting audit information also includes identifying and protecting the tools used to view and manipulate log data. Therefore, protecting audit tools is necessary to prevent unauthorized operation on audit information.
+ 
+@@ -17817,6 +17995,7 @@ Satisfies: SRG-OS-000256-GPOS-00097, SRG-OS-000257-GPOS-00098, SRG-OS-000258-GPO
+             RHEL-08-030640 - RHEL 8 audit tools must be group-owned by root.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Protecting audit information also includes identifying and protecting the tools used to view and manipulate log data. Therefore, protecting audit tools is necessary to prevent unauthorized operation on audit information.
+ 
+@@ -17835,6 +18014,7 @@ Satisfies: SRG-OS-000256-GPOS-00097, SRG-OS-000257-GPOS-00098, SRG-OS-000258-GPO
+             RHEL-08-030670 - RHEL 8 must have the packages required for offloading audit logs installed.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Information stored in one location is vulnerable to accidental or incidental deletion or alteration.
+ 
+@@ -17858,6 +18038,7 @@ Note that a port number was given as there is no standard port for RELP.RHEL-08-030680 - RHEL 8 must have the packages required for encrypting offloaded audit logs installed.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Information stored in one location is vulnerable to accidental or incidental deletion or alteration.
+ 
+@@ -17881,6 +18062,7 @@ Note that a port number was given as there is no standard port for RELP.RHEL-08-030700 - RHEL 8 must take appropriate action when the internal event queue is full.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Information stored in one location is vulnerable to accidental or incidental deletion or alteration.
+ 
+@@ -17899,6 +18081,7 @@ Satisfies: SRG-OS-000342-GPOS-00133, SRG-OS-000479-GPOS-00224
+             RHEL-08-030720 - RHEL 8 must authenticate the remote logging server for off-loading audit logs.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Information stored in one location is vulnerable to accidental or incidental deletion or alteration.
+ 
+@@ -17923,6 +18106,7 @@ Satisfies: SRG-OS-000342-GPOS-00133, SRG-OS-000479-GPOS-00224
+             RHEL-08-030730 - RHEL 8 must take action when allocated audit record storage volume reaches 75 percent of the repository maximum audit record storage capacity.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If security personnel are not notified immediately when storage volume reaches 75 percent utilization, they are unable to plan for audit record storage capacity expansion.
+           
+@@ -17935,6 +18119,7 @@ Satisfies: SRG-OS-000342-GPOS-00133, SRG-OS-000479-GPOS-00224
+             RHEL-08-030741 - RHEL 8 must disable the chrony daemon from acting as a server.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Inaccurate time stamps make it more difficult to correlate events and can lead to an inaccurate analysis. Determining the correct time a particular event occurred on a system is critical when conducting forensic analysis and investigating system events. Sources outside the configured acceptable allowance (drift) may be inaccurate.
+ 
+@@ -17953,6 +18138,7 @@ Note that USNO offers authenticated NTP service to DoD and U.S. Government agenc
+             RHEL-08-030742 - RHEL 8 must disable network management of the chrony daemon.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Inaccurate time stamps make it more difficult to correlate events and can lead to an inaccurate analysis. Determining the correct time a particular event occurred on a system is critical when conducting forensic analysis and investigating system events. Sources outside the configured acceptable allowance (drift) may be inaccurate.
+ 
+@@ -17971,6 +18157,7 @@ Note that USNO offers authenticated NTP service to DoD and U.S. Government agenc
+             RHEL-08-040000 - RHEL 8 must not have the telnet-server package installed.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -17993,6 +18180,7 @@ If a privileged user were to log on using this service, the privileged user pass
+             RHEL-08-040001 - RHEL 8 must not have any automated bug reporting tools installed.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -18011,6 +18199,7 @@ Verify the operating system is configured to disable non-essential capabilities.
+             RHEL-08-040002 - RHEL 8 must not have the sendmail package installed.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -18029,6 +18218,7 @@ Verify the operating system is configured to disable non-essential capabilities.
+             RHEL-08-040010 - RHEL 8 must not have the rsh-server package installed.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -18049,6 +18239,7 @@ Satisfies: SRG-OS-000095-GPOS-00049, SRG-OS-000074-GPOS-00042
+             RHEL-08-040021 - RHEL 8 must disable the asynchronous transfer mode (ATM) protocol.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -18065,6 +18256,7 @@ The Asynchronous Transfer Mode (ATM) is a protocol operating on network, data li
+             RHEL-08-040022 - RHEL 8 must disable the controller area network (CAN) protocol.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -18081,6 +18273,7 @@ The Controller Area Network (CAN) is a serial communications protocol, which was
+             RHEL-08-040023 - RHEL 8 must disable the stream control transmission protocol (SCTP).
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -18097,6 +18290,7 @@ The Stream Control Transmission Protocol (SCTP) is a transport layer protocol, d
+             RHEL-08-040024 - RHEL 8 must disable the transparent inter-process communication (TIPC) protocol.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -18113,6 +18307,7 @@ The Transparent Inter-Process Communication (TIPC) protocol is designed to provi
+             RHEL-08-040025 - RHEL 8 must disable mounting of cramfs.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -18129,6 +18324,7 @@ Compressed ROM/RAM file system (or cramfs) is a read-only file system designed f
+             RHEL-08-040026 - RHEL 8 must disable IEEE 1394 (FireWire) Support.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -18143,6 +18339,7 @@ The IEEE 1394 (FireWire) is a serial bus standard for high-speed real-time commu
+             RHEL-08-040070 - The RHEL 8 file system automounter must be disabled unless required.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Automatically mounting file systems permits easy introduction of unknown devices, thereby facilitating malicious activity.
+           
+@@ -18155,6 +18352,7 @@ The IEEE 1394 (FireWire) is a serial bus standard for high-speed real-time commu
+             RHEL-08-040080 - RHEL 8 must be configured to disable USB mass storage.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             USB mass storage permits easy introduction of unknown devices, thereby facilitating malicious activity.
+ 
+@@ -18169,6 +18367,7 @@ Satisfies: SRG-OS-000114-GPOS-00059, SRG-OS-000378-GPOS-00163
+             RHEL-08-040100 - A firewall must be installed on RHEL 8.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             "Firewalld" provides an easy and effective way to block/limit remote access to the system via ports, services, and protocols.
+ 
+@@ -18187,6 +18386,7 @@ RHEL 8 functionality (e.g., RDP) must be capable of taking enforcement action if
+             RHEL-08-040111 - RHEL 8 Bluetooth must be disabled.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without protection of communications with wireless peripherals, confidentiality and integrity may be compromised because unprotected communications can be intercepted and either read, altered, or used to compromise the RHEL 8 operating system.
+ 
+@@ -18203,6 +18403,7 @@ Protecting the confidentiality and integrity of communications with wireless per
+             RHEL-08-040120 - RHEL 8 must mount /dev/shm with the nodev option.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
+ 
+@@ -18221,6 +18422,7 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
+             RHEL-08-040121 - RHEL 8 must mount /dev/shm with the nosuid option.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
+ 
+@@ -18237,6 +18439,7 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
+             RHEL-08-040122 - RHEL 8 must mount /dev/shm with the noexec option.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
+ 
+@@ -18255,6 +18458,7 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
+             RHEL-08-040123 - RHEL 8 must mount /tmp with the nodev option.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
+ 
+@@ -18273,6 +18477,7 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
+             RHEL-08-040124 - RHEL 8 must mount /tmp with the nosuid option.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
+ 
+@@ -18289,6 +18494,7 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
+             RHEL-08-040125 - RHEL 8 must mount /tmp with the noexec option.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
+ 
+@@ -18307,6 +18513,7 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
+             RHEL-08-040126 - RHEL 8 must mount /var/log with the nodev option.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
+ 
+@@ -18325,6 +18532,7 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
+             RHEL-08-040127 - RHEL 8 must mount /var/log with the nosuid option.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
+ 
+@@ -18343,6 +18551,7 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
+             RHEL-08-040128 - RHEL 8 must mount /var/log with the noexec option.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
+ 
+@@ -18361,6 +18570,7 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
+             RHEL-08-040129 - RHEL 8 must mount /var/log/audit with the nodev option.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
+ 
+@@ -18379,6 +18589,7 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
+             RHEL-08-040130 - RHEL 8 must mount /var/log/audit with the nosuid option.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
+ 
+@@ -18397,6 +18608,7 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
+             RHEL-08-040131 - RHEL 8 must mount /var/log/audit with the noexec option.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
+ 
+@@ -18415,6 +18627,7 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
+             RHEL-08-040132 - RHEL 8 must mount /var/tmp with the nodev option.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
+ 
+@@ -18433,6 +18646,7 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
+             RHEL-08-040133 - RHEL 8 must mount /var/tmp with the nosuid option.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
+ 
+@@ -18451,6 +18665,7 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
+             RHEL-08-040134 - RHEL 8 must mount /var/tmp with the noexec option.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
+ 
+@@ -18469,6 +18684,7 @@ The "nosuid" mount option causes the system to not execute "setuid" and "setgid"
+             RHEL-08-040135 - The RHEL 8 fapolicy module must be installed.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
+ 
+@@ -18491,6 +18707,7 @@ Satisfies: SRG-OS-000368-GPOS-00154, SRG-OS-000370-GPOS-00155, SRG-OS-000480-GPO
+             RHEL-08-040150 - A firewall must be able to protect against or limit the effects of Denial of Service (DoS) attacks by ensuring RHEL 8 can implement rate-limiting measures on impacted network interfaces.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             DoS is a condition when a resource is not available for legitimate users. When this occurs, the organization either cannot accomplish its mission or must operate at degraded capacity.
+ 
+@@ -18507,6 +18724,7 @@ Since version 0.6.0, "firewalld" has incorporated "nftables" as its backend supp
+             RHEL-08-040160 - All RHEL 8 networked systems must have and implement SSH to protect the confidentiality and integrity of transmitted and received information, as well as information during preparation for transmission.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without protection of the transmitted information, confidentiality and integrity may be compromised because unprotected communications can be intercepted and either read or altered. 
+ 
+@@ -18525,6 +18743,7 @@ Satisfies: SRG-OS-000423-GPOS-00187, SRG-OS-000424-GPOS-00188, SRG-OS-000425-GPO
+             RHEL-08-040161 - RHEL 8 must force a frequent session key renegotiation for SSH connections to the server.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without protection of the transmitted information, confidentiality and integrity may be compromised because unprotected communications can be intercepted and either read or altered. 
+ 
+@@ -18545,6 +18764,7 @@ Satisfies: SRG-OS-000033-GPOS-00014, SRG-OS-000420-GPOS-00186, SRG-OS-000424-GPO
+             RHEL-08-040170 - The x86 Ctrl-Alt-Delete key sequence must be disabled on RHEL 8.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             A locally logged-on user, who presses Ctrl-Alt-Delete when at the console, can reboot the system. If accidentally pressed, as could happen in the case of a mixed OS environment, this can create the risk of short-term loss of availability of systems due to unintentional reboot. In a graphical user environment, risk of unintentional reboot from the Ctrl-Alt-Delete sequence is reduced because the user will be prompted before any action is taken.
+           
+@@ -18557,6 +18777,7 @@ Satisfies: SRG-OS-000033-GPOS-00014, SRG-OS-000420-GPOS-00186, SRG-OS-000424-GPO
+             RHEL-08-040171 - The x86 Ctrl-Alt-Delete key sequence in RHEL 8 must be disabled if a graphical user interface is installed.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             A locally logged-on user, who presses Ctrl-Alt-Delete, when at the console, can reboot the system. If accidentally pressed, as could happen in the case of a mixed OS environment, this can create the risk of short-term loss of availability of systems due to unintentional reboot. In a graphical user environment, risk of unintentional reboot from the Ctrl-Alt-Delete sequence is reduced because the user will be prompted before any action is taken.
+           
+@@ -18569,6 +18790,7 @@ Satisfies: SRG-OS-000033-GPOS-00014, SRG-OS-000420-GPOS-00186, SRG-OS-000424-GPO
+             RHEL-08-040172 - The systemd Ctrl-Alt-Delete burst key sequence in RHEL 8 must be disabled.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             A locally logged-on user who presses Ctrl-Alt-Delete when at the console can reboot the system. If accidentally pressed, as could happen in the case of a mixed OS environment, this can create the risk of short-term loss of availability of systems due to unintentional reboot. In a graphical user environment, risk of unintentional reboot from the Ctrl-Alt-Delete sequence is reduced because the user will be prompted before any action is taken.
+           
+@@ -18581,6 +18803,7 @@ Satisfies: SRG-OS-000033-GPOS-00014, SRG-OS-000420-GPOS-00186, SRG-OS-000424-GPO
+             RHEL-08-040180 - The debug-shell systemd service must be disabled on RHEL 8.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The debug-shell requires no authentication and provides root privileges to anyone who has physical access to the machine.  While this feature is disabled by default, masking it adds an additional layer of assurance that it will not be enabled via a dependency in systemd.  This also prevents attackers with physical access from trivially bypassing security on the machine through valid troubleshooting configurations and gaining root access when the system is rebooted.
+           
+@@ -18593,6 +18816,7 @@ Satisfies: SRG-OS-000033-GPOS-00014, SRG-OS-000420-GPOS-00186, SRG-OS-000424-GPO
+             RHEL-08-040190 - The Trivial File Transfer Protocol (TFTP) server package must not be installed if not required for RHEL 8 operational support.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If TFTP is required for operational support (such as the transmission of router configurations) its use must be documented with the Information System Security Officer (ISSO), restricted to only authorized personnel, and have access control rules established.
+           
+@@ -18605,6 +18829,7 @@ Satisfies: SRG-OS-000033-GPOS-00014, SRG-OS-000420-GPOS-00186, SRG-OS-000424-GPO
+             RHEL-08-040200 - The root account must be the only account having unrestricted access to the RHEL 8 system.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If an account other than root also has a User Identifier (UID) of "0", it has root authority, giving that account unrestricted access to the entire operating system. Multiple accounts with a UID of "0" afford an opportunity for potential intruders to guess a password for a privileged account.
+           
+@@ -18617,6 +18842,7 @@ Satisfies: SRG-OS-000033-GPOS-00014, SRG-OS-000420-GPOS-00186, SRG-OS-000424-GPO
+             RHEL-08-040210 - RHEL 8 must prevent IPv6 Internet Control Message Protocol (ICMP) redirect messages from being accepted.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             ICMP redirect messages are used by routers to inform hosts that a more direct route exists for a particular destination. These messages modify the host's route table and are unauthenticated. An illicit ICMP redirect message could result in a man-in-the-middle attack.
+ 
+@@ -18637,6 +18863,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-040220 - RHEL 8 must not send Internet Control Message Protocol (ICMP) redirects.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             ICMP redirect messages are used by routers to inform hosts that a more direct route exists for a particular destination. These messages contain information from the system's route table, possibly revealing portions of the network topology.
+ 
+@@ -18659,6 +18886,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-040230 - RHEL 8 must not respond to Internet Control Message Protocol (ICMP) echoes sent to a broadcast address.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Responding to broadcast ICMP echoes facilitates network mapping and provides a vector for amplification attacks.
+ 
+@@ -18680,6 +18908,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-040240 - RHEL 8 must not forward IPv6 source-routed packets.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Source-routed packets allow the source of the packet to suggest that routers forward the packet along a different path than configured on the router, which can be used to bypass network security measures. This requirement applies only to the forwarding of source-routed traffic, such as when forwarding is enabled and the system is functioning as a router.
+ 
+@@ -18700,6 +18929,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-040250 - RHEL 8 must not forward IPv6 source-routed packets by default.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Source-routed packets allow the source of the packet to suggest that routers forward the packet along a different path than configured on the router, which can be used to bypass network security measures. This requirement applies only to the forwarding of source-routed traffic, such as when forwarding is enabled and the system is functioning as a router.
+ 
+@@ -18720,6 +18950,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-040260 - RHEL 8 must not enable IPv6 packet forwarding unless the system is a router.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Routing protocol daemons are typically used on routers to exchange network topology information with other routers. If this software is used when not required, system network information may be unnecessarily transmitted across the network.
+ 
+@@ -18740,6 +18971,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-040261 - RHEL 8 must not accept router advertisements on all IPv6 interfaces.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Routing protocol daemons are typically used on routers to exchange network topology information with other routers. If this software is used when not required, system network information may be unnecessarily transmitted across the network.
+ 
+@@ -18762,6 +18994,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-040262 - RHEL 8 must not accept router advertisements on all IPv6 interfaces by default.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Routing protocol daemons are typically used on routers to exchange network topology information with other routers. If this software is used when not required, system network information may be unnecessarily transmitted across the network.
+ 
+@@ -18784,6 +19017,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-040270 - RHEL 8 must not allow interfaces to perform Internet Control Message Protocol (ICMP) redirects by default.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             ICMP redirect messages are used by routers to inform hosts that a more direct route exists for a particular destination. These messages contain information from the system's route table, possibly revealing portions of the network topology.
+ 
+@@ -18806,6 +19040,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-040280 - RHEL 8 must ignore IPv6 Internet Control Message Protocol (ICMP) redirect messages.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             ICMP redirect messages are used by routers to inform hosts that a more direct route exists for a particular destination. These messages modify the host's route table and are unauthenticated. An illicit ICMP redirect message could result in a man-in-the-middle attack.
+ 
+@@ -18826,6 +19061,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-040281 - RHEL 8 must disable access to network bpf syscall from unprivileged processes.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -18846,6 +19082,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-040282 - RHEL 8 must restrict usage of ptrace to descendant  processes.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -18866,6 +19103,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-040283 - RHEL 8 must restrict exposed kernel pointer addresses access.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -18886,6 +19124,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-040284 - RHEL 8 must disable the use of user namespaces.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -18906,6 +19145,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-040285 - RHEL 8 must use reverse path filtering on all IPv4 interfaces.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -18926,6 +19166,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-040290 - RHEL 8 must be configured to prevent unrestricted mail relaying.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If unrestricted mail relaying is permitted, unauthorized senders could use this host as a mail relay for the purpose of sending spam or other unauthorized activity.
+           
+@@ -18938,6 +19179,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-040320 - The graphical display manager must not be installed on RHEL 8 unless approved.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Internet services that are not required for system or application processes must not be active to decrease the attack surface of the system. Graphical display managers have a long history of security vulnerabilities and must not be used, unless approved and documented.
+           
+@@ -18950,6 +19192,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-040330 - RHEL 8 network interfaces must not be in promiscuous mode.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Network interfaces in promiscuous mode allow for the capture of all network traffic visible to the system. If unauthorized individuals can access these applications, it may allow them to collect information such as logon IDs, passwords, and key exchanges between systems.
+ 
+@@ -18964,6 +19207,7 @@ If the system is being used to perform a network troubleshooting function, the u
+             RHEL-08-040340 - RHEL 8 remote X connections for interactive users must be disabled unless to fulfill documented and validated mission requirements.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The security risk of using X11 forwarding is that the client's X11 display server may be exposed to attack when the SSH client requests forwarding.  A system administrator may have a stance in which they want to protect clients that may expose themselves to attack by unwittingly requesting X11 forwarding, which can warrant a "no" setting.
+ 
+@@ -18980,6 +19224,7 @@ If X11 services are not required for the system's intended function, they should
+             RHEL-08-040341 - The RHEL 8 SSH daemon must prevent remote hosts from connecting to the proxy display.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             When X11 forwarding is enabled, there may be additional exposure to the server and client displays if the sshd proxy display is configured to listen on the wildcard address.  By default, sshd binds the forwarding server to the loopback address and sets the hostname part of the DIPSLAY environment variable to localhost.  This prevents remote hosts from connecting to the proxy display.
+           
+@@ -18992,6 +19237,7 @@ If X11 services are not required for the system's intended function, they should
+             RHEL-08-040350 - If the Trivial File Transfer Protocol (TFTP) server is required, the RHEL 8 TFTP daemon must be configured to operate in secure mode.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Restricting TFTP to a specific directory prevents remote users from copying, transferring, or overwriting system files.
+           
+@@ -19004,6 +19250,7 @@ If X11 services are not required for the system's intended function, they should
+             RHEL-08-040360 - A File Transfer Protocol (FTP) server package must not be installed unless mission essential on RHEL 8.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The FTP service provides an unencrypted remote access that does not provide for the confidentiality and integrity of user passwords or the remote session. If a privileged user were to log on using this service, the privileged user password could be compromised. SSH or other encrypted file transfer methods must be used in place of this service.
+           
+@@ -19016,6 +19263,7 @@ If X11 services are not required for the system's intended function, they should
+             RHEL-08-040370 - The gssproxy package must not be installed unless mission essential on RHEL 8.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -19032,6 +19280,7 @@ The gssproxy package is a proxy for GSS API credential handling and could expose
+             RHEL-08-040380 - The iprutils package must not be installed unless mission essential on RHEL 8.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -19048,6 +19297,7 @@ The iprutils package provides a suite of utilities to manage and configure SCSI
+             RHEL-08-040390 - The tuned package must not be installed unless mission essential on RHEL 8.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -19064,6 +19314,7 @@ The tuned package contains a daemon that tunes the system settings dynamically.
+             RHEL-08-010163 - The krb5-server package must not be installed on RHEL 8.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Unapproved mechanisms that are used for authentication to the cryptographic module are not verified and therefore cannot be relied upon to provide confidentiality or integrity, and DoD data may be compromised.
+ 
+@@ -19082,6 +19333,7 @@ FIPS 140-2 is the current standard for validating that mechanisms used to access
+             RHEL-08-010382 - RHEL 8 must restrict privilege elevation to authorized personnel.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The sudo command allows a user to execute programs with elevated (administrator) privileges. It prompts the user for their password and confirms your request to execute a command by checking a file, called sudoers. If the "sudoers" file is not configured correctly, any user defined on the system can initiate privileged actions on the target system.
+           
+@@ -19094,6 +19346,7 @@ FIPS 140-2 is the current standard for validating that mechanisms used to access
+             RHEL-08-010383 - RHEL 8 must use the invoking user's password for privilege escalation when using "sudo".
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The sudoers security policy requires that users authenticate themselves before they can use sudo. When sudoers requires authentication, it validates the invoking user's credentials. If the rootpw, targetpw, or runaspw flags are defined and not disabled, by default the operating system will prompt the invoking user for the "root" user password. 
+ For more information on each of the listed configurations, reference the sudoers(5) manual page.
+@@ -19107,6 +19360,7 @@ For more information on each of the listed configurations, reference the sudoers
+             RHEL-08-010384 - RHEL 8 must require re-authentication when using the "sudo" command.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without re-authentication, users may access resources or perform tasks for which they do not have authorization. 
+ 
+@@ -19123,6 +19377,7 @@ If the value is set to an integer less than 0, the user's time stamp will not ex
+             RHEL-08-010049 - RHEL 8 must display a banner before granting local or remote access to the system via a graphical user logon.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Display of a standardized and approved use notification before granting access to the operating system ensures privacy and security notification verbiage used is consistent with applicable federal laws, Executive Orders, directives, policies, regulations, standards, and guidance.
+ 
+@@ -19139,6 +19394,7 @@ Satisfies: SRG-OS-000023-GPOS-00006, SRG-OS-000228-GPOS-00088
+             RHEL-08-010152 - RHEL 8 operating systems must require authentication upon booting into emergency mode.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If the system does not require valid root authentication before it boots into emergency or rescue mode, anyone who invokes emergency or rescue mode is granted privileged access to all files on the system.
+           
+@@ -19151,6 +19407,7 @@ Satisfies: SRG-OS-000023-GPOS-00006, SRG-OS-000228-GPOS-00088
+             RHEL-08-010159 - The RHEL 8 pam_unix.so module must be configured in the system-auth file to use a FIPS 140-2 approved cryptographic hashing algorithm for system authentication.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Unapproved mechanisms that are used for authentication to the cryptographic module are not verified and therefore cannot be relied upon to provide confidentiality or integrity, and DoD data may be compromised.
+ 
+@@ -19167,6 +19424,7 @@ FIPS 140-2 is the current standard for validating that mechanisms used to access
+             RHEL-08-010201 - The RHEL 8 SSH daemon must be configured with a timeout interval.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Terminating an idle SSH session within a short time period reduces the window of opportunity for unauthorized personnel to take control of a management session enabled on the console or console port that has been left unattended. In addition, quickly terminating an idle SSH session will also free up resources committed by the managed network element.
+ 
+@@ -19185,6 +19443,7 @@ Satisfies: SRG-OS-000163-GPOS-00072, SRG-OS-000126-GPOS-00066, SRG-OS-000279-GPO
+             RHEL-08-010472 - RHEL 8 must have the packages required to use the hardware random number generator entropy gatherer service.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The most important characteristic of a random number generator is its randomness, namely its ability to deliver random numbers that are impossible to predict.  Entropy in computer security is associated with the unpredictability of a source of randomness.  The random source with high entropy tends to achieve a uniform distribution of random values.  Random number generators are one of the most important building blocks of cryptosystems.  
+ 
+@@ -19199,6 +19458,7 @@ The rngd service feeds random data from hardware device to kernel random device.
+             RHEL-08-010522 - The RHEL 8 SSH daemon must not allow GSSAPI authentication, except to fulfill documented and validated mission requirements.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Configuring this setting for the SSH daemon provides additional assurance that remote logon via SSH will require a password, even in the event of misconfiguration elsewhere.
+           
+@@ -19211,6 +19471,7 @@ The rngd service feeds random data from hardware device to kernel random device.
+             RHEL-08-010544 - RHEL 8 must use a separate file system for /var/tmp.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The use of separate file systems for different paths can protect the system from failures resulting from a file system becoming full or failing.
+           
+@@ -19223,6 +19484,7 @@ The rngd service feeds random data from hardware device to kernel random device.
+             RHEL-08-010572 - RHEL 8 must prevent files with the setuid and setgid bit set from being executed on the /boot/efi directory.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The "nosuid" mount option causes the system not to execute "setuid" and "setgid" files with owner privileges. This option must be used for mounting any file system not containing approved "setuid" and "setguid" files. Executing files from untrusted file systems increases the opportunity for unprivileged users to attain unauthorized administrative access.
+           
+@@ -19235,6 +19497,7 @@ The rngd service feeds random data from hardware device to kernel random device.
+             RHEL-08-020032 - RHEL 8 must disable the user list at logon for graphical user interfaces.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Leaving the user list enabled is a security risk since it allows anyone with physical access to the system to enumerate known user accounts without authenticated access to the system.
+           
+@@ -19247,6 +19510,7 @@ The rngd service feeds random data from hardware device to kernel random device.
+             RHEL-08-020082 - RHEL 8 must prevent a user from overriding the screensaver lock-enabled setting for the graphical user interface.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             A session time-out lock is a temporary action taken when a user stops work and moves away from the immediate physical vicinity of the information system but does not log out because of the temporary nature of the absence. Rather than relying on the user to manually lock their operating system session prior to vacating the vicinity, operating systems need to be able to identify when a user's session has idled and take action to initiate the session lock.
+ 
+@@ -19267,6 +19531,7 @@ Satisfies: SRG-OS-000029-GPOS-00010, SRG-OS-000031-GPOS-00012, SRG-OS-000480-GPO
+             RHEL-08-020332 - RHEL 8 must not allow blank or null passwords in the password-auth file.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If an account has an empty password, anyone could log on and run commands with the privileges of that account. Accounts with empty passwords should never be used in operational environments.
+           
+@@ -19279,6 +19544,7 @@ Satisfies: SRG-OS-000029-GPOS-00010, SRG-OS-000031-GPOS-00012, SRG-OS-000480-GPO
+             RHEL-08-030181 - RHEL 8 audit records must contain information to establish what type of events occurred, the source of events, where events occurred, and the outcome of events.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without establishing what type of events occurred, the source of events, where events occurred, and the outcome of events, it would be difficult to establish, correlate, and investigate the events leading up to an outage or attack.
+ 
+@@ -19297,6 +19563,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000038-GPO
+             RHEL-08-030731 - RHEL 8 must notify the System Administrator (SA) and Information System Security Officer (ISSO) (at a minimum) when allocated audit record storage volume 75 percent utilization.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If security personnel are not notified immediately when storage volume reaches 75 percent utilization, they are unable to plan for audit record storage capacity expansion.
+           
+@@ -19309,6 +19576,7 @@ Satisfies: SRG-OS-000062-GPOS-00031, SRG-OS-000037-GPOS-00015, SRG-OS-000038-GPO
+             RHEL-08-040101 - A firewall must be active on RHEL 8.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             "Firewalld" provides an easy and effective way to block/limit remote access to the system via ports, services, and protocols.
+ 
+@@ -19326,6 +19594,7 @@ RHEL 8 functionality (e.g., RDP) must be capable of taking enforcement action if
+             RHEL-08-040136 - The RHEL 8 fapolicy module must be enabled.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             The organization must identify authorized software programs and permit execution of authorized software. The process used to identify software programs that are authorized to execute on organizational information systems is commonly referred to as whitelisting.
+ 
+@@ -19348,6 +19617,7 @@ Satisfies: SRG-OS-000368-GPOS-00154, SRG-OS-000370-GPOS-00155, SRG-OS-000480-GPO
+             RHEL-08-040139 - RHEL 8 must have the USBGuard installed.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without authenticating devices, unidentified or unknown devices may be introduced, thereby facilitating malicious activity.
+ Peripherals include, but are not limited to, such devices as flash drives, external storage, and printers.
+@@ -19364,6 +19634,7 @@ The System Administrator (SA) must work with the site Information System Securit
+             RHEL-08-040141 - RHEL 8 must enable the USBGuard.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without authenticating devices, unidentified or unknown devices may be introduced, thereby facilitating malicious activity.
+ 
+@@ -19382,6 +19653,7 @@ The System Administrator (SA) must work with the site Information System Securit
+             RHEL-08-040159 - All RHEL 8 networked systems must have SSH installed.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without protection of the transmitted information, confidentiality and integrity may be compromised because unprotected communications can be intercepted and either read or altered. 
+ 
+@@ -19400,6 +19672,7 @@ Satisfies: SRG-OS-000423-GPOS-00187, SRG-OS-000424-GPOS-00188, SRG-OS-000425-GPO
+             RHEL-08-040209 - RHEL 8 must prevent IPv4 Internet Control Message Protocol (ICMP) redirect messages from being accepted.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             ICMP redirect messages are used by routers to inform hosts that a more direct route exists for a particular destination. These messages modify the host's route table and are unauthenticated. An illicit ICMP redirect message could result in a man-in-the-middle attack.
+ 
+@@ -19420,6 +19693,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-040239 - RHEL 8 must not forward IPv4 source-routed packets.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Source-routed packets allow the source of the packet to suggest that routers forward the packet along a different path than configured on the router, which can be used to bypass network security measures. This requirement applies only to the forwarding of source-routed traffic, such as when forwarding is enabled and the system is functioning as a router.
+ 
+@@ -19440,6 +19714,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-040249 - RHEL 8 must not forward IPv4 source-routed packets by default.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Source-routed packets allow the source of the packet to suggest that routers forward the packet along a different path than configured on the router, which can be used to bypass network security measures. This requirement applies only to the forwarding of source-routed traffic, such as when forwarding is enabled and the system is functioning as a router.
+ 
+@@ -19460,6 +19735,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-040279 - RHEL 8 must ignore IPv4 Internet Control Message Protocol (ICMP) redirect messages.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             ICMP redirect messages are used by routers to inform hosts that a more direct route exists for a particular destination. These messages modify the host's route table and are unauthenticated. An illicit ICMP redirect message could result in a man-in-the-middle attack.
+ 
+@@ -19480,6 +19756,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-040286 - RHEL 8 must enable hardening for the Berkeley Packet Filter Just-in-time compiler.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             It is detrimental for operating systems to provide, or install by default, functionality exceeding requirements or mission objectives. These unnecessary capabilities or services are often overlooked and therefore may remain unsecured. They increase the risk to the platform by providing additional attack vectors.
+ 
+@@ -19502,6 +19779,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-010121 - The RHEL 8 operating system must not have accounts configured with blank or null passwords.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If an account has an empty password, anyone could log on and run commands with the privileges of that account. Accounts with empty passwords should never be used in operational environments.
+           
+@@ -19514,6 +19792,7 @@ The sysctl --system command will load settings from all system configuration fil
+             RHEL-08-010331 - RHEL 8 library directories must have mode 755 or less permissive.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If RHEL 8 were to allow any user to make changes to software libraries, then those changes might be implemented without undergoing the appropriate testing and approvals that are part of a robust change management process.
+ 
+@@ -19528,6 +19807,7 @@ This requirement applies to RHEL 8 with software libraries that are accessible a
+             RHEL-08-010341 - RHEL 8 library directories must be owned by root.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If RHEL 8 were to allow any user to make changes to software libraries, then those changes might be implemented without undergoing the appropriate testing and approvals that are part of a robust change management process.
+ 
+@@ -19542,6 +19822,7 @@ This requirement applies to RHEL 8 with software libraries that are accessible a
+             RHEL-08-010351 - RHEL 8 library directories must be group-owned by root or a system account.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             If RHEL 8 were to allow any user to make changes to software libraries, then those changes might be implemented without undergoing the appropriate testing and approvals that are part of a robust change management process.
+ 
+@@ -19556,6 +19837,7 @@ This requirement applies to RHEL 8 with software libraries that are accessible a
+             RHEL-08-010385 - The RHEL 8 operating system must not be configured to bypass password requirements for privilege escalation.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Without re-authentication, users may access resources or perform tasks for which they do not have authorization. 
+ 
+@@ -19572,6 +19854,7 @@ Satisfies: SRG-OS-000373-GPOS-00156, SRG-OS-000373-GPOS-00157, SRG-OS-000373-GPO
+             RHEL-08-020101 - RHEL 8 must ensure the password complexity module is enabled in the system-auth file.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Use of a complex password helps to increase the time and resources required to compromise the password. Password complexity, or strength, is a measure of the effectiveness of a password in resisting attempts at guessing and brute-force attacks. "pwquality" enforces complex password construction configuration and has the ability to limit brute-force attacks on the system.
+ 
+@@ -19588,6 +19871,7 @@ RHEL 8 uses "pwquality" as a mechanism to enforce password complexity. This is s
+             RHEL-08-040321 - The graphical display manager must not be the default target on RHEL 8 unless approved.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Internet services that are not required for system or application processes must not be active to decrease the attack surface of the system. Graphical display managers have a long history of security vulnerabilities and must not be used, unless approved and documented.
+           
+@@ -19600,6 +19884,7 @@ RHEL 8 uses "pwquality" as a mechanism to enforce password complexity. This is s
+             RHEL-08-020035 - RHEL 8 must terminate idle user sessions.
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             Terminating an idle session within a short time period reduces the window of opportunity for unauthorized personnel to take control of a management session enabled on the console or console port that has been left unattended.
+           
+@@ -19662,11 +19947,11 @@ RHEL 8 uses "pwquality" as a mechanism to enforce password complexity. This is s
+         
+           
+         
+-        
++        
+           
+           
+         
+-        
++        
+           
+           
+         
+@@ -21551,12 +21836,12 @@ RHEL 8 uses "pwquality" as a mechanism to enforce password complexity. This is s
+           1
+         
+         
+-          /boot/efi/EFI/redhat/grub.cfg
++          /boot/efi/EFI/almalinux/grub.cfg
+           ^\s*set\s+superusers\s*=\s*"(\w+)"\s*$
+           1
+         
+         
+-          /boot/efi/EFI/redhat/user.cfg
++          /boot/efi/EFI/almalinux/user.cfg
+           ^\s*GRUB2_PASSWORD=(\S+)\b
+           1
+         
+@@ -25179,6 +25464,7 @@ RHEL 8 uses "pwquality" as a mechanism to enforce password complexity. This is s
+             RHEL 8 is installed
+             
+               Red Hat Enterprise Linux 8
++AlmaLinux OS 8
+             
+             
+             RHEL 8 is installed
 diff --git a/shared/templates/accounts_password/tests/conflicting_values_directory.fail.sh b/shared/templates/accounts_password/tests/conflicting_values_directory.fail.sh
-index 8c002663d..c8d3ff1a4 100644
+index 17a1bd387..18b84aa2d 100644
 --- a/shared/templates/accounts_password/tests/conflicting_values_directory.fail.sh
 +++ b/shared/templates/accounts_password/tests/conflicting_values_directory.fail.sh
 @@ -1,6 +1,6 @@
  #!/bin/bash
  # This test only applies to platforms that check the pwquality.conf.d directory
--# platform = Oracle Linux 8,multi_platform_rhel
-+# platform = Oracle Linux 8,multi_platform_rhel,multi_platform_almalinux
+-# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel
++# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel,multi_platform_almalinux
  # variables = var_password_pam_{{{ VARIABLE }}}={{{ TEST_VAR_VALUE }}}
  
  truncate -s 0 /etc/security/pwquality.conf
 diff --git a/shared/templates/accounts_password/tests/correct_value_directory.pass.sh b/shared/templates/accounts_password/tests/correct_value_directory.pass.sh
-index 689093008..c25c13332 100644
+index 5f3be9f6c..9eea57b2e 100644
 --- a/shared/templates/accounts_password/tests/correct_value_directory.pass.sh
 +++ b/shared/templates/accounts_password/tests/correct_value_directory.pass.sh
 @@ -1,6 +1,6 @@
  #!/bin/bash
  # This test only applies to platforms that check the pwquality.conf.d directory
--# platform = Oracle Linux 8,multi_platform_rhel
-+# platform = Oracle Linux 8,multi_platform_rhel,multi_platform_almalinux
+-# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel
++# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel,multi_platform_almalinux
  # variables = var_password_pam_{{{ VARIABLE }}}={{{ TEST_VAR_VALUE }}}
  
  # This test will ensure that OVAL also checks the configuration in
@@ -21573,7 +14288,7 @@ index c5051bcf7..846c0e661 100644
  # strategy = restrict
  # complexity = medium
 diff --git a/shared/templates/grub2_bootloader_argument/tests/arg_not_in_entries.fail.sh b/shared/templates/grub2_bootloader_argument/tests/arg_not_in_entries.fail.sh
-index 4cc696340..7dcfe8e61 100644
+index f36c7d8bc..c465a15a3 100644
 --- a/shared/templates/grub2_bootloader_argument/tests/arg_not_in_entries.fail.sh
 +++ b/shared/templates/grub2_bootloader_argument/tests/arg_not_in_entries.fail.sh
 @@ -1,6 +1,6 @@
@@ -21609,7 +14324,7 @@ index 4b5e13062..9a372e44c 100644
  {{%- if ARG_VARIABLE %}}
  # variables = {{{ ARG_VARIABLE }}}=correct_value
 diff --git a/shared/templates/grub2_bootloader_argument/tests/correct_value_grubenv_only.pass.sh b/shared/templates/grub2_bootloader_argument/tests/correct_value_grubenv_only.pass.sh
-index 6ebffb8f5..59af25b6a 100644
+index dc6f7e611..938ab6fc6 100644
 --- a/shared/templates/grub2_bootloader_argument/tests/correct_value_grubenv_only.pass.sh
 +++ b/shared/templates/grub2_bootloader_argument/tests/correct_value_grubenv_only.pass.sh
 @@ -1,6 +1,6 @@
@@ -21621,7 +14336,7 @@ index 6ebffb8f5..59af25b6a 100644
  {{%- if ARG_VARIABLE %}}
  # variables = {{{ ARG_VARIABLE }}}=correct_value
 diff --git a/shared/templates/grub2_bootloader_argument/tests/correct_value_mix_entries_and_grubenv.pass.sh b/shared/templates/grub2_bootloader_argument/tests/correct_value_mix_entries_and_grubenv.pass.sh
-index 0a5a8be0d..041d3fae4 100644
+index 3b3687f45..5c6784561 100644
 --- a/shared/templates/grub2_bootloader_argument/tests/correct_value_mix_entries_and_grubenv.pass.sh
 +++ b/shared/templates/grub2_bootloader_argument/tests/correct_value_mix_entries_and_grubenv.pass.sh
 @@ -1,6 +1,6 @@
@@ -21633,7 +14348,7 @@ index 0a5a8be0d..041d3fae4 100644
  {{%- if ARG_VARIABLE %}}
  # variables = {{{ ARG_VARIABLE }}}=correct_value
 diff --git a/shared/templates/grub2_bootloader_argument/tests/wrong_value_entries.fail.sh b/shared/templates/grub2_bootloader_argument/tests/wrong_value_entries.fail.sh
-index b875737f2..9685f6abd 100644
+index 788f128b3..44fa8621e 100644
 --- a/shared/templates/grub2_bootloader_argument/tests/wrong_value_entries.fail.sh
 +++ b/shared/templates/grub2_bootloader_argument/tests/wrong_value_entries.fail.sh
 @@ -1,6 +1,6 @@
@@ -21645,7 +14360,7 @@ index b875737f2..9685f6abd 100644
  {{%- if ARG_VARIABLE %}}
  # variables = {{{ ARG_VARIABLE }}}=correct_value
 diff --git a/shared/templates/grub2_bootloader_argument/tests/wrong_value_grubenv.fail.sh b/shared/templates/grub2_bootloader_argument/tests/wrong_value_grubenv.fail.sh
-index a366cc06e..7d595fcb2 100644
+index d17a4d81b..720f47ea2 100644
 --- a/shared/templates/grub2_bootloader_argument/tests/wrong_value_grubenv.fail.sh
 +++ b/shared/templates/grub2_bootloader_argument/tests/wrong_value_grubenv.fail.sh
 @@ -1,6 +1,6 @@
@@ -21763,7 +14478,7 @@ index 99f5e33b9..a0b930444 100644
  # strategy = disable
  # complexity = low
 diff --git a/shared/templates/pam_account_password_faillock/tests/conflicting_settings_authselect.fail.sh b/shared/templates/pam_account_password_faillock/tests/conflicting_settings_authselect.fail.sh
-index 1e4ab26a7..88a935f88 100644
+index 805d70a75..75b375d26 100644
 --- a/shared/templates/pam_account_password_faillock/tests/conflicting_settings_authselect.fail.sh
 +++ b/shared/templates/pam_account_password_faillock/tests/conflicting_settings_authselect.fail.sh
 @@ -1,6 +1,6 @@
@@ -21772,10 +14487,10 @@ index 1e4ab26a7..88a935f88 100644
 -# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel
 +# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel,multi_platform_almalinux
  
- {{{ tests_init_faillock_vars("correct") }}}
+ {{{ tests_init_faillock_vars("correct", prm_name=PRM_NAME, ext_variable=EXT_VARIABLE, variable_lower_bound=VARIABLE_LOWER_BOUND, variable_upper_bound=VARIABLE_UPPER_BOUND) }}}
  
 diff --git a/shared/templates/pam_account_password_faillock/tests/pam_faillock_conflicting_settings.fail.sh b/shared/templates/pam_account_password_faillock/tests/pam_faillock_conflicting_settings.fail.sh
-index e9f8a06f4..ef4195f65 100644
+index 3080e4f0c..c8df0483c 100644
 --- a/shared/templates/pam_account_password_faillock/tests/pam_faillock_conflicting_settings.fail.sh
 +++ b/shared/templates/pam_account_password_faillock/tests/pam_faillock_conflicting_settings.fail.sh
 @@ -1,6 +1,6 @@
@@ -21785,9 +14500,9 @@ index e9f8a06f4..ef4195f65 100644
 +# platform = multi_platform_fedora,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux OS 8,Red Hat Enterprise Linux 9,Oracle Linux 8
  # remediation = none
  
- {{{ tests_init_faillock_vars("correct") }}}
+ {{{ tests_init_faillock_vars("correct", prm_name=PRM_NAME, ext_variable=EXT_VARIABLE, variable_lower_bound=VARIABLE_LOWER_BOUND, variable_upper_bound=VARIABLE_UPPER_BOUND) }}}
 diff --git a/shared/templates/pam_account_password_faillock/tests/pam_faillock_expected_faillock_conf.pass.sh b/shared/templates/pam_account_password_faillock/tests/pam_faillock_expected_faillock_conf.pass.sh
-index b5d27377a..31f2fe7c6 100644
+index e3c52ec35..98070304e 100644
 --- a/shared/templates/pam_account_password_faillock/tests/pam_faillock_expected_faillock_conf.pass.sh
 +++ b/shared/templates/pam_account_password_faillock/tests/pam_faillock_expected_faillock_conf.pass.sh
 @@ -1,6 +1,6 @@
@@ -21796,15 +14511,15 @@ index b5d27377a..31f2fe7c6 100644
 -# platform = multi_platform_fedora,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,Oracle Linux 8
 +# platform = multi_platform_fedora,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux OS 8,Red Hat Enterprise Linux 9,Oracle Linux 8
  
- {{{ tests_init_faillock_vars("correct") }}}
+ {{{ tests_init_faillock_vars("correct", prm_name=PRM_NAME, ext_variable=EXT_VARIABLE, variable_lower_bound=VARIABLE_LOWER_BOUND, variable_upper_bound=VARIABLE_UPPER_BOUND) }}}
  
 diff --git a/shared/templates/pam_account_password_faillock/tests/pam_faillock_lenient_high_faillock_conf.fail.sh b/shared/templates/pam_account_password_faillock/tests/pam_faillock_lenient_high_faillock_conf.fail.sh
-index f44b6cfc8..654003187 100644
+index dedc929d5..ea0c6c311 100644
 --- a/shared/templates/pam_account_password_faillock/tests/pam_faillock_lenient_high_faillock_conf.fail.sh
 +++ b/shared/templates/pam_account_password_faillock/tests/pam_faillock_lenient_high_faillock_conf.fail.sh
 @@ -1,7 +1,7 @@
  #!/bin/bash
- {{{ tests_init_faillock_vars("lenient_high") }}}
+ {{{ tests_init_faillock_vars("lenient_high", prm_name=PRM_NAME, ext_variable=EXT_VARIABLE, variable_lower_bound=VARIABLE_LOWER_BOUND, variable_upper_bound=VARIABLE_UPPER_BOUND) }}}
  # packages = authselect
 -# platform = multi_platform_fedora,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,Oracle Linux 8
 +# platform = multi_platform_fedora,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux OS 8,Red Hat Enterprise Linux 9,Oracle Linux 8
@@ -21812,12 +14527,12 @@ index f44b6cfc8..654003187 100644
  
  authselect select sssd --force
 diff --git a/shared/templates/pam_account_password_faillock/tests/pam_faillock_lenient_low_faillock_conf.fail.sh b/shared/templates/pam_account_password_faillock/tests/pam_faillock_lenient_low_faillock_conf.fail.sh
-index 82e81365a..3c29614a0 100644
+index 74bd19c40..d7dc3ff3e 100644
 --- a/shared/templates/pam_account_password_faillock/tests/pam_faillock_lenient_low_faillock_conf.fail.sh
 +++ b/shared/templates/pam_account_password_faillock/tests/pam_faillock_lenient_low_faillock_conf.fail.sh
 @@ -1,7 +1,7 @@
  #!/bin/bash
- {{{ tests_init_faillock_vars("lenient_low") }}}
+ {{{ tests_init_faillock_vars("lenient_low", prm_name=PRM_NAME, ext_variable=EXT_VARIABLE, variable_lower_bound=VARIABLE_LOWER_BOUND, variable_upper_bound=VARIABLE_UPPER_BOUND) }}}
  # packages = authselect
 -# platform = multi_platform_fedora,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,Oracle Linux 8
 +# platform = multi_platform_fedora,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux OS 8,Red Hat Enterprise Linux 9,Oracle Linux 8
@@ -21825,7 +14540,7 @@ index 82e81365a..3c29614a0 100644
  
  authselect select sssd --force
 diff --git a/shared/templates/pam_account_password_faillock/tests/pam_faillock_multiple_pam_unix_faillock_conf.fail.sh b/shared/templates/pam_account_password_faillock/tests/pam_faillock_multiple_pam_unix_faillock_conf.fail.sh
-index 56f9acccc..63364cc0e 100644
+index a5d171fc3..c5aa0d149 100644
 --- a/shared/templates/pam_account_password_faillock/tests/pam_faillock_multiple_pam_unix_faillock_conf.fail.sh
 +++ b/shared/templates/pam_account_password_faillock/tests/pam_faillock_multiple_pam_unix_faillock_conf.fail.sh
 @@ -1,6 +1,6 @@
@@ -21835,9 +14550,9 @@ index 56f9acccc..63364cc0e 100644
 +# platform = multi_platform_fedora,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux OS 8,Red Hat Enterprise Linux 9,Oracle Linux 8
  # remediation = none
  
- {{{ tests_init_faillock_vars("correct") }}}
+ {{{ tests_init_faillock_vars("correct", prm_name=PRM_NAME, ext_variable=EXT_VARIABLE, variable_lower_bound=VARIABLE_LOWER_BOUND, variable_upper_bound=VARIABLE_UPPER_BOUND) }}}
 diff --git a/shared/templates/pam_account_password_faillock/tests/pam_faillock_stricter_faillock_conf.pass.sh b/shared/templates/pam_account_password_faillock/tests/pam_faillock_stricter_faillock_conf.pass.sh
-index 008462181..cb9c98c6f 100644
+index 83ebf5402..1dcceb09b 100644
 --- a/shared/templates/pam_account_password_faillock/tests/pam_faillock_stricter_faillock_conf.pass.sh
 +++ b/shared/templates/pam_account_password_faillock/tests/pam_faillock_stricter_faillock_conf.pass.sh
 @@ -1,6 +1,6 @@
@@ -21846,7 +14561,7 @@ index 008462181..cb9c98c6f 100644
 -# platform = multi_platform_fedora,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,Oracle Linux 8
 +# platform = multi_platform_fedora,Oracle Linux 9,Red Hat Enterprise Linux 8,AlmaLinux OS 8,Red Hat Enterprise Linux 9,Oracle Linux 8
  
- {{{ tests_init_faillock_vars("stricter") }}}
+ {{{ tests_init_faillock_vars("stricter", prm_name=PRM_NAME, ext_variable=EXT_VARIABLE, variable_lower_bound=VARIABLE_LOWER_BOUND, variable_upper_bound=VARIABLE_UPPER_BOUND) }}}
  
 diff --git a/shared/templates/service_disabled/kickstart.template b/shared/templates/service_disabled/kickstart.template
 index d1e39ae29..7ecd5523e 100644
@@ -21889,7 +14604,7 @@ index 451af774a..27ac615a2 100644
  # strategy = disable
  # complexity = low
 diff --git a/shared/templates/zipl_bls_entries_option/ansible.template b/shared/templates/zipl_bls_entries_option/ansible.template
-index 73810f216..54434bb42 100644
+index feb74e3c4..b82bc305a 100644
 --- a/shared/templates/zipl_bls_entries_option/ansible.template
 +++ b/shared/templates/zipl_bls_entries_option/ansible.template
 @@ -1,4 +1,4 @@
@@ -21909,7 +14624,7 @@ index e14d59dfc..1b236a130 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 a0265a9d9..f35214c13 100644
+index 0dd3752b3..5b2721e24 100644
 --- a/ssg/constants.py
 +++ b/ssg/constants.py
 @@ -40,7 +40,7 @@ SSG_REF_URIS = {
@@ -21930,17 +14645,17 @@ index a0265a9d9..f35214c13 100644
      "Anolis OS 8": "anolis8",
      "Anolis OS 23": "anolis23",
      "Amazon Linux 2023": "al2023",
-@@ -302,7 +302,7 @@ MULTI_PLATFORM_LIST = ["rhel", "fedora", "rhv", "debian", "ubuntu",
+@@ -301,7 +301,7 @@ MULTI_PLATFORM_LIST = ["rhel", "fedora", "rhv", "debian", "ubuntu",
  
  MULTI_PLATFORM_MAPPING = {
      "multi_platform_alinux": ["alinux2", "alinux3"],
 -    "multi_platform_almalinux": ["almalinux9"],
 +    "multi_platform_almalinux": ["almalinux8"],
      "multi_platform_anolis": ["anolis8", "anolis23"],
-     "multi_platform_debian": ["debian11", "debian12"],
+     "multi_platform_debian": ["debian11", "debian12", "debian13"],
      "multi_platform_example": ["example"],
 diff --git a/tests/data/product_stability/ol7.yml b/tests/data/product_stability/ol7.yml
-index 27cf93dcc..16fc52311 100644
+index 097d7964e..54206c5be 100644
 --- a/tests/data/product_stability/ol7.yml
 +++ b/tests/data/product_stability/ol7.yml
 @@ -30,7 +30,7 @@ groups:
@@ -21951,9 +14666,9 @@ index 27cf93dcc..16fc52311 100644
 +grub2_uefi_boot_path: /boot/efi/EFI/almalinux
  grub_helper_executable: grubby
  init_system: systemd
- major_version_ordinal: 7
+ login_defs_path: /etc/login.defs
 diff --git a/tests/data/product_stability/ol8.yml b/tests/data/product_stability/ol8.yml
-index 169cd1991..f694d28f5 100644
+index 3654b55f4..c8fe2a455 100644
 --- a/tests/data/product_stability/ol8.yml
 +++ b/tests/data/product_stability/ol8.yml
 @@ -30,7 +30,7 @@ groups:
@@ -21964,9 +14679,9 @@ index 169cd1991..f694d28f5 100644
 +grub2_uefi_boot_path: /boot/efi/EFI/almalinux
  grub_helper_executable: grubby
  init_system: systemd
- major_version_ordinal: 8
+ login_defs_path: /etc/login.defs
 diff --git a/tests/data/product_stability/rhel8.yml b/tests/data/product_stability/rhel8.yml
-index 8f764c4d1..0cc1d40ec 100644
+index 0c44b19d7..2f9f356f9 100644
 --- a/tests/data/product_stability/rhel8.yml
 +++ b/tests/data/product_stability/rhel8.yml
 @@ -81,7 +81,7 @@ groups:
@@ -22015,7 +14730,7 @@ index 849ab06f6..1a4927eec 100644
  export superusers
  
 diff --git a/tests/shared/grub2.sh b/tests/shared/grub2.sh
-index 42abeb78e..fb99e71f2 100644
+index e89de2f39..49b41db1a 100644
 --- a/tests/shared/grub2.sh
 +++ b/tests/shared/grub2.sh
 @@ -11,10 +11,10 @@ function set_grub_uefi_root {