diff --git a/tasks/main.yml b/tasks/main.yml
index 7a09b23..62c6512 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -84,6 +84,11 @@
   tags:
   - always
 
+- name: Include OS specific variables
+  include_vars: "{{ ansible_distribution }}.yml"
+  tags:
+  - always
+
 - name: Include preliminary steps
   import_tasks: prelim.yml
   tags:
@@ -105,6 +110,7 @@
   include_tasks: parse_etc_password.yml
   when: rhel9cis_section6
   tags:
+  - rule_5.5.2
   - rhel9cis_section6
 
 - name: run Section 1 tasks
diff --git a/tasks/section_1/cis_1.2.x.yml b/tasks/section_1/cis_1.2.x.yml
index 3780dfc..52372a3 100644
--- a/tasks/section_1/cis_1.2.x.yml
+++ b/tasks/section_1/cis_1.2.x.yml
@@ -37,7 +37,7 @@
       - rule_1.2.2
 
 - name: "1.2.3 | L1 | AUDIT | Ensure GPG keys are configured"
-  shell: gpg --quiet --with-fingerprint /etc/pki/rpm-gpg/RPM-GPG-KEY-{{ ansible_distribution|lower }}-release
+  shell: gpg --quiet --with-fingerprint "{{ rpm_gpg_key }}"
   args:
       warn: false
   when: