diff --git a/tasks/main.yml b/tasks/main.yml
index daa73a3..d7c3eb4 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -10,12 +10,12 @@
 
   - name: Uninstall Apigee Setup
     ignore_errors: yes
-    shell: '{{ apigee_service }} apigee-setup uninstall'
+    command: '{{ apigee_service }} apigee-setup uninstall'
     when: opdk_version | version_compare('4.16', '>=')
 
   - name: Uninstall Apigee Admin
     ignore_errors: yes
-    shell: '{{ apigee_service }} apigee-adminapi uninstall'
+    command: '{{ apigee_service }} apigee-adminapi uninstall'
     when: opdk_version | version_compare('4.16', '>=')
 
   when: upgrade_edge is defined and upgrade_edge | bool == True
@@ -23,12 +23,12 @@
 - block:
 
   - name: Install Apigee Setup
-    shell: '{{ apigee_service }} apigee-setup install'
+    command: '{{ apigee_service }} apigee-setup install'
     args:
       creates: '{{ apigee_installation_home }}/apigee-setup/bin/setup.sh'
 
   - name: Install Apigee Admin
-    shell: '{{ apigee_service }} apigee-adminapi install'
+    command: '{{ apigee_service }} apigee-adminapi install'
     args:
       creates: '{{ apigee_installation_home }}/apigee-adminapi/bin/apigee-adminapi.sh'