diff --git a/tasks/main.yml b/tasks/main.yml
index dca5bff..f5e4cb3 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -60,16 +60,3 @@
     regexp: "^export CONTINUE_ON_WARNING="
     line: 'export CONTINUE_ON_WARNING={{ apigee_continue_on_warning }}'
     backup: yes
-
-- name: Update pip
-  become: yes
-  pip:
-    name: pip
-    state: latest
-
-- name: Update python packages
-  become: yes
-  pip:
-    name: '{{ item }}'
-    state: present
-  with_items: "{{ pip_packages }}"
diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
index 3e396d0..081ea8f 100644
--- a/tasks/with_no_proxy.yml
+++ b/tasks/with_no_proxy.yml
@@ -26,6 +26,12 @@
   shell: python /tmp/get-pip.py
   when: pip_conf_dir is not defined
 
+- name: Update pip
+  become: yes
+  pip:
+    name: pip
+    state: latest
+
 - name: Update python packages with no proxy
   become: yes
   pip:
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
index 6112fce..00dff9f 100644
--- a/tasks/with_proxy.yml
+++ b/tasks/with_proxy.yml
@@ -1,24 +1,4 @@
 ---
-#- name: Update EPEL with proxy
-#  yum:
-#    name: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm"
-#    state: present
-#  environment:
-#    http_proxy: "{{ http_proxy }}"
-#    https_proxy: "{{ https_proxy }}"
-#    no_proxy: "{{ no_proxy }}"
-#  when: epel_repo is not defined and epel_repo | trim != ''
-
-#- name: Update EPEL from custom location with proxy
-#  yum:
-#    name: "{{ epel_repo }}"
-#    state: present
-#  environment:
-#    http_proxy: "{{ http_proxy }}"
-#    https_proxy: "{{ https_proxy }}"
-#    no_proxy: "{{ no_proxy }}"
-#  when: epel_repo is defined and epel_repo | trim != ''
-
 - name: Yum update with proxy
   yum:
     name: '*'
@@ -39,7 +19,7 @@
     https_proxy: "{{ https_proxy }}"
     no_proxy: "{{ no_proxy }}"
 
-- name: Download pip package manager
+- name: Download pip package manager with proxy
   become: yes
   tags: ['pip-manager']
   get_url:
@@ -51,7 +31,7 @@
     https_proxy: "{{ https_proxy }}"
     no_proxy: "{{ no_proxy }}"
 
-- name: Install pip package manager
+- name: Install pip package manager with proxy
   become: yes
   tags: ['pip-manager']
   shell: python /tmp/get-pip.py
@@ -61,3 +41,23 @@
     https_proxy: "{{ https_proxy }}"
     no_proxy: "{{ no_proxy }}"
 
+- name: Update pip
+  become: yes
+  pip:
+    name: pip
+    state: latest
+  environment:
+    http_proxy: "{{ http_proxy }}"
+    https_proxy: "{{ https_proxy }}"
+    no_proxy: "{{ no_proxy }}"
+
+- name: Update python packages with no proxy
+  become: yes
+  pip:
+    name: '{{ item }}'
+    state: present
+  with_items: "{{ pip_packages }}"
+  environment:
+    http_proxy: "{{ http_proxy }}"
+    https_proxy: "{{ https_proxy }}"
+    no_proxy: "{{ no_proxy }}"