diff --git a/roles/taskotron/buildslave-configure/tasks/main.yml b/roles/taskotron/buildslave-configure/tasks/main.yml
index c86d58ffbb..57932856cb 100644
--- a/roles/taskotron/buildslave-configure/tasks/main.yml
+++ b/roles/taskotron/buildslave-configure/tasks/main.yml
@@ -1,10 +1,16 @@
 - name: create slave
+  sudo: true
+  sudo_user: "{{ slave_user }}"
   command: creates={{ slave_dir }} buildslave create-slave {{ slave_dir }} {{ buildmaster }} buildslave passwd
 
 - name: generate slave config
+  sudo: true
+  sudo_user: "{{ slave_user }}"
   template: src=buildbot.tac.j2 dest={{ slave_dir }}/buildbot.tac mode=0600 owner={{ slave_user }} group={{ slave_user }}
 
 - name: generate slave info
+  sudo: true
+  sudo_user: "{{ slave_user }}"
   template: src={{ item }}.j2 dest={{ slave_dir }}/info/{{ item }} mode=0644 owner={{ slave_user }} group={{ slave_user }}
   with_items:
     - admin
@@ -21,10 +27,8 @@
 
 - name: generate buildslave service file
   template: src=buildslave.service.j2 dest=/lib/systemd/system/buildslave.service owner=root group=root mode=0744
-  sudo_user: root
 
 - name: start and enable buildslave service
   service: name=buildslave enabled=yes state=started
-  sudo_user: root