diff --git a/tasks/main.yml b/tasks/main.yml
index d6a264e..afc9172 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -53,7 +53,7 @@
 - block:
   - name: Find apigee & edge folders to remove on rollback
     find:
-      path: '{{ apigee_installation_home }}'
+      path: '{{ apigee_home }}'
       pattern: 'apigee*'
       recurse: no
       file_type: directory
@@ -61,7 +61,7 @@
 
   - name: Find edge folders to remove on rollback
     find:
-      path: '{{ apigee_installation_home }}'
+      path: '{{ apigee_home }}'
       pattern: 'edge*'
       recurse: no
       file_type: directory
@@ -100,11 +100,11 @@
       state: absent
     with_items:
     - /opt/nginx
-    - "{{ apigee_installation_home }}/data"
-    - "{{ apigee_installation_home }}/etc"
-    - "{{ apigee_installation_home }}/token"
-    - "{{ apigee_installation_home }}/var/lock"
-    - "{{ apigee_installation_home }}/var/run"
+    - "{{ apigee_home }}/data"
+    - "{{ apigee_home }}/etc"
+    - "{{ apigee_home }}/token"
+    - "{{ apigee_home }}/var/lock"
+    - "{{ apigee_home }}/var/run"
 
   - name: Determine current user
     shell: whoami
@@ -127,7 +127,7 @@
 - block:
   - name: Clear Edge logs on rollback
     find:
-      path: '{{ apigee_installation_home }}'
+      path: '{{ apigee_home }}'
       pattern: '*.log'
       file_type: 'file'
       recurse: yes