diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf
index 8410c2b415..574865ed19 100644
--- a/roles/koji_builder/templates/kojid.conf
+++ b/roles/koji_builder/templates/kojid.conf
@@ -17,7 +17,11 @@ maxjobs=25
 ; topdir=/mnt/koji
 
 ; Disable keepalive for now since it's not working in f23.
+{% if env == 'staging' %}
+; keepalive removed in 1.18.0
+{% else %}
 keepalive=False
+{% endif %}
 
 rpmbuild_timeout=201600