diff --git a/tasks/install-mirror.yml b/tasks/install-mirror.yml
index a9e312f..98fb0c4 100644
--- a/tasks/install-mirror.yml
+++ b/tasks/install-mirror.yml
@@ -5,9 +5,21 @@
     JAVA_HOME: '{{ java_home }}'
   when: opdk_version | version_compare('4.16.01', '==')
 
+- name: DEBUG_MODE: Install bootstrap from local repository for 4.16.01
+  shell: "bash -x {{ archive_folder }}/repos/bootstrap.sh apigeeprotocol='file://' apigeerepobasepath={{ archive_folder }}/repos JAVA_FIX=C"
+  env:
+    JAVA_HOME: '{{ java_home }}'
+  when: opdk_version | version_compare('4.16.01', '==') and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
+
 - name: Install bootstrap from 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"
   env:
     JAVA_HOME: '{{ java_home }}'
   when: opdk_version | version_compare('4.16.01', '>')
 
+- name: DEBUG_MODE: Install bootstrap from 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"
+  env:
+    JAVA_HOME: '{{ java_home }}'
+  when: opdk_version | version_compare('4.16.01', '>') and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
+
diff --git a/tasks/online/install-bootstrap-with-no-proxy.yml b/tasks/online/install-bootstrap-with-no-proxy.yml
index f75ed44..df954de 100644
--- a/tasks/online/install-bootstrap-with-no-proxy.yml
+++ b/tasks/online/install-bootstrap-with-no-proxy.yml
@@ -5,6 +5,12 @@
     JAVA_HOME: '{{ java_home }}'
   when: upgrade_edge is defined and upgrade_edge | bool == True
 
+- name: DEBUG_MODE: Update apigee-service if upgrade_edge is set as part of an upgrade
+  shell: "bash -x {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword='{{ apigee_repo_password }}' JAVA_FIX=C"
+  env:
+    JAVA_HOME: '{{ java_home }}'
+  when: upgrade_edge is defined and upgrade_edge | bool == True and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
+
 - name: Install bootstrap from the provided apigee_repo_uri and apigee_repo_protocol with no proxy
   shell: 'bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeerepohost={{ apigee_repo_uri | default(default_apigee_repo_uri) }} apigeeprotocol={{ apigee_repo_protocol | default(default_apigee_repo_protocol) }}:// JAVA_FIX=C'
   args:
@@ -15,6 +21,16 @@
   when: apigee_stage is not defined
   register: results
 
+- name: DEBUG_MODE: Install bootstrap from the provided apigee_repo_uri and apigee_repo_protocol with no proxy
+  shell: 'bash -x {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeerepohost={{ apigee_repo_uri | default(default_apigee_repo_uri) }} apigeeprotocol={{ apigee_repo_protocol | default(default_apigee_repo_protocol) }}:// JAVA_FIX=C'
+  args:
+    creates: '{{ apigee_installation_home }}/apigee-service/bin/apigee-service'
+  env:
+    JAVA_HOME: '{{ java_home }}'
+  failed_when: results is defined and results.rc is defined and results.rc > 0 or results | failed
+  when: apigee_stage is not defined and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
+  register: results
+
 - name: Install bootstrap from development repositories with no proxy
   shell: 'bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeestage={{ apigee_stage }} apigeerepohost={{ apigee_repo_uri  | default(default_apigee_repo_uri) }} apigeeprotocol={{ apigee_repo_protocol  | default(default_apigee_repo_protocol) }}:// JAVA_FIX=C'
   args:
@@ -24,3 +40,13 @@
   failed_when: results is defined and results.rc is defined and results.rc > 0 or results | failed
   register: results
   when: apigee_stage is defined
+
+- name: DEBUG_MODE: Install bootstrap from development repositories with no proxy
+  shell: 'bash -x {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeestage={{ apigee_stage }} apigeerepohost={{ apigee_repo_uri  | default(default_apigee_repo_uri) }} apigeeprotocol={{ apigee_repo_protocol  | default(default_apigee_repo_protocol) }}:// JAVA_FIX=C'
+  args:
+    creates: '{{ apigee_installation_home }}/apigee-service/bin/apigee-service'
+  env:
+    JAVA_HOME: '{{ java_home }}'
+  failed_when: results is defined and results.rc is defined and results.rc > 0 or results | failed
+  register: results
+  when: apigee_stage is defined and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
diff --git a/tasks/online/install-bootstrap-with-proxy.yml b/tasks/online/install-bootstrap-with-proxy.yml
index cd047ba..99dde3e 100644
--- a/tasks/online/install-bootstrap-with-proxy.yml
+++ b/tasks/online/install-bootstrap-with-proxy.yml
@@ -9,6 +9,16 @@
     http_proxy: "{{ http_proxy }}"
     https_proxy: "{{ https_proxy }}"
 
+- name: DEBUG_MODE: Update apigee-service if upgrade_edge is set as part of an upgrade with proxy
+  shell: "bash -x {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword='{{ apigee_repo_password }}' JAVA_FIX=C"
+  env:
+    JAVA_HOME: '{{ java_home }}'
+  when: upgrade_edge is defined and upgrade_edge | bool == True and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
+  environment:
+    no_proxy: "{{ no_proxy }}"
+    http_proxy: "{{ http_proxy }}"
+    https_proxy: "{{ https_proxy }}"
+
 - name: Install bootstrap from the provided apigee_repo_uri and apigee_repo_protocol with proxy
   shell: 'bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeerepohost={{ apigee_repo_uri | default(default_apigee_repo_uri) }} apigeeprotocol={{ apigee_repo_protocol | default(default_apigee_repo_protocol) }}:// JAVA_FIX=C'
   args:
@@ -23,6 +33,20 @@
     http_proxy: "{{ http_proxy }}"
     https_proxy: "{{ https_proxy }}"
 
+- name: DEBUG_MODE: Install bootstrap from the provided apigee_repo_uri and apigee_repo_protocol with proxy
+  shell: 'bash -x {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeerepohost={{ apigee_repo_uri | default(default_apigee_repo_uri) }} apigeeprotocol={{ apigee_repo_protocol | default(default_apigee_repo_protocol) }}:// JAVA_FIX=C'
+  args:
+    creates: '{{ apigee_installation_home }}/apigee-service/bin/apigee-service'
+  env:
+    JAVA_HOME: '{{ java_home }}'
+  failed_when: results is defined and results.rc is defined and results.rc > 0 or results | failed
+  register: results
+  when: apigee_stage is not defined and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
+  environment:
+    no_proxy: "{{ no_proxy }}"
+    http_proxy: "{{ http_proxy }}"
+    https_proxy: "{{ https_proxy }}"
+
 - name: Install bootstrap from development repositories with proxy
   shell: 'bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeestage={{ apigee_stage }} apigeerepohost={{ apigee_repo_uri | default(default_apigee_repo_uri) }} apigeeprotocol={{ apigee_repo_protocol | default(default_apigee_repo_protocol) }}:// JAVA_FIX=C'
   args:
@@ -36,3 +60,17 @@
     no_proxy: "{{ no_proxy }}"
     http_proxy: "{{ http_proxy }}"
     https_proxy: "{{ https_proxy }}"
+
+- name: DEBUG_MODE: Install bootstrap from development repositories with proxy
+  shell: 'bash -x {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeestage={{ apigee_stage }} apigeerepohost={{ apigee_repo_uri | default(default_apigee_repo_uri) }} apigeeprotocol={{ apigee_repo_protocol | default(default_apigee_repo_protocol) }}:// JAVA_FIX=C'
+  args:
+    creates: '{{ apigee_installation_home }}/apigee-service/bin/apigee-service'
+  env:
+    JAVA_HOME: '{{ java_home }}'
+  failed_when: results is defined and results.rc is defined and results.rc > 0 or results | failed
+  register: results
+  when: apigee_stage is defined and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
+  environment:
+    no_proxy: "{{ no_proxy }}"
+    http_proxy: "{{ http_proxy }}"
+    https_proxy: "{{ https_proxy }}"