diff --git a/SOURCES/add-almalinux8-support.sh b/SOURCES/add-almalinux8-support.sh
index 12e00af..91161e9 100644
--- a/SOURCES/add-almalinux8-support.sh
+++ b/SOURCES/add-almalinux8-support.sh
@@ -44,8 +44,11 @@ find ./shared -type f -exec sed -i \
 #    silently falls through to the generic `else` branch of those rules (e.g.
 #    configure_custom_crypto_policy_cis drops NO-SSHWEAKCIPHERS/NO-SSHWEAKMACS/
 #    NO-WEAKMAC, weakening the CIS crypto remediation versus the rhel8 base).
-find ./linux_os -type d -name ensure_redhat_gpgkey_installed -prune -o -type f -exec sed -i \
-    -e '/if product in/ s/"rhel8"/"rhel8", "almalinux8"/g' {} \;
+find ./linux_os ./shared -type d -name ensure_redhat_gpgkey_installed -prune -o -type f -exec sed -i \
+    -e '/if product in/ s/"rhel8"/"rhel8", "almalinux8"/g' \
+    -e "/if product in/ s/'rhel8'/'rhel8', 'almalinux8'/g" \
+    -e '/if product not in/ s/"rhel8"/"rhel8", "almalinux8"/g' \
+    -e "/if product not in/ s/'rhel8'/'rhel8', 'almalinux8'/g" {} \;
 
 find ./linux_os ./shared -type d -name ensure_redhat_gpgkey_installed -prune -o -type f -exec sed -i -E \
     -e 's/product == (["'\''])rhel8\1/(product == \1rhel8\1 or product == \1almalinux8\1)/g' {} \;
diff --git a/SPECS/scap-security-guide.spec b/SPECS/scap-security-guide.spec
index 867195c..5bc470f 100644
--- a/SPECS/scap-security-guide.spec
+++ b/SPECS/scap-security-guide.spec
@@ -6,7 +6,7 @@
 
 Name:		scap-security-guide
 Version:	0.1.81
-Release:	1%{?dist}.alma.1
+Release:	1%{?dist}.alma.2
 Summary:	Security guidance and baselines in SCAP formats
 License:	BSD-3-Clause
 Group:		Applications/System
@@ -139,7 +139,7 @@ ln -s ssg-firefox-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-firefo
 %{_datadir}/%{name}/ansible/rule_playbooks
 
 %changelog
-* Mon Jun 15 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 0.1.81-1.alma.1
+* Thu Jul 16 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 0.1.81-1.alma.2
 - Add AlmaLinux support
 
 * Mon Jun 01 2026 Jan Černý <jcerny@redhat.com> - 0.1.81-1