diff --git a/fedora-riscv-koji.repo b/fedora-riscv-koji.repo
new file mode 100644
index 00000000..4c9eb072
--- /dev/null
+++ b/fedora-riscv-koji.repo
@@ -0,0 +1,7 @@
+# Pulled from http://fedora.riscv.rocks:3000/rpms/fedora-repos/src/commit/6cdced6f3c08dcf2c2bc82406868cfc9f83b55be/fedora-riscv-koji.repo
+[fedora-riscv-koji]
+name=Fedora RISC-V $releasever - Koji
+baseurl=https://riscv-koji.fedoraproject.org/repos/f$releasever-build/latest/$basearch/
+enabled=0
+gpgcheck=0
+priority=97
diff --git a/fedora-riscv-staging.repo b/fedora-riscv-staging.repo
index 2e402b98..4db383e3 100644
--- a/fedora-riscv-staging.repo
+++ b/fedora-riscv-staging.repo
@@ -1,21 +1,21 @@
-# Pulled from http://fedora.riscv.rocks:3000/rpms/fedora-repos/src/commit/6289e6a44e1c897beeacaa363307a1b2d11db1c3/fedora-riscv-staging.repo
+# Pulled from http://fedora.riscv.rocks:3000/rpms/fedora-repos/src/commit/6cdced6f3c08dcf2c2bc82406868cfc9f83b55be/fedora-riscv-staging.repo
 [fedora-riscv-staging]
 name=Fedora RISC-V $releasever - Staging
-baseurl=http://fedora.riscv.rocks/repos-dist/f$releasever-staging/latest/$basearch/
+baseurl=https://riscv-koji.fedoraproject.org/repos-dist/f$releasever-staging/latest/$basearch/
 enabled=1
 gpgcheck=0
 priority=98
 
 [fedora-riscv-staging-debuginfo]
 name=Fedora RISC-V $releasever - Staging - Debug
-baseurl=http://fedora.riscv.rocks/repos-dist/f$releasever-staging/latest/$basearch/debug/
+baseurl=https://riscv-koji.fedoraproject.org/repos-dist/f$releasever-staging/latest/$basearch/debug/
 enabled=0
 gpgcheck=0
 priority=98
 
 [fedora-riscv-staging-source]
 name=Fedora RISC-V $releasever - Staging - Source
-baseurl=http://fedora.riscv.rocks/repos-dist/f$releasever-staging/latest/src/
+baseurl=https://riscv-koji.fedoraproject.org/repos-dist/f$releasever-staging/latest/src/
 enabled=0
 gpgcheck=0
 priority=98
diff --git a/fedora-riscv.repo b/fedora-riscv.repo
index 16dc7813..7f31e366 100644
--- a/fedora-riscv.repo
+++ b/fedora-riscv.repo
@@ -1,21 +1,21 @@
-# Pulled from http://fedora.riscv.rocks:3000/rpms/fedora-repos/src/commit/6289e6a44e1c897beeacaa363307a1b2d11db1c3/fedora-riscv.repo
+# Pulled from http://fedora.riscv.rocks:3000/rpms/fedora-repos/src/commit/6cdced6f3c08dcf2c2bc82406868cfc9f83b55be/fedora-riscv.repo
 [fedora-riscv]
 name=Fedora RISC-V $releasever
-baseurl=http://fedora.riscv.rocks/repos-dist/f$releasever/latest/$basearch/
+baseurl=https://riscv-koji.fedoraproject.org/repos-dist/f$releasever/latest/$basearch/
 enabled=1
 gpgcheck=0
 priority=99
 
 [fedora-riscv-debuginfo]
 name=Fedora RISC-V $releasever - Debug
-baseurl=http://fedora.riscv.rocks/repos-dist/f$releasever/latest/$basearch/debug/
+baseurl=https://riscv-koji.fedoraproject.org/repos-dist/f$releasever/latest/$basearch/debug/
 enabled=0
 gpgcheck=0
 priority=99
 
 [fedora-riscv-source]
 name=Fedora RISC-V $releasever - Source
-baseurl=http://fedora.riscv.rocks/repos-dist/f$releasever/latest/src/
+baseurl=https://riscv-koji.fedoraproject.org/repos-dist/f$releasever/latest/src/
 enabled=0
 gpgcheck=0
 priority=99