diff --git a/playbooks/roles/zuul-executor/tasks/main.yaml b/playbooks/roles/zuul-executor/tasks/main.yaml
index f22aed8a38..b45baf8552 100644
--- a/playbooks/roles/zuul-executor/tasks/main.yaml
+++ b/playbooks/roles/zuul-executor/tasks/main.yaml
@@ -95,15 +95,15 @@
     content: '{{ nodepool_test_node_ssh_private_key_contents }}'
     dest: /var/lib/zuul/ssh/nodepool_id_rsa
     mode: 0400
-    owner: zuul
-    group: zuul
+    owner: '{{ zuul_user }}'
+    group: '{{ zuul_group }}'
 
 - name: Create Zuul Executor directories
   file:
     state: directory
     path: '{{ item }}'
-    owner: zuul
-    group: zuul
+    owner: '{{ zuul_user }}'
+    group: '{{ zuul_group }}'
   loop:
     - /var/lib/zuul/builds
     - /var/lib/zuul/git
diff --git a/playbooks/roles/zuul-merger/tasks/main.yaml b/playbooks/roles/zuul-merger/tasks/main.yaml
index c550c0695b..2f30a25cf5 100644
--- a/playbooks/roles/zuul-merger/tasks/main.yaml
+++ b/playbooks/roles/zuul-merger/tasks/main.yaml
@@ -2,8 +2,8 @@
   file:
     state: directory
     path: '{{ item }}'
-    owner: zuul
-    group: zuul
+    owner: '{{ zuul_user }}'
+    group: '{{ zuul_group }}'
   loop:
     - /var/lib/zuul/git
 
diff --git a/playbooks/roles/zuul-scheduler/tasks/main.yaml b/playbooks/roles/zuul-scheduler/tasks/main.yaml
index 77d501cfc0..7142f08439 100644
--- a/playbooks/roles/zuul-scheduler/tasks/main.yaml
+++ b/playbooks/roles/zuul-scheduler/tasks/main.yaml
@@ -9,8 +9,8 @@
   copy:
     content: '{{ zuul_github_app_key }}'
     dest: /etc/zuul/github.key
-    owner: zuul
-    group: zuul
+    owner: '{{ zuul_user }}'
+    group: '{{ zuul_group }}'
     mode: 0600
 
 - name: Add openstack status backup