diff --git a/tasks/main.yml b/tasks/main.yml
index 04713d3..0e8c3f8 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -6,6 +6,21 @@
     mode: 0644
     force: yes
 
+- block:
+
+  - name: Install Apigee Setup
+    shell: 'bash {{ apigee_service }} apigee-setup uninstall'
+    args:
+      creates: '{{ apigee_installation_home }}/apigee-setup/bin/setup.sh'
+    when: opdk_version | version_compare('4.16', '>=')
+
+  - name: Install Apigee Admin
+    shell: 'bash {{ apigee_service }} apigee-adminapi uninstall'
+    args:
+      creates: '{{ apigee_installation_home }}/apigee-adminapi/bin/apigee-adminapi.sh'
+    when: opdk_version | version_compare('4.16', '>=')
+  when: upgrade_edge is defined and upgrade_edge | bool == True
+
 - name: Install Apigee Setup
   shell: 'bash {{ apigee_service }} apigee-setup install'
   args: