diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf
index 26101e461d..0ced1e8e6b 100644
--- a/roles/koji_builder/templates/kojid.conf
+++ b/roles/koji_builder/templates/kojid.conf
@@ -117,5 +117,9 @@ keytab = /etc/kojid/kojid.keytab
 
 {{ plugins.append("flatpak") }}
 
+{% if env == 'staging' %}
+{{ plugins.append("kiwi") }}
+{% endif %}
+
 ; Config for the runroot plugin lives in /etc/kojid/runroot.conf, if enabled
 plugins = {{ plugins | join(" ") }}
diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2
index f0df76a1af..b592c0377b 100644
--- a/roles/koji_hub/templates/hub.conf.j2
+++ b/roles/koji_hub/templates/hub.conf.j2
@@ -88,7 +88,7 @@ MissingPolicyOk = False
 #Plugins = koji-disable-builds-plugin
 #Plugins = darkserver-plugin
 {% if env == "staging" %}
-Plugins = osbuild koji-fedoramessaging runroot_hub hub_containerbuild tag2distrepo sidetag_hub save_failed_tree flatpak
+Plugins = osbuild koji-fedoramessaging runroot_hub hub_containerbuild tag2distrepo sidetag_hub save_failed_tree flatpak kiwi
 {% else %}
 Plugins = osbuild koji-fedoramessaging runroot_hub hub_containerbuild tag2distrepo sidetag_hub save_failed_tree flatpak
 {% endif %}
@@ -227,6 +227,7 @@ build_from_scm =
     }
     match scm_host pkgs.fedoraproject.org && match scm_repository /* :: allow fedpkg sources
     match scm_host pagure.io && match scm_repository /fedora-kickstarts.git :: allow
+    match scm_host pagure.io && match scm_repository /fedora-kiwi-descriptions :: allow
     match scm_host src.fedoraproject.org :: allow fedpkg sources
     all :: deny
 {% else %}