diff --git a/tasks/online/install-bootstrap-with-no-proxy.yml b/tasks/online/install-bootstrap-with-no-proxy.yml
index 9f860d8..123a029 100644
--- a/tasks/online/install-bootstrap-with-no-proxy.yml
+++ b/tasks/online/install-bootstrap-with-no-proxy.yml
@@ -3,13 +3,13 @@
   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' and (apigee_repo_uri is not defined or apigee_repo_uri | trim | length == 0)
+  when: (apigee_repo_uri is not defined or apigee_repo_uri | trim | length == 0) and upgrade_edge is defined and upgrade_edge | bool == True and opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
 
 - 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'
+  when: (apigee_repo_uri is not defined or apigee_repo_uri | trim | length == 0) and 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'
@@ -18,7 +18,7 @@
   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 not defined or opdk_debug_mode | trim | lower == 'off'
+  when: (apigee_repo_uri is not defined and apigee_repo_uri | trim | length > 0) and apigee_stage is not defined and opdk_debug_mode is not defined or opdk_debug_mode | trim | lower == 'off'
   register: results
 
 - name: DEBUG_MODE - Install bootstrap from the provided apigee_repo_uri and apigee_repo_protocol with no proxy