diff --git a/roles/_init/tasks/drupal7.yml b/roles/_init/tasks/drupal7.yml
index 133b3d73..b1781c1b 100644
--- a/roles/_init/tasks/drupal7.yml
+++ b/roles/_init/tasks/drupal7.yml
@@ -1,8 +1,12 @@
 ---
-- name: Define Drush path.
+- name: Define path to drush for this build.
   set_fact:
     drush_bin: "{{ drush_bin | default('{{ bin_directory }}/drush.phar') }}"
 
-- name: Ensure we have Drush binary.
+- name: Define path to drush for currently live build. # usually the same as drush_bin for Drupal 7
+  set_fact:
+    drush_live_bin: "{{ drush_live_bin | default('{{ bin_directory }}/drush.phar') }}"
+
+- name: Ensure we have a drush binary.
   import_role:
     name: cli/drush
diff --git a/roles/_init/tasks/drupal8.yml b/roles/_init/tasks/drupal8.yml
index ebe63b82..3792c489 100644
--- a/roles/_init/tasks/drupal8.yml
+++ b/roles/_init/tasks/drupal8.yml
@@ -1,4 +1,8 @@
 ---
-- name: Define Drush path.
+- name: Define path to drush for this build.
   set_fact:
     drush_bin: "{{ drush_bin | default('{{ deploy_path }}/vendor/bin/drush') }}"
+
+- name: Define path to drush for currently live build.
+  set_fact:
+    drush_live_bin: "{{ drush_live_bin | default('{{ live_symlink_dest }}/vendor/bin/drush') }}"
\ No newline at end of file
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 2d6a9310..78314024 100644
--- a/roles/maintenance_mode/maintenance_mode-drupal-core/tasks/offline.yml
+++ b/roles/maintenance_mode/maintenance_mode-drupal-core/tasks/offline.yml
@@ -1,7 +1,7 @@
 ---
 - name: Enable maintenance mode.
   ansible.builtin.command:
-    cmd: "{{ drush_bin }} -l {{ site.folder }} state:set system.maintenance_mode 1 --input-format=integer --root {{ live_symlink_dest }}/{{ webroot }}/sites/{{ site.folder }}"
+    cmd: "{{ drush_live_bin }} -l {{ site.folder }} state:set system.maintenance_mode 1 --input-format=integer --root {{ live_symlink_dest }}/{{ webroot }}/sites/{{ site.folder }}"
   args:
     chdir: "{{ live_symlink_dest }}/{{ webroot }}/sites/{{ site.folder }}"
   become: "{{ 'no' if www_user == deploy_user else 'yes' }}"
@@ -13,7 +13,7 @@
 # For some reason D7 drush doesn't respect 'chdir' with command, using shell instead.
 - name: Enable maintenance mode D7.
   ansible.builtin.shell:
-    cmd: "{{ drush_bin }} -l {{ site.folder }} vset maintenance_mode 1"
+    cmd: "{{ drush_live_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 6b127f89..2598481a 100644
--- a/roles/maintenance_mode/maintenance_mode-drupal-core/tasks/online.yml
+++ b/roles/maintenance_mode/maintenance_mode-drupal-core/tasks/online.yml
@@ -1,9 +1,9 @@
 ---
 - name: Disable maintenance mode.
   ansible.builtin.command:
-    cmd: "{{ drush_bin }} -l {{ site.folder }} state:set system.maintenance_mode 0 --input-format=integer --root {{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}"
+    cmd: "{{ drush_live_bin }} -l {{ site.folder }} state:set system.maintenance_mode 0 --input-format=integer --root {{ live_symlink_dest }}/{{ webroot }}/sites/{{ site.folder }}"
   args:
-    chdir: "{{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}"
+    chdir: "{{ live_symlink_dest }}/{{ webroot }}/sites/{{ site.folder }}"
   become: "{{ 'no' if www_user == deploy_user else 'yes' }}"
   become_user: "{{ www_user }}"
   when:
@@ -12,8 +12,8 @@
 # For some reason D7 drush doesn't respect 'chdir' with command, using shell instead.
 - name: Disable maintenance mode D7.
   ansible.builtin.shell:
-    cmd: "{{ drush_bin }} -l {{ site.folder }} vset maintenance_mode 0"
-    chdir: "{{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}"
+    cmd: "{{ drush_live_bin }} -l {{ site.folder }} vset maintenance_mode 0"
+    chdir: "{{ live_symlink_dest }}/{{ webroot }}/sites/{{ site.folder }}"
   become: "{{ 'no' if www_user == deploy_user else 'yes' }}"
   become_user: "{{ www_user }}"
   when: