diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 52389c2f63..25f4ac290e 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -54,7 +54,7 @@
   tags:
   - rootpw
   - base
-  when: not (inventory_hostname.startswith('build') or inventory_hostname.startswith('arm') or inventory_hostname.startswith('bkernel') or inventory_hostname.startswith('koji01.stg'))
+  when: not (inventory_hostname.startswith('rawhide') or inventory_hostname.startswith('branched') or inventory_hostname.startswith('compose') or inventory_hostname.startswith('build') or inventory_hostname.startswith('arm') or inventory_hostname.startswith('bkernel') or inventory_hostname.startswith('koji01.stg'))
 
 - name: add ansible root key
   authorized_key: user=root key="{{ item }}"