diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 0c105e3d4b..418a296ee2 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -61,7 +61,7 @@
   tags:
   - rootpw
   - base
-  when: not inventory_hostname.startswith(('buildvm-','buildhw-','bkernel','koji01.stg','compose','rawhide','branched'))
+  when: not inventory_hostname.startswith(('buildvm-','buildhw-','bkernel','koji','compose'))
 
 - name: add ansible root key
   authorized_key: user=root key="{{ item }}"