diff --git a/playbooks/devstack/post.yaml b/playbooks/devstack/post.yaml
index 84fbe8a6c..6baaff6d4 100644
--- a/playbooks/devstack/post.yaml
+++ b/playbooks/devstack/post.yaml
@@ -3,4 +3,4 @@
 - hosts: tempest
   roles:
     - tobiko-zuul
-    - tobiko-post-run
+    - tobiko-collect
diff --git a/playbooks/devstack/pre.yaml b/playbooks/devstack/pre.yaml
index 3f0165e77..f88ae4d43 100644
--- a/playbooks/devstack/pre.yaml
+++ b/playbooks/devstack/pre.yaml
@@ -3,7 +3,7 @@
 - hosts: tempest
   roles:
     - tobiko-zuul
-    - tobiko-pre-run
+    - tobiko-configure
 
 
 - hosts: all
diff --git a/roles/tobiko-zuul/vars/main.yaml b/roles/tobiko-zuul/vars/main.yaml
index 402347fe5..b2d5528b9 100644
--- a/roles/tobiko-zuul/vars/main.yaml
+++ b/roles/tobiko-zuul/vars/main.yaml
@@ -1,9 +1,6 @@
 ---
 
-tobiko_src_dir: "{{ zuul.executor.work_root }}/{{ zuul.projects['opendev.org/x/tobiko'].src_dir }}"
-tobiko_user: 'zuul'
+tobiko_dir: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/x/tobiko'].src_dir }}"
 
-test_src_dir: '{{ zuul.executor.work_root }}/{{ zuul.project.src_dir }}'
-test_dir: '{{ tobiko_dir }}'
-test_user: 'zuul'
+test_dir: '{{ ansible_user_dir }}/{{ zuul.project.src_dir }}'
 test_collect_dir: '{{ zuul.executor.log_root }}'