diff --git a/roles/zfs/tasks/main.yml b/roles/zfs/tasks/main.yml
index 6ab5c8c..f30dc5c 100644
--- a/roles/zfs/tasks/main.yml
+++ b/roles/zfs/tasks/main.yml
@@ -1,5 +1,8 @@
 ---
 
+# TODO: Split tasks into distribution appropriate files
+# avoid running/skipping tasks entirely by not including them
+
 # temporarily added to test zfs role by itself
 #- name: check if atomic
 #  stat:
@@ -11,11 +14,17 @@
 #    is_atomic: "{{ ostree.stat.exists }}"
 # end temp additions
 
-- name: install zfs-release package (RHEL/CentOS)
+- name: install zfs-release package (EPEL 7)
   yum:
-    name: "http://download.zfsonlinux.org/epel/zfs-release.el8_0.noarch.rpm"
+    name: "http://download.zfsonlinux.org/epel/zfs-release.el7_7.noarch.rpm"
     state: present
-  when: ansible_distribution in ["CentOS" , "Red Hat Enterprise Linux" ]
+  when: (ansible_distribution in ["CentOS" , "Red Hat Enterprise Linux" ]) and (ansible_distribution_major_version == "7")
+
+- name: install zfs-release package (EPEL 8)
+  yum:
+    name: "http://download.zfsonlinux.org/epel/zfs-release.el8_1.noarch.rpm"
+    state: present
+  when: (ansible_distribution in ["CentOS" , "Red Hat Enterprise Linux" ]) and (ansible_distribution_major_version == "8")
 
 - name: install zfs-release package (Fedora)
   dnf: