diff --git a/kola-denylist.yaml b/kola-denylist.yaml
index 6d80164af5..88680d7111 100644
--- a/kola-denylist.yaml
+++ b/kola-denylist.yaml
@@ -10,9 +10,6 @@
   snooze: 2021-09-01
   platforms:
     - openstack
-- pattern: ext.config.yum-repos
-  tracker: https://github.com/coreos/fedora-coreos-tracker/issues/925
-  snooze: 2021-09-01
 - pattern: ext.config.toolbox
   tracker: https://github.com/coreos/fedora-coreos-tracker/issues/926
   stream: rawhide
diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml
index 4750b1d2ad..581845dfa5 100644
--- a/manifests/fedora-coreos-base.yaml
+++ b/manifests/fedora-coreos-base.yaml
@@ -117,17 +117,6 @@ postprocess:
       echo 'DEFAULT_HOSTNAME=localhost' >> /usr/lib/os-release
     fi
 
-
-  # Workaround issue in rawhide parsing the F37 GPG key
-  # by removing it from the list of gpgkeys to load.
-  # https://github.com/coreos/fedora-coreos-tracker/issues/925
-  - |
-    #!/usr/bin/env bash
-    set -xeuo pipefail
-    source /etc/os-release
-    [ ${VERSION_ID} -eq 36 ] || exit 0
-    sed -i 's|gpgkey=.*$|gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch|' /etc/yum.repos.d/fedora-rawhide.repo
-
 # Packages listed here should be specific to Fedore CoreOS (as in not yet
 # available in RHCOS or not desired in RHCOS). All other packages should go
 # into one of the sub-manifests listed at the top.
diff --git a/tests/kola/yum-repos/test.sh b/tests/kola/yum-repos/test.sh
deleted file mode 100755
index ee6bc60ecf..0000000000
--- a/tests/kola/yum-repos/test.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-set -xeuo pipefail
-
-# No need to run an other platforms than QEMU.
-# kola: { "platforms": "qemu-unpriv" }
-
-# We can delete this test when the following issue is resolved:
-# https://github.com/coreos/fedora-coreos-tracker/issues/925
-
-ok() {
-    echo "ok" "$@"
-}
-
-fatal() {
-    echo "$@" >&2
-    exit 1
-}
-
-source /etc/os-release
-if [ "$VERSION_ID" -eq "36" ]; then
-    if ! grep 'RPM-GPG-KEY-fedora-37' /etc/yum.repos.d/fedora-rawhide.repo; then
-        fatal "Fedora 37 gpg key should be in rawhide repo"
-    fi
-fi
-ok rawhiderepo