diff --git a/tasks/main.yml b/tasks/main.yml
index 2112671..8271895 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -48,51 +48,51 @@
   - '{{ apigee_validate_config_file }}'
   - '{{ onboarding_config_file_path }}'
 
-- name: Remove /opt/apigee on rolback
-  ignore_errors: yes
-  file:
-    path: '{{ item }}'
-    state: absent
-    follow: yes
-  with_items:
-  - '{{ apigee_installation_home }}'
-  when: remove_apigee is defined and remove_apigee
+- block:
 
-- name: Determine current user
-  shell: whoami
-  register: whoami
+  - name: Remove /opt/apigee on rolback
+    ignore_errors: yes
+    become: yes
+    file:
+      path: '{{ item }}'
+      state: absent
+      follow: yes
+    with_items:
+    - '{{ apigee_installation_home }}'
 
-- name: Determine if safe to kill user owned process
-  set_fact:
-    kill_user: '{{ whoami.stdout != opdk_user_name }}'
-  when: remove_apigee is defined and remove_apigee
+  - name: Determine current user
+    shell: whoami
+    register: whoami
 
-- name: Release any apigee user owned processes
-  become: yes
-  shell: 'pkill -u {{ opdk_user_name }}'
-  ignore_errors: yes
-  when: kill_user
-  async: 45
-  poll: 0
-  when: remove_apigee is defined and remove_apigee
+  - name: Determine if safe to kill user owned process
+    set_fact:
+      kill_user: '{{ whoami.stdout != opdk_user_name }}'
 
-- name: Remove apigee user
-  become: yes
-  ignore_errors: yes
-  user:
-    name: "{{ opdk_user_name }}"
-    remove: yes
-    state: absent
-  async: 45
-  poll: 0
-  when: remove_apigee is defined and remove_apigee
+  - name: Release any apigee user owned processes
+    ignore_errors: yes
+    become: yes
+    shell: 'pkill -u {{ opdk_user_name }}'
+    when: kill_user
+    async: 45
+    poll: 0
 
-- name: Remove the apigee group
-  become: yes
-  ignore_errors: yes
-  group:
-    name: "{{ opdk_group_name }}"
-    state: absent
-  async: 45
-  poll: 0
+  - name: Remove apigee user
+    ignore_errors: yes
+    become: yes
+    user:
+      name: "{{ opdk_user_name }}"
+      remove: yes
+      state: absent
+    async: 45
+    poll: 0
+
+  - name: Remove the apigee group
+    ignore_errors: yes
+    become: yes
+    group:
+      name: "{{ opdk_group_name }}"
+      state: absent
+    async: 45
+    poll: 0
+
   when: remove_apigee is defined and remove_apigee