diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml
index 5024ef9041..c886ff60f6 100644
--- a/roles/releng/tasks/main.yml
+++ b/roles/releng/tasks/main.yml
@@ -122,8 +122,12 @@
 - name: copy over our mash.conf
   template: src=mash.conf dest=/etc/mash/mash.conf
 
+- name: Custom compose-koji
+  template: src=compose-koji.j2 dest=/usr/bin/compose-koji
+            mode=0755
+
 - name: /etc/koji.conf
-  template: src=koji.conf.j2 dest=/etc/koji.conf
+  template: src=koji.conf.j2 dest=/etc/koji.conf.d/compose.conf
 
 # mock configs
 - name: put extra special  mock configs in
diff --git a/roles/releng/templates/compose-koji.j2 b/roles/releng/templates/compose-koji.j2
new file mode 100644
index 0000000000..a272e04bfb
--- /dev/null
+++ b/roles/releng/templates/compose-koji.j2
@@ -0,0 +1,2 @@
+#! /bin/sh
+koji --principal="compose/koji{{env_suffix}}.fedoraproject.org" --keytab="/etc/krb5.compose_koji{{env_suffix}}.fedoraproject.org.keytab" "$@"
diff --git a/roles/releng/templates/koji.conf.j2 b/roles/releng/templates/koji.conf.j2
index 82ffad4c7a..d333b11162 100644
--- a/roles/releng/templates/koji.conf.j2
+++ b/roles/releng/templates/koji.conf.j2
@@ -1,4 +1,4 @@
-[koji]
+[compose]
 server = https://koji.fedoraproject.org/kojihub
 weburl = https://koji.fedoraproject.org/koji
 topurl = https://kojipkgs.fedoraproject.org/