diff --git a/tasks/main.yml b/tasks/main.yml
index 400961a..8705566 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -30,14 +30,8 @@
 
   when: upgrade_edge is defined and upgrade_edge | bool == True
 
-- block:
-
-  - name: Install Apigee Setup
-    shell: '{{ apigee_service }} apigee-setup install'
-
-  - name: Install Apigee Admin
-    shell: '{{ apigee_service }} apigee-adminapi install'
-
+- name: Do not use proxy definitions
+  include: with_no_proxy.yml
   when: opdk_version | version_compare('4.16', '>=') and http_proxy is not defined and https_proxy is not defined
 
 - name: Use proxy definitions
diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
new file mode 100644
index 0000000..3221e66
--- /dev/null
+++ b/tasks/with_no_proxy.yml
@@ -0,0 +1,6 @@
+---
+- name: Install Apigee Setup
+  shell: '{{ apigee_service }} apigee-setup install'
+
+- name: Install Apigee Admin
+  shell: '{{ apigee_service }} apigee-adminapi install'