diff --git a/roles/robosignatory/templates/robosignatory.toml.j2 b/roles/robosignatory/templates/robosignatory.toml.j2
index 91afc1f462..f01dca5ee8 100644
--- a/roles/robosignatory/templates/robosignatory.toml.j2
+++ b/roles/robosignatory/templates/robosignatory.toml.j2
@@ -118,40 +118,28 @@ handlers = ["console"]
             to = "f38-infra-stg"
             key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}"
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-38-ima"
-            {% endif %}
 
             [[consumer_config.koji_instances.primary.tags]]
             from = "f39-infra-candidate"
             to = "f39-infra-stg"
             key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}"
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-39-ima"
-            {% endif %}
 
             [[consumer_config.koji_instances.primary.tags]]
             from = "f40-infra-candidate"
             to = "f40-infra-stg"
             key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}"
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-40-ima"
-            {% endif %}
 
             [[consumer_config.koji_instances.primary.tags]]
             from = "f41-infra-candidate"
             to = "f41-infra-stg"
             key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}"
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-41-ima"
-            {% endif %}
 
             # Gated coreos-pool tag
 
@@ -160,40 +148,28 @@ handlers = ["console"]
             to = "coreos-pool"
             key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('eb10b464', 'd300e724') }}"
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-38-ima"
-            {% endif %}
 
             [[consumer_config.koji_instances.primary.tags]]
             from = "f39-coreos-signing-pending"
             to = "coreos-pool"
             key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('18B8e74c', 'd300e724') }}"
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-39-ima"
-            {% endif %}
 
             [[consumer_config.koji_instances.primary.tags]]
             from = "f40-coreos-signing-pending"
             to = "coreos-pool"
             key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('a15B79cc', 'd300e724') }}"
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-40-ima"
-            {% endif %}
 
             [[consumer_config.koji_instances.primary.tags]]
             from = "f41-coreos-signing-pending"
             to = "coreos-pool"
             key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('e99d6ad1', 'd300e724') }}"
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-41-ima"
-            {% endif %}
 
             # Gated rawhide
 
@@ -202,30 +178,21 @@ handlers = ["console"]
             to = "f41-updates-testing-pending"
             key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('e99d6ad1', 'd300e724') }}"
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-41-ima"
-            {% endif %}
 
             [consumer_config.koji_instances.primary.tags.sidetags]
             pattern = 'f41-build-side-<seq_id>'
             from = '<sidetag>-signing-pending'
             to = '<sidetag>-testing-pending'
             trusted_taggers = ['bodhi']
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-41-ima"
-            {% endif %}
 
             [[consumer_config.koji_instances.primary.tags]]
             from = "f41-pending"
             to = "f41"
             key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('e99d6ad1', 'd300e724') }}"
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-41-ima"
-            {% endif %}
 
             # Branched
 
@@ -234,30 +201,21 @@ handlers = ["console"]
 #            to = "f40-updates-testing-pending"
 #            key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
 #            keyid = "{{ (env == 'production')|ternary('a15B79cc', 'd300e724') }}"
-#            {% if env == "production" %}
-#            # ima file signing - enabled in f37
 #            file_signing_key = "fedora-40-ima"
-#            {% endif %}
 
             [consumer_config.koji_instances.primary.tags.sidetags]
             pattern = 'f40-build-side-<seq_id>'
             from = '<sidetag>-signing-pending'
             to = '<sidetag>-testing-pending'
             trusted_taggers = ['bodhi']
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-40-ima"
-            {% endif %}
 
             [[consumer_config.koji_instances.primary.tags]]
             from = "f40-pending"
             to = "f40"
             key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('a15B79cc', 'd300e724') }}"
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-40-ima"
-            {% endif %}
 
             # stable releases
 
@@ -266,60 +224,42 @@ handlers = ["console"]
             to = "f39-updates-testing-pending"
             key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('18B8e74c', 'd300e724') }}"
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-39-ima"
-            {% endif %}
 
             [consumer_config.koji_instances.primary.tags.sidetags]
             pattern = 'f39-build-side-<seq_id>'
             from = '<sidetag>-signing-pending'
             to = '<sidetag>-testing-pending'
             trusted_taggers = ['bodhi']
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-39-ima"
-            {% endif %}
 
             [[consumer_config.koji_instances.primary.tags]]
             from = "f39-pending"
             to = "f39"
             key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('18B8e74c', 'd300e724') }}"
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-39-ima"
-            {% endif %}
 
             [[consumer_config.koji_instances.primary.tags]]
             from = "f38-signing-pending"
             to = "f38-updates-testing-pending"
             key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('eb10b464', 'd300e724') }}"
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-38-ima"
-            {% endif %}
 
             [consumer_config.koji_instances.primary.tags.sidetags]
             pattern = 'f38-build-side-<seq_id>'
             from = '<sidetag>-signing-pending'
             to = '<sidetag>-testing-pending'
             trusted_taggers = ['bodhi']
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-38-ima"
-            {% endif %}
 
             [[consumer_config.koji_instances.primary.tags]]
             from = "f38-pending"
             to = "f38"
             key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('eb10b464', 'd300e724') }}"
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-38-ima"
-            {% endif %}
 
             [[consumer_config.koji_instances.primary.tags]]
             from = "f38-modular-pending"
@@ -434,40 +374,28 @@ handlers = ["console"]
             to = "f41-openh264"
             key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('e99d6ad1', 'd300e724') }}"
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-41-ima"
-            {% endif %}
 
             [[consumer_config.koji_instances.primary.tags]]
             from = "f40-openh264"
             to = "f40-openh264"
             key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('a15B79cc', 'd300e724') }}"
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-40-ima"
-            {% endif %}
 
             [[consumer_config.koji_instances.primary.tags]]
             from = "f39-openh264"
             to = "f39-openh264"
             key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('18B8e74c', 'd300e724') }}"
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-39-ima"
-            {% endif %}
             
             [[consumer_config.koji_instances.primary.tags]]
             from = "f38-openh264"
             to = "f38-openh264"
             key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('eb10b464', 'd300e724') }}"
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-38-ima"
-            {% endif %}
 
             # f38 resigning
             [[consumer_config.koji_instances.primary.tags]]
@@ -499,12 +427,12 @@ handlers = ["console"]
             to = "f40-rebuild"
             key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
             keyid = "{{ (env == 'production')|ternary('a15B79cc', 'd300e724') }}"
-            {% if env == "production" %}
-            # ima file signing - enabled in f37
             file_signing_key = "fedora-40-ima"
-            {% endif %}
 
     [consumer_config.ostree_refs]
+
+        # iot ostree refs
+
         [consumer_config.ostree_refs."fedora/rawhide/x86_64/iot"]
         directory = "/mnt/fedora_koji/koji/compose/iot/repo/"
         key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}"
@@ -526,406 +454,476 @@ handlers = ["console"]
         directory = "/mnt/fedora_koji/koji/compose/iot/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
 
-        [consumer_config.ostree_refs."fedora/37/x86_64/silverblue"]
-        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
-        [consumer_config.ostree_refs."fedora/37/aarch64/silverblue"]
-        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
-        [consumer_config.ostree_refs."fedora/37/ppc64le/silverblue"]
-        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
-        [consumer_config.ostree_refs."fedora/37/x86_64/updates/silverblue"]
-        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
-        [consumer_config.ostree_refs."fedora/37/x86_64/testing/silverblue"]
-        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
-        [consumer_config.ostree_refs."fedora/37/aarch64/updates/silverblue"]
-        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
-        [consumer_config.ostree_refs."fedora/37/aarch64/testing/silverblue"]
-        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
-        [consumer_config.ostree_refs."fedora/37/ppc64le/updates/silverblue"]
-        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
-        [consumer_config.ostree_refs."fedora/37/ppc64le/testing/silverblue"]
-        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
+        # f38 silveblue ostree refs
 
         [consumer_config.ostree_refs."fedora/38/x86_64/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/aarch64/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/ppc64le/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/x86_64/updates/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/x86_64/testing/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/aarch64/updates/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/aarch64/testing/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/ppc64le/updates/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/ppc64le/testing/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
 
+        # f39 silveblue ostree refs
+
         [consumer_config.ostree_refs."fedora/39/x86_64/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/aarch64/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/ppc64le/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/x86_64/updates/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/x86_64/testing/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/aarch64/updates/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/aarch64/testing/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/ppc64le/updates/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/ppc64le/testing/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
 
+        # f40 silveblue ostree refs
+
         [consumer_config.ostree_refs."fedora/40/x86_64/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/aarch64/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/ppc64le/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/x86_64/updates/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/x86_64/testing/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/aarch64/updates/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/aarch64/testing/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/ppc64le/updates/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/ppc64le/testing/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
 
+        # rawhide silveblue ostree refs
+
         [consumer_config.ostree_refs."fedora/rawhide/aarch64/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/rawhide/ppc64le/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/rawhide/x86_64/silverblue"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}"
 
-        [consumer_config.ostree_refs."fedora/37/x86_64/kinoite"]
-        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
-        [consumer_config.ostree_refs."fedora/37/aarch64/kinoite"]
-        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
-        [consumer_config.ostree_refs."fedora/37/ppc64le/kinoite"]
-        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
-        [consumer_config.ostree_refs."fedora/37/x86_64/updates/kinoite"]
-        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
-        [consumer_config.ostree_refs."fedora/37/x86_64/testing/kinoite"]
-        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
-        [consumer_config.ostree_refs."fedora/37/aarch64/updates/kinoite"]
-        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
-        [consumer_config.ostree_refs."fedora/37/aarch64/testing/kinoite"]
-        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
-        [consumer_config.ostree_refs."fedora/37/ppc64le/updates/kinoite"]
-        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
-        [consumer_config.ostree_refs."fedora/37/ppc64le/testing/kinoite"]
-        directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
-        key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}"
+        # f38 kinoite ostree refs
 
         [consumer_config.ostree_refs."fedora/38/x86_64/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/aarch64/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/ppc64le/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/x86_64/updates/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/x86_64/testing/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/aarch64/updates/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/aarch64/testing/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/ppc64le/updates/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/ppc64le/testing/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
 
+        # f39 kinoite ostree refs
+
         [consumer_config.ostree_refs."fedora/39/x86_64/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/aarch64/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/ppc64le/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/x86_64/updates/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/x86_64/testing/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/aarch64/updates/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/aarch64/testing/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/ppc64le/updates/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/ppc64le/testing/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
 
+        # f40 kinoite ostree refs
+
         [consumer_config.ostree_refs."fedora/40/x86_64/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/aarch64/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/ppc64le/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/x86_64/updates/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/x86_64/testing/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/aarch64/updates/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/aarch64/testing/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/ppc64le/updates/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/ppc64le/testing/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
 
+        # rawhide kinoite ostree refs
+
         [consumer_config.ostree_refs."fedora/rawhide/aarch64/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/rawhide/ppc64le/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/rawhide/x86_64/kinoite"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}"
 
+        # f38 sericea ostree refs
+
         [consumer_config.ostree_refs."fedora/38/x86_64/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/aarch64/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/ppc64le/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/x86_64/updates/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/x86_64/testing/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/aarch64/updates/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/aarch64/testing/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/ppc64le/updates/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/38/ppc64le/testing/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}"
 
+        # f39 sericea ostree refs
+
         [consumer_config.ostree_refs."fedora/39/x86_64/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/aarch64/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/ppc64le/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/x86_64/updates/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/x86_64/testing/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/aarch64/updates/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/aarch64/testing/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/ppc64le/updates/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/ppc64le/testing/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
 
+        # f40 sericea ostree refs
+
         [consumer_config.ostree_refs."fedora/40/x86_64/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/aarch64/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/ppc64le/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/x86_64/updates/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/x86_64/testing/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/aarch64/updates/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/aarch64/testing/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/ppc64le/updates/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/ppc64le/testing/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
 
+        # rawhide sericea ostree refs
+
         [consumer_config.ostree_refs."fedora/rawhide/aarch64/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/rawhide/ppc64le/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/rawhide/x86_64/sericea"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}"
 
+        # f39 onyx ostree refs
+
         [consumer_config.ostree_refs."fedora/39/x86_64/onyx"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/aarch64/onyx"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/ppc64le/onyx"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/x86_64/updates/onyx"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/x86_64/testing/onyx"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/aarch64/updates/onyx"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/aarch64/testing/onyx"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/ppc64le/updates/onyx"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/39/ppc64le/testing/onyx"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-39', 'testkey') }}"
 
+        # f40 onyx ostree refs
+
         [consumer_config.ostree_refs."fedora/40/x86_64/onyx"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/aarch64/onyx"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/ppc64le/onyx"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/x86_64/updates/onyx"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/x86_64/testing/onyx"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/aarch64/updates/onyx"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/aarch64/testing/onyx"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/ppc64le/updates/onyx"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/40/ppc64le/testing/onyx"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-40', 'testkey') }}"
 
+        # rawhide onyx ostree refs
+
         [consumer_config.ostree_refs."fedora/rawhide/aarch64/onyx"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/rawhide/ppc64le/onyx"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}"
+
         [consumer_config.ostree_refs."fedora/rawhide/x86_64/onyx"]
         directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
         key = "{{ (env == 'production')|ternary('fedora-41', 'testkey') }}"