diff --git a/roles/koji_hub/templates/koji-gc.conf.j2 b/roles/koji_hub/templates/koji-gc.conf.j2
index 33a5da330a..8c9445180e 100644
--- a/roles/koji_hub/templates/koji-gc.conf.j2
+++ b/roles/koji_hub/templates/koji-gc.conf.j2
@@ -43,6 +43,8 @@ key_aliases =
     12C944D0    fedora-32
     9570ff31    fedora-33
     45719a39    fedora-34
+    9867C58F    fedora-35
+    45719A39    fedora-36
     DBBDCF7C    fedora-iot-2019
     217521F6    fedora-epel
     0608B895    fedora-epel-6
@@ -71,6 +73,8 @@ unprotected_keys =
     fedora-32
     fedora-33
     fedora-34
+    fedora-35
+    fedora-36
     fedora-iot-2019
     fedora-extras
     redhat-beta
@@ -131,6 +135,8 @@ policy =
     sig fedora-32 && age < 12 weeks :: keep
     sig fedora-33 && age < 12 weeks :: keep
     sig fedora-34 && age < 12 weeks :: keep
+    sig fedora-35 && age < 12 weeks :: keep
+    sig fedora-36 && age < 12 weeks :: keep
     sig fedora-iot-2019 && age < 12 weeks :: keep
     sig fedora-epel && age < 12 weeks :: keep
     sig fedora-epel-6 && age < 12 weeks :: keep