diff --git a/rpmfusion-free-repo/defaults/main.yml b/rpmfusion-free-repo/defaults/main.yml
new file mode 100644
index 0000000..5e45ac7
--- /dev/null
+++ b/rpmfusion-free-repo/defaults/main.yml
@@ -0,0 +1,4 @@
+---
+rpmfusion_free_keyurl: >-
+  https://rpmfusion.org/keys?action=AttachFile&do=get&target=
+rpmfusion_base_url: https://mirrors.rpmfusion.org/free/
diff --git a/rpmfusion-free-repo/tasks/main.yml b/rpmfusion-free-repo/tasks/main.yml
index 15bfee8..220ca41 100644
--- a/rpmfusion-free-repo/tasks/main.yml
+++ b/rpmfusion-free-repo/tasks/main.yml
@@ -1,11 +1,24 @@
 ---
 - name: install rpm signing key
   rpm_key:
-    key: https://rpmfusion.org/keys?action=AttachFile&do=get&target=RPM-GPG-KEY-rpmfusion-free-el-8
+    key: "{{ rpmfusion_free_keyurl }}RPM-GPG-KEY-rpmfusion-free-el-{{ ansible_distribution_major_version }}"
     state: present
+  when: 'ansible_distribution != "Fedora"'
+
+- name: install rpm signing key
+  rpm_key:
+    key: "{{ rpmfusion_free_keyurl }}RPM-GPG-KEY-rpmfusion-free-fedora-2020"
+    state: present
+  when: 'ansible_distribution == "Fedora"'
 
 - name: enable repository
   package:
-    name: |
-      https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm
+    name: "{{ rpmfusion_baseurl }}/el/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm"
     state: installed
+  when: 'ansible_distribution != "Fedora"'
+
+- name: enable repository
+  package:
+    name: "{{ rpmfusion_baseurl }}/fedora/rpmfusion-free-release-{{ ansible_distribution_version }}.noarch.rpm"
+    state: installed
+  when: 'ansible_distribution == "Fedora"'