diff --git a/roles/_init/defaults/main.yml b/roles/_init/defaults/main.yml
index 432485d9..b38c1e59 100644
--- a/roles/_init/defaults/main.yml
+++ b/roles/_init/defaults/main.yml
@@ -25,3 +25,4 @@ drupal:
 mautic:
   image_path: "media/images"
   force_install: false
+bin_directory: "/home/{{ deploy_user }}/.bin"
\ No newline at end of file
diff --git a/roles/_init/tasks/drupal7.yml b/roles/_init/tasks/drupal7.yml
index 719c1ecb..c84bb0be 100644
--- a/roles/_init/tasks/drupal7.yml
+++ b/roles/_init/tasks/drupal7.yml
@@ -1,7 +1,7 @@
 ---
 - name: Define Drush path.
   set_fact:
-    drush_bin: "{{ drush_bin | default('/home/{{ deploy_user }}/.bin/drush') }}"
+    drush_bin: "{{ drush_bin | default('{{ bin_directory }}/drush-{{ drush.version }}/drush') }}"
 
 - name: Ensure we have Drush binary.
   import_role:
diff --git a/roles/_init/tasks/drupal8.yml b/roles/_init/tasks/drupal8.yml
index 719c1ecb..c84bb0be 100644
--- a/roles/_init/tasks/drupal8.yml
+++ b/roles/_init/tasks/drupal8.yml
@@ -1,7 +1,7 @@
 ---
 - name: Define Drush path.
   set_fact:
-    drush_bin: "{{ drush_bin | default('/home/{{ deploy_user }}/.bin/drush') }}"
+    drush_bin: "{{ drush_bin | default('{{ bin_directory }}/drush-{{ drush.version }}/drush') }}"
 
 - name: Ensure we have Drush binary.
   import_role:
diff --git a/roles/cli/drush/tasks/main.yml b/roles/cli/drush/tasks/main.yml
index 0acbc522..940ade31 100644
--- a/roles/cli/drush/tasks/main.yml
+++ b/roles/cli/drush/tasks/main.yml
@@ -17,6 +17,7 @@
   when:
     - deploy_operation == 'deploy'
     - not drush.use_vendor
+    - _drush_major_version == '8'
   register: drush_global_directory
 
 - name: Check if installed Drush version match.
@@ -52,10 +53,10 @@
     - not drush_global.stat.exists or not drush_global_version.stdout == drush.version
     - _drush_major_version != '8'
 
-- name: "Extract drush.tar.gz into {{ drush_bin | dirname }}"
+- name: "Extract drush.tar.gz into {{ bin_directory }}"
   ansible.builtin.unarchive:
     src: /tmp/drush.tar.gz
-    dest: "{{ drush_bin | dirname }}"
+    dest: "{{ bin_directory }}"
     mode: 0755
     remote_src: true
   when: