diff --git a/tasks/main.yml b/tasks/main.yml
index b2ac8d6..06381e1 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,10 +1,26 @@
 ---
 # tasks file for apigee-opdk-setup-component
-- name: Use no proxy definitions
-  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 == ''
+#- name: Use no proxy definitions
+#  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 == ''
 
-- name: Use proxy definitions
-  include: with_proxy.yml
-  when: https_proxy is defined and https_proxy | trim != '' and http_proxy is defined and http_proxy | trim != ''
+#- name: Use proxy definitions
+#  include: with_proxy.yml
+#  when: https_proxy is defined and https_proxy | trim != '' and http_proxy is defined and http_proxy | trim != ''
+
+- name: Install Apigee component with proxy - {{ component }}
+  shell: '{{ apigee_service }} {{ component }} install'
+  environment:
+    http_proxy: "{{ http_proxy }}"
+    https_proxy: "{{ https_proxy }}"
+    no_proxy: "{{ no_proxy }}"
+  when: opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
+
+- name: DEBUG_MODE - Install Apigee component - {{ component }}
+  shell: '/bin/bash -x {{ apigee_service }} {{ component }} install'
+  environment:
+    http_proxy: "{{ http_proxy }}"
+    https_proxy: "{{ https_proxy }}"
+    no_proxy: "{{ no_proxy }}"
+  when: opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
 
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
index 9805b06..765cfde 100644
--- a/tasks/with_proxy.yml
+++ b/tasks/with_proxy.yml
@@ -5,3 +5,13 @@
     http_proxy: "{{ http_proxy }}"
     https_proxy: "{{ https_proxy }}"
     no_proxy: "{{ no_proxy }}"
+  when: opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
+
+- name: DEBUG_MODE - Install Apigee component - {{ component }}
+  shell: '/bin/bash -x {{ apigee_service }} {{ component }} install'
+  environment:
+    http_proxy: "{{ http_proxy }}"
+    https_proxy: "{{ https_proxy }}"
+    no_proxy: "{{ no_proxy }}"
+  when: opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
+