diff --git a/tasks/install-online.yml b/tasks/install-online.yml
index 9354d0d..aaf9cf1 100644
--- a/tasks/install-online.yml
+++ b/tasks/install-online.yml
@@ -5,10 +5,12 @@
     owner: "{{ opdk_user_name }}"
     group: "{{ opdk_group_name }}"
 
-- include: online/download-bootstrap-with-no-proxy.yml
+- name: Download bootstrap with no proxy
+  include_tasks: online/download-bootstrap-with-no-proxy.yml
   when: (https_proxy is not defined or https_proxy | trim == '') and (http_proxy is not defined or http_proxy | trim == '')
 
-- include: online/download-bootstrap-with-proxy.yml
+- name: Download bootstrap with proxy
+  include_tasks: online/download-bootstrap-with-proxy.yml
   when: https_proxy is defined and https_proxy | trim != '' and http_proxy is defined and http_proxy | trim != ''
 
 - name: Bootstrap script exists
@@ -30,18 +32,18 @@
   shell: "yum clean all"
 
 - block:
-  - include: online/install-bootstrap-with-no-proxy.yml
+  - include_tasks: online/install-bootstrap-with-no-proxy.yml
     when: (https_proxy is not defined or https_proxy | trim == '') and (http_proxy is not defined or http_proxy | trim == '')
 
-  - include: online/install-bootstrap-with-proxy.yml
+  - include_tasks: online/install-bootstrap-with-proxy.yml
     when: https_proxy is defined and https_proxy | trim != '' and http_proxy is defined and http_proxy | trim != ''
 
   rescue:
     - name: Yum failed to update, let's clean yum
       shell: 'yum clean all'
 
-    - include: online/install-bootstrap-with-no-proxy.yml
+    - include_tasks: online/install-bootstrap-with-no-proxy.yml
       when: (https_proxy is not defined or https_proxy | trim == '') and (http_proxy is not defined or http_proxy | trim == '')
 
-    - include: online/install-bootstrap-with-proxy.yml
+    - include_tasks: online/install-bootstrap-with-proxy.yml
       when: https_proxy is defined and https_proxy | trim != '' and http_proxy is defined and http_proxy | trim != ''
diff --git a/tasks/online/install-bootstrap-with-no-proxy.yml b/tasks/online/install-bootstrap-with-no-proxy.yml
index b6c1adc..9f860d8 100644
--- a/tasks/online/install-bootstrap-with-no-proxy.yml
+++ b/tasks/online/install-bootstrap-with-no-proxy.yml
@@ -3,7 +3,7 @@
   shell: "bash {{ 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 not defined or opdk_debug_mode | trim | lower == 'off'
+  when: upgrade_edge is defined and upgrade_edge | bool == True and opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off' and (apigee_repo_uri is not defined or apigee_repo_uri | trim | length == 0)
 
 - 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"