diff --git a/tasks/main.yml b/tasks/main.yml
index 55dff7d..3e7afc2 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -22,3 +22,7 @@
 
 - include: with_proxy.yml
   when: http_proxy is defined and https_proxy is defined
+
+- name: Apigee organization setup with no proxy
+  shell: '{{ apigee_service }} apigee-provision setup-org -f {{ onboarding_config_file_path }}'
+  ignore_errors: yes
diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
index 9af0b27..5050722 100644
--- a/tasks/with_no_proxy.yml
+++ b/tasks/with_no_proxy.yml
@@ -13,6 +13,6 @@
   shell: '{{ apigee_service }} apigee-provision install'
   when: not apigee_provision_status.stat.exists
 
-- name: Apigee organization setup with no proxy
-  shell: '{{ apigee_service }} apigee-provision setup-org -f {{ onboarding_config_file_path }}'
-  ignore_errors: yes
+#- name: Apigee organization setup with no proxy
+#  shell: '{{ apigee_service }} apigee-provision setup-org -f {{ onboarding_config_file_path }}'
+#  ignore_errors: yes
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
index f3ba0fe..e76e45c 100644
--- a/tasks/with_proxy.yml
+++ b/tasks/with_proxy.yml
@@ -21,10 +21,10 @@
     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 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 }}"