diff --git a/roles/koji_hub/templates/koji-gc.conf.j2 b/roles/koji_hub/templates/koji-gc.conf.j2
index ff07fc7b4c..af37f55792 100644
--- a/roles/koji_hub/templates/koji-gc.conf.j2
+++ b/roles/koji_hub/templates/koji-gc.conf.j2
@@ -94,8 +94,6 @@ policy =
     #stuff to protect
     #note that tags with master lock engaged are already protected
     tag *-updates :: keep
-    tag *-infra :: keep
-    tag *-infra-stg :: keep
     tag f26-modularity :: keep
     age < 1 day :: skip
     sig fedora-gold :: skip
@@ -135,6 +133,10 @@ policy =
     tag *-testing *-candidate && order > 0 && age > 6 weeks :: untag
     tag *-candidate && age > 8 weeks :: untag
 
+    #stuff for infrastructure repositories
+    tag *-infra && order >= 2 :: untag
+    tag *-infra-stg && order >= 2 && age > 4 weeks :: untag
+
     #default: keep the last 3
     order > 2 :: untag