diff --git a/playbooks/airship-airshipctl-test-runner.yaml b/playbooks/airship-airshipctl-test-runner.yaml
index b0e0e4503..4ef1dfa8f 100644
--- a/playbooks/airship-airshipctl-test-runner.yaml
+++ b/playbooks/airship-airshipctl-test-runner.yaml
@@ -16,9 +16,9 @@
     - name: set default roles
       set_fact:
         test_roles_default:
-          - airshipctl-pull-docs
           - airshipctl-systemwide-executable
           - airshipctl-test-configs
+          - airshipctl-pull-docs
           - airshipctl-build-ephemeral-iso
           - install-kubectl
           - airshipctl-deploy-ephemeral-node
diff --git a/roles/airshipctl-systemwide-executable/tasks/main.yaml b/roles/airshipctl-systemwide-executable/tasks/main.yaml
index c01b857c6..f913318ca 100644
--- a/roles/airshipctl-systemwide-executable/tasks/main.yaml
+++ b/roles/airshipctl-systemwide-executable/tasks/main.yaml
@@ -12,7 +12,7 @@
 
 - name: "make docker-image"
   make:
-    chdir: "{{ remote_work_dir + '/airshipctl' if remote_work_dir is defined else zuul.project.src_dir }}"
+    chdir: "{{ local_src_dir | default(zuul.project.src_dir) }}"
     target: docker-image
     params:
       USE_PROXY: "{{ proxy.enabled }}"
@@ -27,7 +27,7 @@
     sudo docker cp "${CONTAINER}:/usr/local/bin/airshipctl" "/usr/local/bin/airshipctl"
     docker rm "${CONTAINER}"
   args:
-    chdir: "{{ remote_work_dir + '/airshipctl' if remote_work_dir is defined else zuul.project.src_dir }}"
+    chdir: "{{ local_src_dir | default(zuul.project.src_dir) }}"
 
 - name: "make sure airshipctl is executable"
   command: airshipctl version