diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf
index 6d1072b5bf..2800760136 100644
--- a/roles/koji_builder/templates/kojid.conf
+++ b/roles/koji_builder/templates/kojid.conf
@@ -18,10 +18,6 @@ maxjobs=25
 
 rpmbuild_timeout=201600
 
-; Set oz timeout higher to allow aarch64, ppc64{le} and s390x to finish.
-; Install timeout(seconds) for image build
-; if it's unset, use the number in /etc/oz/oz.cfg, supported since oz-0.16.0
-oz_install_timeout=14400
 use_createrepo_c=True
 
 {% if env != 'staging' %}
diff --git a/roles/koji_builder/templates/oz.cfg.j2 b/roles/koji_builder/templates/oz.cfg.j2
index fae478c04c..4067d3ed68 100644
--- a/roles/koji_builder/templates/oz.cfg.j2
+++ b/roles/koji_builder/templates/oz.cfg.j2
@@ -12,9 +12,9 @@ image_type = raw
 {% if ansible_architecture == 'ppc64' or ansible_architecture == 'ppc64le' %}
 cpus = 1
 {% else %}
-cpus = 2
+cpus = 4
 {% endif %}
-memory = 3096
+memory = 4096
 
 [cache]
 original_media = yes
@@ -24,3 +24,8 @@ jeos = no
 [icicle]
 safe_generation = no
 
+[timeouts]
+install = 14400
+inactivity = 300
+boot = 300
+shutdown = 90