diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
index 4637758..388c3ed 100644
--- a/tasks/with_no_proxy.yml
+++ b/tasks/with_no_proxy.yml
@@ -1,15 +1,15 @@
 ---
 # tasks file for apigee-opdk-setup-os
-- name: Yum update
-  yum:
-    name: '*'
-    state: latest
-
 - 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
-  when: epel_repo is not defined and epel_repo | trim != ''
+#  when: epel_repo is not defined and epel_repo | trim != ''
+
+- name: Yum update with no proxy
+  yum:
+    name: '*'
+    state: latest
 
 #- name: Update EPEL from custom location with no proxy
 #  yum:
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
index a3d6f63..c0b78f0 100644
--- a/tasks/with_proxy.yml
+++ b/tasks/with_proxy.yml
@@ -7,7 +7,7 @@
     http_proxy: "{{ http_proxy }}"
     https_proxy: "{{ https_proxy }}"
     no_proxy: "{{ no_proxy }}"
-  when: epel_repo is not defined and epel_repo | trim != ''
+#  when: epel_repo is not defined and epel_repo | trim != ''
 
 #- name: Update EPEL from custom location with proxy
 #  yum:
@@ -19,7 +19,7 @@
 #    no_proxy: "{{ no_proxy }}"
 #  when: epel_repo is defined and epel_repo | trim != ''
 
-- name: Yum update
+- name: Yum update with proxy
   yum:
     name: '*'
     state: latest