diff --git a/tasks/main.yml b/tasks/main.yml
index b477b4c..beefdbf 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,18 +2,18 @@
 # tasks file for ensure_repo_epel
 - name: 'include variables'
   when:
-    - ansible_system == 'Linux'
+    - ansible_facts["system"] == 'Linux'
   include_vars:
     file: '{{ lookup("first_found", findme ) }}'
     name: 'ensure_repo_epel'
   vars:
     findme:
       files:
-        - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml'
-        - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-default.yml'
-        - '{{ ansible_distribution }}-default.yml'
-        - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml'
-        - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-default.yml'
+        - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_architecture }}.yml'
+        - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml'
+        - '{{ ansible_facts["distribution"] }}-default.yml'
+        - '{{ ansible_os_family }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_architecture }}.yml'
+        - '{{ ansible_os_family }}-{{ ansible_facts["distribution_major_version"] }}-default.yml'
         - '{{ ansible_os_family }}-default.yml'
         - 'default.yml'
       paths:
@@ -21,17 +21,17 @@
       errors: 'ignore'
 - name: 'package discovery'
   when:
-    - ansible_system == 'Linux'
-    - packages is not defined
+    - ansible_facts["system"] == 'Linux'
+    - ansible_facts["packages"] is not defined
   ansible.builtin.package_facts:
 - name: 'service discovery'
   when:
-    - ansible_system == 'Linux'
+    - ansible_facts["system"] == 'Linux'
     - services is not defined
   ansible.builtin.service_facts:
 - name: 'ensure packages'
   when:
-    - ansible_system == 'Linux'
+    - ansible_facts["system"] == 'Linux'
     - ensure_repo_epel is defined
     - ensure_repo_epel.package_list is defined
     - ensure_repo_epel.package_list is iterable
@@ -48,7 +48,7 @@
     - 'ensure_repo_epel.service_facts'
 - name: 'ensure services'
   when:
-    - ansible_system == 'Linux'
+    - ansible_facts["system"] == 'Linux'
     - ensure_repo_epel is defined
     - ensure_repo_epel.service_list is defined
     - ensure_repo_epel.service_list is iterable
diff --git a/vars/CentOS-6-default.yml b/vars/AlmaLinux-8-default.yml
similarity index 64%
rename from vars/CentOS-6-default.yml
rename to vars/AlmaLinux-8-default.yml
index 7160069..8e42308 100644
--- a/vars/CentOS-6-default.yml
+++ b/vars/AlmaLinux-8-default.yml
@@ -1,7 +1,8 @@
 ---
 # vars file for ensure_repo_epel
 package_list:
-  - name: 'epel-release'
+  - disable_gpg_check: 'yes'
+    name: 'epel-release'
     state: 'present'
     url: 'epel-release'
 
diff --git a/vars/OracleLinux-8-default.yml b/vars/OracleLinux-8-default.yml
new file mode 100644
index 0000000..92bae84
--- /dev/null
+++ b/vars/OracleLinux-8-default.yml
@@ -0,0 +1,16 @@
+---
+# vars file for ensure_repo_epel
+package_list:
+  - disable_gpg_check: 'yes'
+    name: 'oracle-epel-release-el9'
+    state: 'present'
+    url: 'oracle-epel-release-el9'
+  - disable_gpg_check: 'yes'
+    name: 'oraclelinux-developer-release-el9'
+    state: 'present'
+    url: 'oraclelinux-developer-release-el9'
+  - disable_gpg_check: 'yes'
+    name: 'epel-release'
+    state: 'present'
+    url: 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm'
+
diff --git a/vars/CentOS-7-default.yml b/vars/Rocky-8-default.yml
similarity index 64%
rename from vars/CentOS-7-default.yml
rename to vars/Rocky-8-default.yml
index 7160069..8e42308 100644
--- a/vars/CentOS-7-default.yml
+++ b/vars/Rocky-8-default.yml
@@ -1,7 +1,8 @@
 ---
 # vars file for ensure_repo_epel
 package_list:
-  - name: 'epel-release'
+  - disable_gpg_check: 'yes'
+    name: 'epel-release'
     state: 'present'
     url: 'epel-release'