diff --git a/local.yml b/local.yml
index 3946c23..67fd0d1 100644
--- a/local.yml
+++ b/local.yml
@@ -11,6 +11,11 @@
     ansible_pull_marker_file: /var/tmp/ansible_pull.last_run
 
   pre_tasks:
+    - name: pre-run | set global playbook directory fact
+      set_fact:
+        ansible_pull_playbook_dir: "{{ playbook_dir }}"
+      tags: always
+
     - name: pre-run | get status of marker file
       stat:
         path: "{{ ansible_pull_marker_file }}"
diff --git a/roles/bastionhost/tasks/users/lowpriv.yml b/roles/bastionhost/tasks/users/lowpriv.yml
index 2cedb8f..6b50b03 100644
--- a/roles/bastionhost/tasks/users/lowpriv.yml
+++ b/roles/bastionhost/tasks/users/lowpriv.yml
@@ -22,7 +22,7 @@
     user: "lowpriv"
 
 - name: users | lowpriv | import ssh configuration tasks from base role
-  import_tasks: "{{ ansible_playbook_dir }}/roles/base/tasks/users/install_public_keys.yml"
+  import_tasks: "{{ ansible_pull_playbook_dir }}/roles/base/tasks/users/install_public_keys.yml"
 
 - name: users | lowpriv | import known_hosts task from base role
-  import_tasks: "{{ ansible_playbook_dir }}/roles/base/tasks/users/install_known_hosts.yml"
\ No newline at end of file
+  import_tasks: "{{ ansible_pull_playbook_dir }}/roles/base/tasks/users/install_known_hosts.yml"
\ No newline at end of file
diff --git a/roles/bastionhost/tasks/users/sshjumpuser.yml b/roles/bastionhost/tasks/users/sshjumpuser.yml
index cda811a..ce397cc 100644
--- a/roles/bastionhost/tasks/users/sshjumpuser.yml
+++ b/roles/bastionhost/tasks/users/sshjumpuser.yml
@@ -22,7 +22,7 @@
     user: "sshjumpuser"
 
 - name: users | sshjumpuser | import ssh configuration tasks from base role
-  import_tasks: "{{ ansible_playbook_dir }}/roles/base/tasks/users/install_public_keys.yml"
+  import_tasks: "{{ ansible_pull_playbook_dir }}/roles/base/tasks/users/install_public_keys.yml"
 
 - name: users | sshjumpuser | import known_hosts task from base role
-  import_tasks: "{{ ansible_playbook_dir }}/roles/base/tasks/users/install_known_hosts.yml"
\ No newline at end of file
+  import_tasks: "{{ ansible_pull_playbook_dir }}/roles/base/tasks/users/install_known_hosts.yml"
\ No newline at end of file