diff --git a/tasks/main.yml b/tasks/main.yml
index 4b1ca91..cc4ee56 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -16,11 +16,28 @@
     msg: "Management server is not running"
   when: ms_ext_mgmt_port_status | failed
 
-- include: with_no_proxy.yml
-  when: (https_proxy is not defined or https_proxy | trim == '') and (http_proxy is not defined or http_proxy | trim == '')
+#- include: with_no_proxy.yml
+#  when: (https_proxy is not defined or https_proxy | trim == '') and (http_proxy is not defined or http_proxy | trim == '')
+#
+#- include: with_proxy.yml
+#  when: https_proxy is defined and https_proxy | trim != '' and http_proxy is defined and http_proxy | trim != ''
 
-- include: with_proxy.yml
-  when: https_proxy is defined and https_proxy | trim != '' and http_proxy is defined and http_proxy | trim != ''
+- name: Apigee provision installation with proxy
+  shell: '{{ apigee_service }} apigee-provision install'
+#  when: not apigee_provision_status.stat.exists
+  environment:
+    no_proxy: "{{ no_proxy }}"
+    http_proxy: "{{ http_proxy }}"
+    https_proxy: "{{ https_proxy }}"
+
+- name: Apigee organization setup with proxy
+  shell: '{{ apigee_service }} apigee-provision setup-org -f {{ onboarding_config_file_path }}'
+#  ignore_errors: yes
+  environment:
+    no_proxy: "{{ no_proxy }}"
+    http_proxy: "{{ http_proxy }}"
+    https_proxy: "{{ https_proxy }}"
+
 
 - name: Apigee organization setup with no proxy
   shell: '{{ apigee_service }} apigee-provision setup-org -f {{ onboarding_config_file_path }}'