diff --git a/roles/koji_hub/tasks/main.yml b/roles/koji_hub/tasks/main.yml
index 0d09cadc94..b417036d99 100644
--- a/roles/koji_hub/tasks/main.yml
+++ b/roles/koji_hub/tasks/main.yml
@@ -173,14 +173,7 @@
   tags:
   - config
   - koji_hub
-  when: ansible_hostname.startswith('koji')
-
-- name: install s390 kojira_cert_key
-  copy: src={{ private }}/files/koji/s390_kojira_cert_key.pem dest=/etc/kojira/kojira_cert_key.pem owner=apache mode=600
-  tags:
-  - config
-  - koji_hub
-  when: ansible_hostname.startswith('s390')
+  when: ansible_hostname.startswith('koji') or ansible_hostname.startswith('s390')
 
 - name: updatecrl script
   copy: src=updatecrl.sh dest=/usr/local/bin/updatecrl.sh owner=root mode=755