diff --git a/defaults/main.yml b/defaults/main.yml
index c6120dd..44162d7 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,7 +1,6 @@
 ---
 # defaults file for apigee-opdk-setup-os-common-extra
 os_packages:
-- https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
 - lsof
 - nc
 - dos2unix
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
index 8056ccc..9d1dd95 100644
--- a/tasks/with_proxy.yml
+++ b/tasks/with_proxy.yml
@@ -1,6 +1,11 @@
 ---
-
 - block:
+
+  - name: Update EPEL for version 7
+    yum:
+      name: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm"
+      state: present
+
   - name: Update troubleshooting OS packages
     become: yes
     yum: