diff --git a/roles/cache_clear/cache_clear-drupal7/tasks/main.yml b/roles/cache_clear/cache_clear-drupal7/tasks/main.yml
index e867be8a..6f72b3a5 100644
--- a/roles/cache_clear/cache_clear-drupal7/tasks/main.yml
+++ b/roles/cache_clear/cache_clear-drupal7/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Clear Drupal 7 cache.
   command:
-    cmd: "{{ drush_bin }} -y cc all -l {{ site.folder }}"
+    cmd: "{{ drush_bin }} -l {{ site.folder }} -y cc all"
     chdir: "{{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}"
   become: "{{ 'no' if www_user == deploy_user else 'yes' }}"
   become_user: "{{ www_user }}"
diff --git a/roles/cache_clear/cache_clear-drupal8/tasks/main.yml b/roles/cache_clear/cache_clear-drupal8/tasks/main.yml
index 948761e5..5b780086 100644
--- a/roles/cache_clear/cache_clear-drupal8/tasks/main.yml
+++ b/roles/cache_clear/cache_clear-drupal8/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Clear Drupal cache.
   command:
-    cmd: "{{ drush_bin }} -y cr -l {{ site.folder }}"
+    cmd: "{{ drush_bin }} -l {{ site.folder }} -y cr"
     chdir: "{{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}"
   become: "{{ 'no' if www_user == deploy_user else 'yes' }}"
   become_user: "{{ www_user }}"
diff --git a/roles/database_apply/database_apply-drupal7/tasks/features.yml b/roles/database_apply/database_apply-drupal7/tasks/features.yml
index 4cdedae3..edba46bf 100644
--- a/roles/database_apply/database_apply-drupal7/tasks/features.yml
+++ b/roles/database_apply/database_apply-drupal7/tasks/features.yml
@@ -1,8 +1,8 @@
 ---
 - name: Check if Features module is enabled.
-  shell: "cd {{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }} && {{ drush_bin }} pm-info features -l {{ site.folder }} | grep ':  enabled' | wc -l"
+  shell: "cd {{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }} && {{ drush_bin }} -l {{ site.folder }} pm-info features | grep ':  enabled' | wc -l"
   register: features_enabled
 
 - name: Revert Drupal configuration from Features.
-  shell: "cd {{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }} && {{ drush_bin }} -y {{ site.revert_features_command }} -l {{ site.folder }}"
+  shell: "cd {{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }} && {{ drush_bin }} -l {{ site.folder }} -y {{ site.revert_features_command }}"
   when: features_enabled.stdout == "1"
diff --git a/roles/database_apply/database_apply-drupal7/tasks/main.yml b/roles/database_apply/database_apply-drupal7/tasks/main.yml
index 9b7374a7..7c2201e2 100644
--- a/roles/database_apply/database_apply-drupal7/tasks/main.yml
+++ b/roles/database_apply/database_apply-drupal7/tasks/main.yml
@@ -2,7 +2,7 @@
 
 - name: Install Drupal.
   shell:
-    cmd: "{{ drush_bin }} -y si -l {{ site.folder }}"
+    cmd: "{{ drush_bin }} -l {{ site.folder }} -y si"
     chdir: "{{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}"
   become: "{{ 'no' if www_user == deploy_user else 'yes' }}"
   become_user: "{{ www_user }}"
@@ -21,7 +21,7 @@
 
 - name: Apply Drupal database updates.
   shell:
-    cmd: "{{ drush_bin }} -y updb -l {{ site.folder }}"
+    cmd: "{{ drush_bin }} -l {{ site.folder }} -y updb"
     chdir: "{{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}"
   with_items: "{{ drupal.sites }}"
   loop_control:
diff --git a/roles/database_apply/database_apply-drupal8/tasks/main.yml b/roles/database_apply/database_apply-drupal8/tasks/main.yml
index d90359e6..dc138585 100644
--- a/roles/database_apply/database_apply-drupal8/tasks/main.yml
+++ b/roles/database_apply/database_apply-drupal8/tasks/main.yml
@@ -15,7 +15,7 @@
 
 - name: Install Drupal.
   command:
-    cmd: "{{ drush_bin }} {{ site.install_command }} -l {{ site.folder }}"
+    cmd: "{{ drush_bin }} -l {{ site.folder }} {{ site.install_command }}"
     chdir: "{{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}"
   become: "{{ 'no' if www_user == deploy_user else 'yes' }}"
   become_user: "{{ www_user }}"
@@ -34,7 +34,7 @@
 
 - name: Apply Drupal database updates.
   command:
-    cmd: "{{ drush_bin }} -y updb -l {{ site.folder }}"
+    cmd: "{{ drush_bin }} -l {{ site.folder }} -y updb"
     chdir: "{{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}"
   become: "{{ 'no' if www_user == deploy_user else 'yes' }}"
   become_user: "{{ www_user }}"
@@ -44,7 +44,7 @@
 
 - name: Import configuration.
   command:
-    cmd: "{{ drush_bin }} -y {{ site.config_import_command }} -l {{ site.folder }}"
+    cmd: "{{ drush_bin }} -l {{ site.folder }} -y {{ site.config_import_command }}"
     chdir: "{{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}"
   become: "{{ 'no' if www_user == deploy_user else 'yes' }}"
   become_user: "{{ www_user }}"
diff --git a/roles/maintenance_mode/maintenance_mode-drupal-core/tasks/offline.yml b/roles/maintenance_mode/maintenance_mode-drupal-core/tasks/offline.yml
index 9ca0d353..cbe65b07 100644
--- a/roles/maintenance_mode/maintenance_mode-drupal-core/tasks/offline.yml
+++ b/roles/maintenance_mode/maintenance_mode-drupal-core/tasks/offline.yml
@@ -2,7 +2,7 @@
 # @todo this needs refactoring for multisite.
 - name: Enable maintenance mode.
   command:
-    cmd: "{{ drush_bin }} state:set system.maintenance_mode 1 --input-format=integer -l {{ site.folder }}"
+    cmd: "{{ drush_bin }} -l {{ site.folder }} state:set system.maintenance_mode 1 --input-format=integer"
     chdir: "{{ live_symlink_dest }}/{{ webroot }}/sites/{{ site.folder }}"
   become: "{{ 'no' if www_user == deploy_user else 'yes' }}"
   become_user: "{{ www_user }}"
@@ -12,7 +12,7 @@
 
 - name: Enable maintenance mode D7.
   shell:
-    cmd: "{{ drush_bin }} vset maintenance_mode 1 -l {{ site.folder }}"
+    cmd: "{{ drush_bin }} -l {{ site.folder }} vset maintenance_mode 1"
     chdir: "{{ live_symlink_dest }}/{{ webroot }}/sites/{{ site.folder }}"
   become: "{{ 'no' if www_user == deploy_user else 'yes' }}"
   become_user: "{{ www_user }}"
diff --git a/roles/maintenance_mode/maintenance_mode-drupal-core/tasks/online.yml b/roles/maintenance_mode/maintenance_mode-drupal-core/tasks/online.yml
index 77d0d108..e6a9cbf5 100644
--- a/roles/maintenance_mode/maintenance_mode-drupal-core/tasks/online.yml
+++ b/roles/maintenance_mode/maintenance_mode-drupal-core/tasks/online.yml
@@ -1,7 +1,7 @@
 ---
 - name: Disable maintenance mode.
   command:
-    cmd: "{{ drush_bin }} state:set system.maintenance_mode 0 --input-format=integer -l {{ site.folder }}"
+    cmd: "{{ drush_bin }} -l {{ site.folder }} state:set system.maintenance_mode 0 --input-format=integer"
     chdir: "{{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}"
   become: "{{ 'no' if www_user == deploy_user else 'yes' }}"
   become_user: "{{ www_user }}"
@@ -10,7 +10,7 @@
 
 - name: Disable maintenance mode D7.
   shell:
-    cmd: "{{ drush_bin }} vset maintenance_mode 0 -l {{ site.folder }}"
+    cmd: "{{ drush_bin }} -l {{ site.folder }} vset maintenance_mode 0"
     chdir: "{{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}"
   become: "{{ 'no' if www_user == deploy_user else 'yes' }}"
   become_user: "{{ www_user }}"
diff --git a/roles/sanitize/admin_creds/admin_creds-drupal7/tasks/admin.yml b/roles/sanitize/admin_creds/admin_creds-drupal7/tasks/admin.yml
index dcfcfcc3..c8d75bd7 100644
--- a/roles/sanitize/admin_creds/admin_creds-drupal7/tasks/admin.yml
+++ b/roles/sanitize/admin_creds/admin_creds-drupal7/tasks/admin.yml
@@ -6,6 +6,6 @@
     _admin_pwd: "{{ lookup('password', '/tmp/{{ project_name }}-{{ site.folder }}-{{ build_type }}-{{ build_number }}-pwd chars=ascii_letters') }}"
 
 - name: Reset admin username.
-  shell: "cd {{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }} && {{ drush_bin }} sql-query \"UPDATE users SET name='{{ _admin_user }}' WHERE uid=1;\" -l {{ site.folder }}"
+  shell: "cd {{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }} && {{ drush_bin }} -l {{ site.folder }} sql-query \"UPDATE users SET name='{{ _admin_user }}' WHERE uid=1;\""
 - name: Reset admin password.
-  shell: "cd {{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }} && {{ drush_bin }} upwd {{ _admin_user }} --password='{{ _admin_pwd }}' -l {{ site.folder }}"
\ No newline at end of file
+  shell: "cd {{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }} && {{ drush_bin }} -l {{ site.folder }} upwd {{ _admin_user }} --password='{{ _admin_pwd }}'"
\ No newline at end of file
diff --git a/roles/sanitize/admin_creds/admin_creds-drupal8/tasks/admin.yml b/roles/sanitize/admin_creds/admin_creds-drupal8/tasks/admin.yml
index 7b9e00cf..c2adafdf 100644
--- a/roles/sanitize/admin_creds/admin_creds-drupal8/tasks/admin.yml
+++ b/roles/sanitize/admin_creds/admin_creds-drupal8/tasks/admin.yml
@@ -4,14 +4,14 @@
 # Loading the user directly is akward, but at least means we don't bypass entity update.
 - name: Reset admin username.
   command:
-    cmd: "{{ drush_bin }} php-eval '$admin = \\Drupal\\user\\Entity\\User::load(1); $admin->setUsername(\"{{ admin_creds.username }}\");$admin->save();' -l {{ site.folder }}"
+    cmd: "{{ drush_bin }} -l {{ site.folder }} php-eval '$admin = \\Drupal\\user\\Entity\\User::load(1); $admin->setUsername(\"{{ admin_creds.username }}\");$admin->save();' "
     chdir: "{{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}"
   when:
     - admin_creds.username | length > 1
 
 - name: Reset admin password.
   command:
-    cmd: "{{ drush_bin }} php-eval '$admin = \\Drupal\\user\\Entity\\User::load(1); $admin->setPassword(\"{{ admin_creds.password }}\");$admin->save();' -l {{ site.folder }}"
+    cmd: "{{ drush_bin }} -l {{ site.folder }} php-eval '$admin = \\Drupal\\user\\Entity\\User::load(1); $admin->setPassword(\"{{ admin_creds.password }}\");$admin->save();' "
     chdir: "{{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}"
   when:
     - admin_creds.password | length > 1
diff --git a/roles/sanitize/sanitize-drupal8/tasks/main.yml b/roles/sanitize/sanitize-drupal8/tasks/main.yml
index df9c4e0b..26675f27 100644
--- a/roles/sanitize/sanitize-drupal8/tasks/main.yml
+++ b/roles/sanitize/sanitize-drupal8/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Sanitize database.
   command:
-    cmd: "{{ drush_bin }} -y {{ site.sanitize_command }} -l {{ site.folder }}"
+    cmd: "{{ drush_bin }} -l {{ site.folder }} -y {{ site.sanitize_command }}"
     chdir: "{{ live_symlink_dest }}/{{ webroot }}/sites/{{ site.folder }}"
   become: "{{ 'no' if www_user == deploy_user else 'yes' }}"
   become_user: "{{ www_user }}"