diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf
index 8d15f3bfe9..2504ce2bc2 100644
--- a/roles/koji_builder/templates/kojid.conf
+++ b/roles/koji_builder/templates/kojid.conf
@@ -120,9 +120,7 @@ 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 bef780f77e..40d58f301c 100644
--- a/roles/koji_hub/templates/hub.conf.j2
+++ b/roles/koji_hub/templates/hub.conf.j2
@@ -90,7 +90,7 @@ MissingPolicyOk = False
 {% if env == "staging" %}
 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
+Plugins = osbuild koji-fedoramessaging runroot_hub hub_containerbuild tag2distrepo sidetag_hub save_failed_tree flatpak kiwi
 {% endif %}
 [policy]
 
@@ -246,6 +246,7 @@ build_from_scm =
         bool scratch :: allow
         match scm_repository /fedora-kickstarts.git :: allow
         match scm_repository /fork/*/fedora-kickstarts.git :: allow
+        match scm_repository /fedora-kiwi-descriptions :: allow
     }
     all :: deny
 {% endif %}