diff --git a/tasks/main.yml b/tasks/main.yml
index b9f54e6..c9401bb 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -85,7 +85,7 @@
       file_type: 'file'
     register: bootstrap_files
 
-  - name: Remove apigee & edge folders on rollback
+  - name: Remove found apigee & edge folders on rollback
     ignore_errors: yes
     become: yes
     file:
@@ -102,6 +102,13 @@
     file:
       path: /opt/nginx
       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
 
   - name: Determine current user
     shell: whoami