diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
index fa87389..789cafb 100644
--- a/tasks/with_no_proxy.yml
+++ b/tasks/with_no_proxy.yml
@@ -1,20 +1,6 @@
 ---
-# tasks file for apigee-opdk-setup-os
-
-- name: Download pip package manager
-  become: yes
-  tags: ['pip-manager']
-  get_url:
-    url: https://bootstrap.pypa.io/get-pip.py
-    dest: /tmp/get-pip.py
-  when: pip_conf_dir is not defined
-
-- name: Install pip package manager
-  become: yes
-  tags: ['pip-manager']
-  shell: python /tmp/get-pip.py
-  when: pip_conf_dir is not defined
-
+# tasks file for apigee-opdk-setup-os-pip
+#- block:
 - name: Update pip
   tags: ['pip']
   become: yes
@@ -29,3 +15,33 @@
     name: '{{ item }}'
     state: present
   with_items: "{{ pip_packages }}"
+
+#  rescue:
+#    - name: Download pip package manager
+#      become: yes
+#      tags: ['pip-manager']
+#      get_url:
+#        url: https://bootstrap.pypa.io/get-pip.py
+#        dest: /tmp/get-pip.py
+#      when: pip_conf_dir is not defined
+#
+#    - name: Install pip package manager
+#      become: yes
+#      tags: ['pip-manager']
+#      shell: python /tmp/get-pip.py
+#      when: pip_conf_dir is not defined
+#
+#    - name: Update pip
+#      tags: ['pip']
+#      become: yes
+#      pip:
+#        name: pip
+#        state: latest
+#
+#    - name: Update python packages
+#      tags: ['pip']
+#      become: yes
+#      pip:
+#        name: '{{ item }}'
+#        state: present
+#      with_items: "{{ pip_packages }}"