diff --git a/roles/_init/tasks/drupal8.yml b/roles/_init/tasks/drupal8.yml
index 7c64719e..eb3bdae9 100644
--- a/roles/_init/tasks/drupal8.yml
+++ b/roles/_init/tasks/drupal8.yml
@@ -3,6 +3,10 @@
   set_fact:
     drush_bin: "{{ drush_bin | default('{{ deploy_path }}/vendor/bin/drush') }}"
 
+- name: Define path to drush for previous build.
+  set_fact:
+    previous_drush_bin: "{{ previous_drush_bin | default('{{ previous_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') }}"
diff --git a/roles/_init/tasks/main.yml b/roles/_init/tasks/main.yml
index 68eef579..75523e18 100644
--- a/roles/_init/tasks/main.yml
+++ b/roles/_init/tasks/main.yml
@@ -60,7 +60,7 @@
 
     - name: Set the previous deploy's path for later use where we need to manipulate the live site.
       ansible.builtin.set_fact:
-        previous_deploy_path: "{{ initial_deploy_path | default('{{ deploy_path_prefix }}{{ previous_build_number }}') }}"
+        previous_deploy_path: "{{ previous_deploy_path | default('{{ deploy_path_prefix }}{{ previous_build_number }}') }}"
 
     - name: Overwrite deploy and live_symlink paths if SquashFS deploy.
       ansible.builtin.set_fact:
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 0f420c8d..47a925f6 100644
--- a/roles/maintenance_mode/maintenance_mode-drupal-core/tasks/online.yml
+++ b/roles/maintenance_mode/maintenance_mode-drupal-core/tasks/online.yml
@@ -12,7 +12,7 @@
 # We want to also bring up the 'current' site with squashfs builds
 - name: Disable live site maintenance mode if this is a squashfs build.
   ansible.builtin.command:
-    cmd: "{{ drush_bin }} -l {{ site.folder }} state:set system.maintenance_mode 0 --input-format=integer --root {{ previous_deploy_path }}/{{ webroot }}/sites/{{ site.folder }}"
+    cmd: "{{ previous_drush_bin }} -l {{ site.folder }} state:set system.maintenance_mode 0 --input-format=integer --root {{ previous_deploy_path }}/{{ webroot }}/sites/{{ site.folder }}"
   args:
     chdir: "{{ previous_deploy_path }}/{{ webroot }}/sites/{{ site.folder }}"
   become: "{{ 'no' if www_user == deploy_user else 'yes' }}"