diff --git a/tasks/main.yml b/tasks/main.yml
index 2b2e3e6..913f1ef 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,8 +1,20 @@
 ---
 # tasks file for apigee-opdk-setup-os
 
+- 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_os_family | 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: Yum clean
+  become: yes
+  shell: yum clean all
+
 - name: Do not use proxy definitions
-  become_flags: beroot
   include: with_no_proxy.yml
   when: http_proxy is not defined and https_proxy is not defined
 
diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
index ab2eb2a..0fcf3b0 100644
--- a/tasks/with_no_proxy.yml
+++ b/tasks/with_no_proxy.yml
@@ -1,18 +1,5 @@
 ---
 # tasks file for apigee-opdk-setup-os
-- 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_os_family | 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: Yum clean
-  become: yes
-  shell: yum clean all
-
 - name: Update basic yum os packages
   become: yes
   yum:
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
index 952cf39..7b4a50c 100644
--- a/tasks/with_proxy.yml
+++ b/tasks/with_proxy.yml
@@ -1,18 +1,5 @@
 ---
 
-- 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_os_family | 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: Yum clean
-  become: yes
-  shell: yum clean all
-
 - name: Update basic yum os packages
   become: yes
   yum: