diff --git a/tasks/main.yml b/tasks/main.yml
index f1f6f8d..abe0706 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -14,11 +14,6 @@
   become: yes
   shell: "yum clean all"
 
-- name: Yum update
-  yum:
-    name: '*'
-    state: latest
-
 - name: Create pip config folder
   file:
     path: "{{ pip_conf_dir }}"
diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
index ea64b71..4637758 100644
--- a/tasks/with_no_proxy.yml
+++ b/tasks/with_no_proxy.yml
@@ -1,5 +1,10 @@
 ---
 # 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"
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
index 0393d78..a3d6f63 100644
--- a/tasks/with_proxy.yml
+++ b/tasks/with_proxy.yml
@@ -19,6 +19,16 @@
 #    no_proxy: "{{ no_proxy }}"
 #  when: epel_repo is defined and epel_repo | trim != ''
 
+- name: Yum update
+  yum:
+    name: '*'
+    state: latest
+  environment:
+    http_proxy: "{{ http_proxy }}"
+    https_proxy: "{{ https_proxy }}"
+    no_proxy: "{{ no_proxy }}"
+
+
 - name: Update basic yum os packages
   become: yes
   yum: