diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml
index bbc4c32..74224e3 100644
--- a/tasks/RedHat.yml
+++ b/tasks/RedHat.yml
@@ -3,9 +3,12 @@
 
 # http://fusioninventory.org/documentation/agent/installation/linux/rhel.html
 
+- name: Import EPEL GPG key
+  rpm_key:
+    key: "{{ fusioninventory__repo_gpgkey }}"
+    state: present
+
 - name: Add EPEL Repository
-  yum_repository:
-    name: Epel
-    description: EPEL YUM repo
-    baseurl: https://download.fedoraproject.org/pub/epel/$releasever/$basearch/
-    gpgkey: https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-{{ ansible_distribution_major_version }}
+  yum:
+    name: "{{ fusioninventory__repo_package }}"
+    state: present
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
index f192008..949c0f9 100644
--- a/vars/RedHat.yml
+++ b/vars/RedHat.yml
@@ -10,3 +10,6 @@ fusioninventory__agent_depend_packages:
 fusioninventory__agent_packages:
   - 'fusioninventory-agent'
   - 'fusioninventory-agent-task-inventory'
+
+fusioninventory__repo_package: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm"
+fusioninventory__repo_gpgkey: "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-{{ ansible_distribution_major_version }}"