diff --git a/tasks/main.yml b/tasks/main.yml
index b058f75..400961a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -40,19 +40,7 @@
 
   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 }}"
-
+- name: Use proxy definitions
+  include: with_proxy.yml
   when: opdk_version | version_compare('4.16', '>=') and http_proxy is defined and https_proxy is defined
 
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
new file mode 100644
index 0000000..52148f5
--- /dev/null
+++ b/tasks/with_proxy.yml
@@ -0,0 +1,12 @@
+---
+- 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 }}"