diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 70c3cd8234..1ad432a3f6 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -139,7 +139,7 @@
   tags:
   - rootpw
   - base
-  when: not inventory_hostname.startswith(('buildvm','buildhw','bkernel','koji01.stg','fed-cloud09','compose','rawhide','branched'))
+  when: not inventory_hostname.startswith(('buildvm-','buildhw-','bkernel','koji01.stg','fed-cloud09','compose','rawhide','branched'))
 
 - name: add ansible root key
   authorized_key: user=root key="{{ item }}"