diff --git a/files/common/fedora-infra-tags-stg.repo b/files/common/fedora-infra-tags-stg.repo
index 1a4b0d85d4..fd3a25dee7 100644
--- a/files/common/fedora-infra-tags-stg.repo
+++ b/files/common/fedora-infra-tags-stg.repo
@@ -1,6 +1,6 @@
 [infrastructure-tags-stg]
 name=Fedora Infrastructure staging tag $releasever - $basearch
-baseurl=https://infrastructure.fedoraproject.org/repo/infra/f$releasever-infra-stg/$basearch/
+baseurl=https://kojipkgs.fedoraproject.org/repos-dist/f$releasever-infra-stg/latest/$basearch/
 enabled=1
 gpgcheck=1
 gpgkey=https://infrastructure.fedoraproject.org/repo/infra/RPM-GPG-KEY-INFRA-TAGS
diff --git a/files/common/fedora-infra-tags.repo b/files/common/fedora-infra-tags.repo
index 1ed309ca37..c7c6b8b709 100644
--- a/files/common/fedora-infra-tags.repo
+++ b/files/common/fedora-infra-tags.repo
@@ -1,6 +1,6 @@
 [infrastructure-tags]
 name=Fedora Infrastructure tag $releasever - $basearch
-baseurl=https://infrastructure.fedoraproject.org/repo/infra/f$releasever-infra/$basearch/
+baseurl=https://kojipkgs.fedoraproject.org/repos-dist/f$releasever-infra/latest/$basearch/
 enabled=1
 gpgcheck=1
 gpgkey=https://infrastructure.fedoraproject.org/repo/infra/RPM-GPG-KEY-INFRA-TAGS
diff --git a/files/common/rhel-infra-tags-stg.repo b/files/common/rhel-infra-tags-stg.repo
index 4f6de9efb9..cf77a2b0c2 100644
--- a/files/common/rhel-infra-tags-stg.repo
+++ b/files/common/rhel-infra-tags-stg.repo
@@ -1,6 +1,6 @@
 [infrastructure-tags-stg]
 name=Fedora Infrastructure tag $releasever - $basearch
-baseurl=https://infrastructure.fedoraproject.org/repo/infra/epel$releasever-infra-stg/$basearch/
+baseurl=https://kojipkgs.fedoraproject.org/repos-dist/epel$releasever-infra-stg/latest/$basearch/
 enabled=1
 gpgcheck=1
 gpgkey=https://infrastructure.fedoraproject.org/repo/infra/RPM-GPG-KEY-INFRA-TAGS
diff --git a/files/common/rhel-infra-tags.repo b/files/common/rhel-infra-tags.repo
index ece3b4f9e9..349a615635 100644
--- a/files/common/rhel-infra-tags.repo
+++ b/files/common/rhel-infra-tags.repo
@@ -1,6 +1,6 @@
 [infrastructure-tags]
 name=Fedora Infrastructure tag $releasever - $basearch
-baseurl=https://infrastructure.fedoraproject.org/repo/infra/epel$releasever-infra/$basearch/
+baseurl=https://kojipkgs.fedoraproject.org/repos-dist/epel$releasever-infra/latest/$basearch/
 enabled=1
 gpgcheck=1
 gpgkey=https://infrastructure.fedoraproject.org/repo/infra/RPM-GPG-KEY-INFRA-TAGS