diff --git a/tasks/bootstrap.yml b/tasks/bootstrap.yml
index dc843922e2220caab986bdd698cab532eb8c8213..23f907d48196bbd9cb58355283ca5511c791dfba 100644
--- a/tasks/bootstrap.yml
+++ b/tasks/bootstrap.yml
@@ -8,7 +8,7 @@
       failed_when: false
 
     - name: If the host is not pingable, find out why
-      include_tasks: tasks/diagnose-unpingable.yml
+      include_tasks: '{{ role_path }}/tasks/diagnose-unpingable.yml'
       when: _can_ping.ping is not defined or _can_ping.ping != 'pong'
 
     - name: Gather minimal facts to determine host OS
@@ -19,20 +19,20 @@
       include_vars: '{{ item }}'
       with_first_found:
         - files:
-            - vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml
-            - vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_release | lower }}.yml
-            - vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml
-            - vars/{{ ansible_distribution | lower }}.yml
-            - vars/{{ ansible_os_family | lower }}.yml
+            - '{{ role_path }}/vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml'
+            - '{{ role_path }}/vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_release | lower }}.yml'
+            - '{{ role_path }}/vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml'
+            - '{{ role_path }}/vars/{{ ansible_distribution | lower }}.yml'
+            - '{{ role_path }}/vars/{{ ansible_os_family | lower }}.yml'
           skip: true
 
     - name: Include OS specific bootstrap tasks
       include_tasks: '{{ item }}'
       with_first_found:
-        - tasks/bootstrap.{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml
-        - tasks/bootstrap.{{ ansible_distribution | lower }}-{{ ansible_distribution_release | lower }}.yml
-        - tasks/bootstrap.{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml
-        - tasks/bootstrap.{{ ansible_distribution | lower }}.yml
-        - tasks/bootstrap.{{ ansible_os_family | lower }}.yml
+        - '{{ role_path }}/tasks/bootstrap.{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml'
+        - '{{ role_path }}/tasks/bootstrap.{{ ansible_distribution | lower }}-{{ ansible_distribution_release | lower }}.yml'
+        - '{{ role_path }}/tasks/bootstrap.{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml'
+        - '{{ role_path }}/tasks/bootstrap.{{ ansible_distribution | lower }}.yml'
+        - '{{ role_path }}/tasks/bootstrap.{{ ansible_os_family | lower }}.yml'
 ...
 # vi: set ts=2 sts=2 sw=2 et ft=yaml:
diff --git a/tasks/diagnose-unpingable.yml b/tasks/diagnose-unpingable.yml
index 960854b25004e53e1801196b0332196fd1410156..a823794e4193e2b704b214d79349dc868c350cd6 100644
--- a/tasks/diagnose-unpingable.yml
+++ b/tasks/diagnose-unpingable.yml
@@ -15,7 +15,7 @@
 - name: Python is not found
   when: _can_ping.rc is defined and _can_ping.rc == 127
   block:
-    - include_tasks: tasks/find-python-executable.yml
+    - include_tasks: '{{ role_path }}/tasks/find-python-executable.yml'
     - fail:
         msg: "Unable to find Python on {{ inventory_hostname }}.\n
               Please set 'ansible_python_interpreter' to an executable Python interpreter.\n