diff --git a/roles/repo_zfs/defaults/main.yml b/roles/repo_zfs/defaults/main.yml
index 56e0764..fe4652f 100644
--- a/roles/repo_zfs/defaults/main.yml
+++ b/roles/repo_zfs/defaults/main.yml
@@ -3,4 +3,4 @@
 zfs_mod: kmod
 
 # Can be stable or testing
-zfs_branch: stable
+zfs_branch: "{{ ansible_distribution_version }}"
diff --git a/roles/repo_zfs/tasks/main.yml b/roles/repo_zfs/tasks/main.yml
index 2a851ae..6831a72 100644
--- a/roles/repo_zfs/tasks/main.yml
+++ b/roles/repo_zfs/tasks/main.yml
@@ -40,7 +40,7 @@
   yum_repository:
     name: zfs
     description: ZFS On Linux
-    baseurl: http://download.zfsonlinux.org/epel{{ (zfs_branch == 'testing') | ternary('-testing','') }}/{{ ansible_distribution_version }}/kmod/$basearch/
+    baseurl: http://download.zfsonlinux.org/epel/{{ zfs_branch }}{{ (zfs_mod == 'kmod') | ternary('/kmod','') }}/$basearch/
     gpgcheck: True
     gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-zfsonlinux
     skip_if_unavailable: True