diff --git a/tasks/install-online.yml b/tasks/install-online.yml
index 4a96bf0..9354d0d 100644
--- a/tasks/install-online.yml
+++ b/tasks/install-online.yml
@@ -6,10 +6,10 @@
     group: "{{ opdk_group_name }}"
 
 - include: online/download-bootstrap-with-no-proxy.yml
-  when: http_proxy is not defined and https_proxy is not defined
+  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
-  when: http_proxy is defined and https_proxy is defined
+  when: https_proxy is defined and https_proxy | trim != '' and http_proxy is defined and http_proxy | trim != ''
 
 - name: Bootstrap script exists
   stat:
@@ -31,17 +31,17 @@
 
 - block:
   - include: online/install-bootstrap-with-no-proxy.yml
-    when: http_proxy is not defined and https_proxy is not defined
+    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
-    when: http_proxy is defined and https_proxy is defined
+    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
-      when: http_proxy is not defined and https_proxy is not defined
+      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
-      when: http_proxy is defined and https_proxy is defined
+      when: https_proxy is defined and https_proxy | trim != '' and http_proxy is defined and http_proxy | trim != ''
diff --git a/tasks/online/download-bootstrap-with-no-proxy.yml b/tasks/online/download-bootstrap-with-no-proxy.yml
index 47afef4..aba6251 100644
--- a/tasks/online/download-bootstrap-with-no-proxy.yml
+++ b/tasks/online/download-bootstrap-with-no-proxy.yml
@@ -3,7 +3,7 @@
   bootstrap:
     dest_dir: '{{ opdk_installer_path }}'
     version: '{{ opdk_version }}'
-    url: '{{ apigee_repo_url }}'
+    url: '{{ apigee_repo_url | default(default_apigee_repo_url) }}'
     user_name: '{{ apigee_repo_user }}'
     password: '{{ apigee_repo_password }}'
   register: results
diff --git a/tasks/online/download-bootstrap-with-proxy.yml b/tasks/online/download-bootstrap-with-proxy.yml
index 800df22..32fb024 100644
--- a/tasks/online/download-bootstrap-with-proxy.yml
+++ b/tasks/online/download-bootstrap-with-proxy.yml
@@ -3,7 +3,7 @@
   bootstrap:
     dest_dir: '{{ opdk_installer_path }}'
     version: '{{ opdk_version }}'
-    url: '{{ apigee_repo_url }}'
+    url: '{{ apigee_repo_url | default(default_apigee_repo_url) }}'
     user_name: '{{ apigee_repo_user }}'
     password: '{{ apigee_repo_password }}'
   register: results
diff --git a/tasks/online/install-bootstrap-with-no-proxy.yml b/tasks/online/install-bootstrap-with-no-proxy.yml
index d82a19b..f75ed44 100644
--- a/tasks/online/install-bootstrap-with-no-proxy.yml
+++ b/tasks/online/install-bootstrap-with-no-proxy.yml
@@ -6,7 +6,7 @@
   when: upgrade_edge is defined and upgrade_edge | bool == True
 
 - 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 }} apigeeprotocol={{ apigee_repo_protocol }}:// JAVA_FIX=C'
+  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:
     creates: '{{ apigee_installation_home }}/apigee-service/bin/apigee-service'
   env:
@@ -16,7 +16,7 @@
   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 }} apigeeprotocol={{ apigee_repo_protocol }}:// JAVA_FIX=C'
+  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:
     creates: '{{ apigee_installation_home }}/apigee-service/bin/apigee-service'
   env:
diff --git a/tasks/online/install-bootstrap-with-proxy.yml b/tasks/online/install-bootstrap-with-proxy.yml
index 79a1646..bcff6f6 100644
--- a/tasks/online/install-bootstrap-with-proxy.yml
+++ b/tasks/online/install-bootstrap-with-proxy.yml
@@ -10,7 +10,7 @@
     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 }} apigeeprotocol={{ apigee_repo_protocol }}:// JAVA_FIX=C'
+  shell: 'bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeerepohost={{ apigee_repo_uri | default(default_apigee_uri) }} apigeeprotocol={{ apigee_repo_protocol | default(default_apigee_repo_protocol) }}:// JAVA_FIX=C'
   args:
     creates: '{{ apigee_installation_home }}/apigee-service/bin/apigee-service'
   env:
@@ -24,7 +24,7 @@
     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 }} apigeeprotocol={{ apigee_repo_protocol }}:// JAVA_FIX=C'
+  shell: 'bash {{ bootstrap_script }} apigeeuser={{ apigee_repo_user }} apigeepassword={{ apigee_repo_password }} apigeestage={{ apigee_stage }} apigeerepohost={{ apigee_repo_uri | default(default_apigee_uri) }} apigeeprotocol={{ apigee_repo_protocol | default(default_apigee_repo_protocol) }}:// JAVA_FIX=C'
   args:
     creates: '{{ apigee_installation_home }}/apigee-service/bin/apigee-service'
   env: