diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index aca637af64..deab602213 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -103,7 +103,6 @@
     state: present
     name:
     - koji-image-builder-builder
-  when: env == 'staging'
   tags:
   - koji_builder
   - koji_builder_image_builder
diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf
index d7d6f3291c..978a5731dc 100644
--- a/roles/koji_builder/templates/kojid.conf
+++ b/roles/koji_builder/templates/kojid.conf
@@ -117,9 +117,7 @@ keytab = /etc/kojid/kojid.keytab
 
 {{ plugins.append("kiwi") }}
 
-{% if env == 'staging' %}
 {{ plugins.append("image_builder") }}
-{% endif %}
 
 ; Config for the runroot plugin lives in /etc/kojid/runroot.conf, if enabled
 plugins = {{ plugins | join(" ") }}
diff --git a/roles/koji_hub/tasks/main.yml b/roles/koji_hub/tasks/main.yml
index d14ce29195..b949f88bca 100644
--- a/roles/koji_hub/tasks/main.yml
+++ b/roles/koji_hub/tasks/main.yml
@@ -37,7 +37,6 @@
   ansible.builtin.package: name={{ item }} state=present
   with_items:
   - koji-image-builder-hub
-  when: env == 'staging'
   notify:
   - Restart kojira
   tags:
diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2
index 5cc34e0d12..45e4941baa 100644
--- a/roles/koji_hub/templates/hub.conf.j2
+++ b/roles/koji_hub/templates/hub.conf.j2
@@ -115,9 +115,9 @@ MissingPolicyOk = False
 {% if env == "staging" %}
 Plugins = osbuild koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi image_builder
 {% elif koji_instance == "primary" %}
-Plugins = osbuild koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi
+Plugins = osbuild koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi image_builder
 {% else %}
-Plugins = osbuild koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi
+Plugins = osbuild koji-fedoramessaging runroot_hub tag2distrepo sidetag_hub save_failed_tree flatpak kiwi image_builder
 {% endif %}
 [policy]
 
diff --git a/roles/koji_hub/templates/web.conf.j2 b/roles/koji_hub/templates/web.conf.j2
index a3da81aefa..6a33a47e35 100644
--- a/roles/koji_hub/templates/web.conf.j2
+++ b/roles/koji_hub/templates/web.conf.j2
@@ -45,10 +45,10 @@ KojiHubCA = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
 Tasks = flatpakBuild,flatpakBuildArch,runroot,osbuildImage,createKiwiImage,kiwiBuild,imageBuilderBuildArch,imageBuilderBuild
 ParentTasks = flatpakBuild,osbuildImage,kiwiBuild,imageBuilderBuild
 {% elif koji_instance == "primary"  %}
-Tasks = flatpakBuild,flatpakBuildArch,runroot,osbuildImage,createKiwiImage,kiwiBuild
-ParentTasks = flatpakBuild,osbuildImage,kiwiBuild
+Tasks = flatpakBuild,flatpakBuildArch,runroot,osbuildImage,createKiwiImage,kiwiBuild,imageBuilderBuildArch,imageBuilderBuild
+ParentTasks = flatpakBuild,osbuildImage,kiwiBuild,imageBuilderBuild
 {% else %}
-Tasks = flatpakBuild,flatpakBuildArch,runroot,osbuildImage,createKiwiImage,kiwiBuild
-ParentTasks = flatpakBuild,osbuildImage,kiwiBuild
+Tasks = flatpakBuild,flatpakBuildArch,runroot,osbuildImage,createKiwiImage,kiwiBuild,imageBuilderBuildArch,imageBuilderBuild
+ParentTasks = flatpakBuild,osbuildImage,kiwiBuild,imageBuilderBuild
 {% endif %}
 ToplevelTasks = flatpakBuild,osbuildImage