diff --git a/tasks/main.yml b/tasks/main.yml
index c5be4f7..41a443b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -4,10 +4,18 @@
   shell: "bash {{ archive_folder }}/repos/bootstrap.sh apigeeprotocol='file://' apigeerepobasepath={{ archive_folder }}/repos JAVA_FIX=C"
   when: opdk_version | version_compare('4.16.01', '==')
 
+- name: DEBUG_MODE: Configure local repository - 4.16.01
+  shell: "bash -x {{ archive_folder }}/repos/bootstrap.sh apigeeprotocol='file://' apigeerepobasepath={{ archive_folder }}/repos JAVA_FIX=C"
+  when: opdk_version | version_compare('4.16.01', '==') and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
+
 - name: Configure local repository for greater than 4.16.01
   shell: "bash {{ archive_folder }}/repos/bootstrap_{{ opdk_version }}.sh apigeeprotocol='file://' apigeerepobasepath={{ archive_folder }}/repos JAVA_FIX=C"
   when: opdk_version | version_compare('4.16.01', '>')
 
+- name: DEBUG_MODE: Configure local repository for greater than 4.16.01
+  shell: "bash -x {{ archive_folder }}/repos/bootstrap_{{ opdk_version }}.sh apigeeprotocol='file://' apigeerepobasepath={{ archive_folder }}/repos JAVA_FIX=C"
+  when: opdk_version | version_compare('4.16.01', '>') and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
+
 - name: Install apigee setup service
   shell: '{{ apigee_service }} apigee-setup install'