diff --git a/roles/robosignatory/templates/robosignatory.toml.j2 b/roles/robosignatory/templates/robosignatory.toml.j2
index 52ac9ca927..187d79617c 100644
--- a/roles/robosignatory/templates/robosignatory.toml.j2
+++ b/roles/robosignatory/templates/robosignatory.toml.j2
@@ -95,48 +95,36 @@ handlers = ["console"]
             [[consumer_config.koji_instances.primary.tags]]
             from = "f32-python"
             to = "f32-python"
-            key = ""
-            keyid = ""
             key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('12c944d0', 'd300e724') }}"
 
             [[consumer_config.koji_instances.primary.tags]]
             from = "f31-kde"
             to = "f31-kde"
-            key = ""
-            keyid = ""
             key = "{{ (env == 'production')|ternary('fedora-31', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('3c3359c4', 'd300e724') }}"
 
             [[consumer_config.koji_instances.primary.tags]]
             from = "f31-gnome"
             to = "f31-gnome"
-            key = ""
-            keyid = ""
             key = "{{ (env == 'production')|ternary('fedora-31', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('3c3359c4', 'd300e724') }}"
 
             [[consumer_config.koji_instances.primary.tags]]
             from = "f31-python"
             to = "f31-python"
-            key = ""
-            keyid = ""
             key = "{{ (env == 'production')|ternary('fedora-31', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('3c3359c4', 'd300e724') }}"
 
             [[consumer_config.koji_instances.primary.tags]]
             from = "f30-kde"
             to = "f30-kde"
-            key = ""
-            keyid = ""
             key = "{{ (env == 'production')|ternary('fedora-30', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('cfc659b9', 'd300e724') }}"
 
             [[consumer_config.koji_instances.primary.tags]]
             from = "f29-kde"
             to = "f29-kde"
-            key = "
-            keyid = ""
             key = "{{ (env == 'production')|ternary('fedora-29', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('429476b4', 'd300e724') }}"
 
@@ -145,8 +133,6 @@ handlers = ["console"]
             [[consumer_config.koji_instances.primary.tags]]
             from = "epel6-infra-candidate"
             to = "epel6-infra-stg"
-            key = ""
-            keyid = ""
             key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}"