diff --git a/SOURCES/0001-Add-AlmaLinux-8-support.patch b/SOURCES/0001-Add-AlmaLinux-8-support.patch
index c125375..f57c3ed 100644
--- a/SOURCES/0001-Add-AlmaLinux-8-support.patch
+++ b/SOURCES/0001-Add-AlmaLinux-8-support.patch
@@ -66,18 +66,9 @@ index 1523ae90b..bc01f424f 100644
  - ensure_amazon_gpgkey_installed
  - ensure_suse_gpgkey_installed
 diff --git a/controls/anssi.yml b/controls/anssi.yml
-index cdcec6573..b59591b2e 100644
+index cdcec6573..4803e5291 100644
 --- a/controls/anssi.yml
 +++ b/controls/anssi.yml
-@@ -1244,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
- 
 @@ -1370,10 +1370,8 @@ controls:
        PAM delegates requests for remote authentication to this service through a
        local Unix socket. The sssd service can use IPA, AD or LDAP as a remote
@@ -89,7 +80,7 @@ index cdcec6573..b59591b2e 100644
      status: automated
      rules:
        - package_sssd_installed
-@@ -1381,16 +1379,10 @@ controls:
+@@ -1381,10 +1379,8 @@ controls:
        - sssd_enable_pam_services
        - sssd_ldap_configure_tls_reqcert
        - sssd_ldap_start_tls
@@ -99,14 +90,8 @@ index cdcec6573..b59591b2e 100644
 -      {{% endif %}}
      related_rules:
        - package_sssd-ipa_installed
--    {{% else %}}
--    notes: We cannot automate securing of remote PAM authentication in a general way.
--    status: manual
--    {{% endif %}}
- 
-   - id: R68
-     title: Protecting stored passwords
-@@ -1427,13 +1419,8 @@ controls:
+     {{% else %}}
+@@ -1427,10 +1423,8 @@ controls:
        securely to Samba domains.
        Other relevant services are NIS and Hesiod. These should not be used.
      status: automated
@@ -114,12 +99,9 @@ index cdcec6573..b59591b2e 100644
      rules:
        - no_nis_in_nsswitch
 -    {{% endif %}}
--    {{% else %}}
--    status: pending
--    {{% endif %}}
- 
- 
-   - id: R70
+     {{% else %}}
+     status: pending
+     {{% endif %}}
 diff --git a/controls/cis_almalinux9.yml b/controls/cis_almalinux9.yml
 index 4591f52c6..670d0b14f 100644
 --- a/controls/cis_almalinux9.yml