diff --git a/tasks/main.yml b/tasks/main.yml
index 2f53edf..591e3c0 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -8,16 +8,26 @@
 
 - block:
 
-  - name: Uninstall Apigee Setup
+  - name: Uninstall Apigee Setup, if it exists
     ignore_errors: yes
     shell: '{{ apigee_service }} apigee-setup uninstall'
     when: opdk_version | version_compare('4.16', '>=')
 
-  - name: Uninstall Apigee Admin
+  - name: Uninstall Apigee Admin, if it exists
     ignore_errors: yes
     shell: '{{ apigee_service }} apigee-adminapi uninstall'
     when: opdk_version | version_compare('4.16', '>=')
 
+  - name: Uninstall Apigee Provision, if it exists
+    ignore_errors: yes
+    shell: '{{ apigee_service }} apigee-provision uninstall'
+    when: opdk_version | version_compare('4.16', '>=')
+
+  - name: Uninstall Apigee Migrate, if it exists
+    ignore_errors: yes
+    shell: '{{ apigee_service }} apigee-migrate uninstall'
+    when: opdk_version | version_compare('4.16', '>=')
+
   when: upgrade_edge is defined and upgrade_edge | bool == True
 
 - block: