diff --git a/defaults/main.yml b/defaults/main.yml
index 6cbeafe..9f341d8 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,3 @@
 ---
 # defaults file for apigee-opdk-setup-epel
+#epel_7_link: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm"
diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
index a6cc41e..cf92b84 100644
--- a/tasks/with_no_proxy.yml
+++ b/tasks/with_no_proxy.yml
@@ -11,5 +11,10 @@
 
 - name: Update EPEL with no proxy
   yum:
-    name: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm"
+    name: epel-release
     state: present
+
+#- name: Update EPEL with no proxy
+#  yum:
+#    name: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm"
+#    state: present
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
index 9972060..da2e238 100644
--- a/tasks/with_proxy.yml
+++ b/tasks/with_proxy.yml
@@ -9,7 +9,16 @@
 #  shell: "subscription-manager register --username={{ rhel_user_name }} --password={{ rhel_password }} --auto-attach"
 #  when: ansible_bios_version | lower | search('amazon') and ansible_os_family | lower == 'redhat' and ansible_distribution_major_version | version_compare('7', '>')
 
-- name: Update EPEL with no proxy
+- name: Update EPEL with proxy
+  yum:
+    name: epel-release
+    state: present
+  environment:
+    http_proxy: "{{ http_proxy }}"
+    https_proxy: "{{ https_proxy }}"
+    no_proxy: "{{ no_proxy }}"
+
+- name: Update EPEL with proxy
   yum:
     name: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm"
     state: present