diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml
index be66002295..3c7cdb2678 100644
--- a/playbooks/groups/koji-hub.yml
+++ b/playbooks/groups/koji-hub.yml
@@ -31,7 +31,6 @@
   - builder_repo
   - collectd/base
   - apache
-  - fedmsg/base
   - role: keytab/service
     service: kojira
     host: "koji{{env_suffix}}.fedoraproject.org"
@@ -44,17 +43,6 @@
     service: HTTP
     owner_user: apache
     host: "koji{{env_suffix}}.fedoraproject.org"
-    when: "fedmsg_koji_instance == 'primary'"
-  - role: keytab/service
-    service: HTTP
-    owner_user: apache
-    host: "{{fedmsg_koji_instance}}.koji.fedoraproject.org"
-    when: "fedmsg_koji_instance != 'primary'"
-  - role: keytab/service
-    service: shadow
-    owner_user: koji_shadow
-    host: "koji{{env_suffix}}.fedoraproject.org"
-    when: "fedmsg_koji_instance != 'primary'"
   - { role: nfs/server, when: env == "staging" }
   - { role: keepalived, when: env == "production" and inventory_hostname.startswith('koji') }
   - role: nfs/client