diff --git a/tasks/main.yml b/tasks/main.yml
index d204735..2026759 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -4,6 +4,10 @@
   shell: '{{ apigee_all }} stop'
   ignore_errors: yes
 
+- name: Clear all artifacts from YUM repo
+  shell: 'yum clean all'
+  ignore_errors: yes
+
 - name: Remove apigee, edge, baas and qpid packages
   ignore_errors: yes
   yum:
@@ -18,10 +22,6 @@
   - libdb-cxx-*
   - nginx-*
 
-- name: Clear all artifacts from YUM repo
-  shell: 'yum clean all'
-  ignore_errors: yes
-
 - name: Set target bootstrap script name for 4.16.01
   set_fact:
     bootstrap_script: '{{ opdk_installer_path }}/bootstrap.sh'
@@ -69,3 +69,16 @@
   async: 45
   poll: 0
 
+  - name: Create the apigee user
+    user:
+      name: "{{ opdk_user_name }}"
+      remove: yes
+      state: absent
+
+- name: Remove apigee user
+  - name: Create the apigee group
+    group:
+      name: "{{ opdk_group_name }}"
+      state: absent
+
+