diff --git a/roles/taskotron/buildmaster-configure/templates/buildmaster.service.j2 b/roles/taskotron/buildmaster-configure/templates/buildmaster.service.j2
index 980c00473b..47e16fcbe4 100644
--- a/roles/taskotron/buildmaster-configure/templates/buildmaster.service.j2
+++ b/roles/taskotron/buildmaster-configure/templates/buildmaster.service.j2
@@ -8,8 +8,8 @@ PIDFile={{ buildmaster_dir }}/twistd.pid
 ExecStart=/bin/buildbot start {{ buildmaster_dir }}
 ExecStop=/bin/buildbot stop {{ buildmaster_dir }}
 ExecReload=/bin/buildbot reconfig {{ buildmaster_dir }}
-User={{ master_user }}
-Group={{ master_user }}
+User={{ buildmaster_user }}
+Group={{ buildmaster_user }}
 
 [Install]
 WantedBy=multi-user.target