diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index 8353fa4755..222539485c 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -5,6 +5,7 @@
   user: name=root password={{ builder_rootpw }} state=present
   tags:
   - koji_builder
+  - rootpw
 
 - name: add mock user as 425
   user: name=mock uid=425 state=present home=/var/lib/mock createhome=yes system=yes
diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml
index b21516b732..aff16000d8 100644
--- a/roles/releng/tasks/main.yml
+++ b/roles/releng/tasks/main.yml
@@ -1,5 +1,7 @@
 - name: set root passwd
   user: name=root password={{ builder_rootpw }} state=present
+  tags:
+  - rootpw
 
 - name: add mock user as 425
   user: name=mock uid=425 state=present home=/var/lib/mock createhome=yes system=yes