diff --git a/roles/robosignatory/templates/robosignatory.toml.j2 b/roles/robosignatory/templates/robosignatory.toml.j2
index 6ae7856d03..db8fb6cf1f 100644
--- a/roles/robosignatory/templates/robosignatory.toml.j2
+++ b/roles/robosignatory/templates/robosignatory.toml.j2
@@ -328,14 +328,14 @@ handlers = ["console"]
             [[consumer_config.koji_instances.primary.tags]]
             from = "eln-signing-pending"
             to = "eln-updates-testing-pending"
-            key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}"
-            keyid = "{{ (env == 'production')|ternary('9867c58f', 'd300e724') }}"
+            key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('38ab71f4', 'd300e724') }}"
 
             [[consumer_config.koji_instances.primary.tags]]
             from = "eln-modular-updates-candidate"
             to = "eln-modular"
-            key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}"
-            keyid = "{{ (env == 'production')|ternary('9867c58f', 'd300e724') }}"
+            key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('38ab71f4', 'd300e724') }}"
             type = "modular"
 
             # ELN Mass Rebuild
@@ -343,8 +343,8 @@ handlers = ["console"]
             [[consumer_config.koji_instances.primary.tags]]
             from = "eln-rebuild"
             to = "eln-rebuild"
-            key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}"
-            keyid = "{{ (env == 'production')|ternary('9867c58f', 'd300e724') }}"
+            key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
+            keyid = "{{ (env == 'production')|ternary('38ab71f4', 'd300e724') }}"
 
             # ELN Side tags