diff --git a/tasks/main.yml b/tasks/main.yml
index 81cf723..bd27093 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -15,7 +15,7 @@
 
 - name: Validate that apigee-service exists
   stat:
-    path: "{{ apigee_installation_home }}/apigee-service/bin/apigee-service"
+    path: "{{ apigee_home }}/apigee-service/bin/apigee-service"
   register: apigee_service
 
 - name: Fail if apigee-service is not installed
diff --git a/tasks/online/install-bootstrap-with-no-proxy.yml b/tasks/online/install-bootstrap-with-no-proxy.yml
index f9f6990..ea5da89 100644
--- a/tasks/online/install-bootstrap-with-no-proxy.yml
+++ b/tasks/online/install-bootstrap-with-no-proxy.yml
@@ -17,7 +17,7 @@
   - 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:
-      creates: '{{ apigee_installation_home }}/apigee-service/bin/apigee-service'
+      creates: '{{ apigee_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
@@ -27,7 +27,7 @@
   - 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'
+      creates: '{{ apigee_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
@@ -39,7 +39,7 @@
   - 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'
+      creates: '{{ apigee_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
@@ -49,7 +49,7 @@
   - 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'
+      creates: '{{ apigee_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
diff --git a/tasks/online/install-bootstrap-with-proxy.yml b/tasks/online/install-bootstrap-with-proxy.yml
index 15bd01e..91dc3c4 100644
--- a/tasks/online/install-bootstrap-with-proxy.yml
+++ b/tasks/online/install-bootstrap-with-proxy.yml
@@ -22,7 +22,7 @@
 - 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:
-    creates: '{{ apigee_installation_home }}/apigee-service/bin/apigee-service'
+    creates: '{{ apigee_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
@@ -36,7 +36,7 @@
 - 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'
+    creates: '{{ apigee_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
@@ -50,7 +50,7 @@
 - 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:
-    creates: '{{ apigee_installation_home }}/apigee-service/bin/apigee-service'
+    creates: '{{ apigee_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
@@ -64,7 +64,7 @@
 - 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'
+    creates: '{{ apigee_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