diff --git a/tasks/main.yml b/tasks/main.yml
index 31c1708..61c1dbe 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -24,10 +24,10 @@
 #
 #  when: opdk_version | version_compare('4.17.01', '>=')
 
-- include: install-online.yml
+- include_tasks: install-online.yml
   when: archive_folder is not defined
 
-- include: install-mirror.yml
+- include_tasks: install-mirror.yml
   when: archive_folder is defined and not archive_folder == ''
 
 - name: Validate that apigee-service exists
diff --git a/tasks/online/install-bootstrap-with-no-proxy.yml b/tasks/online/install-bootstrap-with-no-proxy.yml
index ec15a58..b6c1adc 100644
--- a/tasks/online/install-bootstrap-with-no-proxy.yml
+++ b/tasks/online/install-bootstrap-with-no-proxy.yml
@@ -31,22 +31,24 @@
   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:
-    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 not defined or opdk_debug_mode | trim | lower == 'off'
+- block:
+  - 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:
+      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 not defined or opdk_debug_mode | trim | lower == 'off'
 
-- 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'
+  - 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'
+  when: apigee_stage is defined or apigee_stage | trim | length > 0
\ No newline at end of file