diff --git a/tasks/main.yml b/tasks/main.yml
index 961ffc1..b058f75 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -38,4 +38,21 @@
   - name: Install Apigee Admin
     shell: '{{ apigee_service }} apigee-adminapi install'
 
-  when: opdk_version | version_compare('4.16', '>=')
+  when: opdk_version | version_compare('4.16', '>=') and http_proxy is not defined and https_proxy is not defined
+
+- block:
+
+  - name: Install Apigee Setup
+    shell: '{{ apigee_service }} apigee-setup install'
+    environment:
+      http_proxy: "{{ http_proxy }}"
+      https_proxy: "{{ https_proxy }}"
+
+  - name: Install Apigee Admin
+    shell: '{{ apigee_service }} apigee-adminapi install'
+    environment:
+      http_proxy: "{{ http_proxy }}"
+      https_proxy: "{{ https_proxy }}"
+
+  when: opdk_version | version_compare('4.16', '>=') and http_proxy is defined and https_proxy is defined
+