diff --git a/tasks/main.yml b/tasks/main.yml
index e7fee2d..ed56c26 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,13 +2,13 @@
 # tasks file for apigee-opdk-setup-component
 - block:
 
-  - name: Install Apigee component for version {{ opdk_version }} or greater - {{ profile }}
-    command: '{{ apigee_setup }} -p {{ profile }} -f {{ opdk_installation_config_file }}'
-    when: opdk_version | version_compare('4.16.01', '>=')
+  - name: Use no proxy definitions
+    include: no_proxy.yml
+    when: opdk_version | version_compare('4.16', '>=') and http_proxy is not defined and https_proxy is not defined
 
-  - name: Wait for ready
-    command: '{{ apigee_all }} wait_for_ready'
-    when: validate_ready | default(true)
+  - 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
 
   rescue:
 
diff --git a/tasks/no_proxy.yml b/tasks/no_proxy.yml
new file mode 100644
index 0000000..dac90ae
--- /dev/null
+++ b/tasks/no_proxy.yml
@@ -0,0 +1,8 @@
+---
+- name: Install Apigee component for version {{ opdk_version }} or greater - {{ profile }}
+  command: '{{ apigee_setup }} -p {{ profile }} -f {{ opdk_installation_config_file }}'
+  when: opdk_version | version_compare('4.16.01', '>=')
+
+- name: Wait for ready
+  command: '{{ apigee_all }} wait_for_ready'
+  when: validate_ready | default(true)
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
new file mode 100644
index 0000000..72a1323
--- /dev/null
+++ b/tasks/with_proxy.yml
@@ -0,0 +1,15 @@
+---
+- name: Install Apigee component for version {{ opdk_version }} or greater - {{ profile }}
+  command: '{{ apigee_setup }} -p {{ profile }} -f {{ opdk_installation_config_file }}'
+  when: opdk_version | version_compare('4.16.01', '>=')
+  environment:
+    http_proxy: "{{ http_proxy }}"
+    https_proxy: "{{ https_proxy }}"
+
+- name: Wait for ready
+  command: '{{ apigee_all }} wait_for_ready'
+  when: validate_ready | default(true)
+  environment:
+    http_proxy: "{{ http_proxy }}"
+    https_proxy: "{{ https_proxy }}"
+