diff --git a/defaults/main.yml b/defaults/main.yml
index 2dc6e34..21eb84f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
 # 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"
-epel_6_repo: https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm
-epel_7_repo: http://elrepo.org/linux/extras/el7/x86_64/RPMS/elrepo-release-7-0.el7.elrepo.noarch.rpm
+#epel_repo: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm"
+#epel_6_repo: https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm
+#epel_7_repo: http://elrepo.org/linux/extras/el7/x86_64/RPMS/elrepo-release-7-0.el7.elrepo.noarch.rpm
diff --git a/tasks/main.yml b/tasks/main.yml
index dde9651..ad3b427 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,6 +3,16 @@
   setup:
   when: ansible_distribution_major_version is not defined or ansible_distribution is not defined or ansible_bios_version is not defined
 
+- name: Configure AWS AMI OS package manager repositories for Apigee
+  become: yes
+  shell: "/usr/bin/yum-config-manager --enable rhui-REGION-rhel-server-extras rhui-REGION-rhel-server-optional"
+  when: ansible_bios_version | lower | search('amazon') and ansible_distribution | lower != 'redhat' and ansible_distribution_major_version | version_compare('6', '>')
+
+- name: Register with Redhat Subscription management
+  become: yes
+  shell: "subscription-manager register --username={{ rhel_user_name }} --password={{ rhel_password }} --auto-attach"
+  when: ansible_distribution | lower == 'redhat' and ansible_distribution_major_version | version_compare('7', '>')
+
 - name: Configure EPEL with no proxy
   include_tasks: with_no_proxy.yml
   when: (https_proxy is not defined or https_proxy | trim == '') and (http_proxy is not defined or http_proxy | trim == '') and (no_proxy is not defined or no_proxy | trim == '')
diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
index 5c04439..d50abef 100644
--- a/tasks/with_no_proxy.yml
+++ b/tasks/with_no_proxy.yml
@@ -1,16 +1,5 @@
 ---
 # tasks file for apigee-opdk-setup-epel
-- name: Configure AWS AMI OS package manager repositories for Apigee
-  become: yes
-  shell: "/usr/bin/yum-config-manager --enable rhui-REGION-rhel-server-extras rhui-REGION-rhel-server-optional"
-  when: ansible_bios_version | lower | search('amazon') and ansible_distribution | lower != 'redhat' and ansible_distribution_major_version | version_compare('6', '>')
-
-# TODO: Look up the ansible_distribution name for RHEL systems
-- name: Register with Redhat Subscription management
-  become: yes
-  shell: "subscription-manager register --username={{ rhel_user_name }} --password={{ rhel_password }} --auto-attach"
-  when: ansible_distribution | lower == 'redhat' and ansible_distribution_major_version | version_compare('7', '>')
-
 - name: Update EPEL with no proxy
   become: yes
   yum:
@@ -27,7 +16,7 @@
 - name: Update EPEL with no proxy
   become: yes
   yum:
-    name: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm"
+    name: "{{ epel_repo }}"
     state: present
   when: opdk_version | version_compare('4.17.05', '>')
 
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
index 9b858fd..e17ff6b 100644
--- a/tasks/with_proxy.yml
+++ b/tasks/with_proxy.yml
@@ -1,14 +1,5 @@
 ---
 # tasks file for apigee-opdk-setup-epel
-- name: Configure AWS AMI OS package manager repositories for Apigee
-  shell: "/usr/bin/yum-config-manager --enable rhui-REGION-rhel-server-extras rhui-REGION-rhel-server-optional"
-  when: ansible_bios_version | lower | search('amazon') and ansible_distribution | lower == 'redhat' and ansible_distribution_major_version | version_compare('6', '>')
-
-# TODO: Look up the ansible_distribution name for RHEL systems
-#- name: If using RHEL then register RHEL on RHN
-#  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 proxy
   yum:
     name: epel-release
@@ -30,7 +21,7 @@
 
 - name: Update EPEL with proxy
   yum:
-    name: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm"
+    name: "{{ epel_repo }}"
     state: present
   environment:
     http_proxy: "{{ http_proxy }}"