diff --git a/meta/main.yml b/meta/main.yml
index 2db6b71af19c291d448f3837341234c01be4d6c7..b2c93f5cad0d1f99e494e40a5c1fee157002c4fa 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -17,6 +17,7 @@ galaxy_info:
     - name: EL
       versions:
         - 7
+        - 8
     - name: Fedora
       versions:
         - 30
diff --git a/molecule/alternative/molecule.yml b/molecule/alternative/molecule.yml
index 9fae6ea989966b89d41898c7875486fdb39c00ae..c9291ee178185633b17b008060c914e17e681d52 100644
--- a/molecule/alternative/molecule.yml
+++ b/molecule/alternative/molecule.yml
@@ -36,6 +36,14 @@ platforms:
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
+  - name: centos8
+    image: paulfantom/centos-molecule:8
+    docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    groups:
+      - python3
   - name: fedora
     image: paulfantom/fedora-molecule:30
     docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 59afbca736898490537701413bc196c36873352a..da65dceac0fb586197c098499bdef375c08627f3 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -36,6 +36,14 @@ platforms:
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
+  - name: centos8
+    image: paulfantom/centos-molecule:8
+    docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    groups:
+      - python3
   - name: fedora
     image: paulfantom/fedora-molecule:30
     docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
diff --git a/tasks/main.yml b/tasks/main.yml
index c29276c3fa73c64b2f122911d0e85d2b719c469d..2c90dc29db0b77345f2dfd9c92be3759ff003b78 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -4,7 +4,7 @@
   with_first_found:
     - "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
     - "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
-    - "{{ ansible_distribution_file_variety | lower }}.yml"
+    - "{{ ansible_distribution_file_variety | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
     - "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
     - "{{ ansible_distribution | lower }}.yml"
     - "{{ ansible_os_family | lower }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
diff --git a/vars/redhat.yml b/vars/redhat-7.yml
similarity index 100%
rename from vars/redhat.yml
rename to vars/redhat-7.yml