diff --git a/Dockerfile.rpmbuild b/Dockerfile.rpmbuild
index 01201c1..9013b6e 100644
--- a/Dockerfile.rpmbuild
+++ b/Dockerfile.rpmbuild
@@ -42,11 +42,13 @@ SRC="${SRC:-/src}"
 WORKROOT="${WORKROOT:-/work}"
 OUT="${OUT:-/out}"
 DEPS_DIR="${DEPS_DIR:-/deps}"
+VERSION_ID="$(grep VERSION_ID /etc/os-release | cut -d= -f2)"
+echo "Version ID is ${VERSION_ID}"
 
 # Install bouquin-sqlcipher4 from local rpm
 # Filter out .src.rpm and debug* subpackages if present.
 if [ -d "${DEPS_DIR}" ] && compgen -G "${DEPS_DIR}/*.rpm" > /dev/null; then
-  mapfile -t rpms < <(ls -1 "${DEPS_DIR}"/*.rpm | grep -vE '(\.src\.rpm$|-(debuginfo|debugsource)-)')
+  mapfile -t rpms < <(ls -1 "${DEPS_DIR}"/*.rpm | grep -vE '(\.src\.rpm$|-(debuginfo|debugsource)-)' | grep "${VERSION_ID}")
   if [ "${#rpms[@]}" -gt 0 ]; then
     echo "Installing dependency RPMs from ${DEPS_DIR}:"
     printf '  - %s\n' "${rpms[@]}"
diff --git a/README.md b/README.md
index 7d4e55f..c01a35e 100644
--- a/README.md
+++ b/README.md
@@ -109,7 +109,7 @@ sudo rpm --import https://mig5.net/static/mig5.asc
 sudo tee /etc/yum.repos.d/mig5.repo > /dev/null << 'EOF'
 [mig5]
 name=mig5 Repository
-baseurl=https://rpm.mig5.net/rpm/$basearch
+baseurl=https://rpm.mig5.net/rpm/$releasever/$basearch
 enabled=1
 gpgcheck=1
 repo_gpgcheck=1
diff --git a/release.sh b/release.sh
index 5ab4237..af83196 100755
--- a/release.sh
+++ b/release.sh
@@ -69,15 +69,13 @@ for dist in ${DISTS[@]}; do
   reprepro -b /home/user/git/repo includedeb "${release}" "${debfile}"
 done
 
-# RPM
-REPO_ROOT="${HOME}/git/repo_rpm"
-RPM_REPO="${REPO_ROOT}/rpm/x86_64"
-BUILD_OUTPUT="${HOME}/git/bouquin/dist"
-REMOTE="letessier.mig5.net:/opt/repo_rpm"
-KEYID="00AE817C24A10C2540461A9C1D7CDE0234DB458D"
-mkdir -p "$RPM_REPO"
 
+# RPM
 sudo apt-get -y install createrepo-c rpm
+BUILD_OUTPUT="${HOME}/git/bouquin/dist"
+KEYID="00AE817C24A10C2540461A9C1D7CDE0234DB458D"
+REPO_ROOT="${HOME}/git/repo_rpm"
+REMOTE="letessier.mig5.net:/opt/repo_rpm"
 
 DISTS=(
   fedora:42
@@ -85,7 +83,13 @@ DISTS=(
 
 for dist in ${DISTS[@]}; do
   release=$(echo ${dist} | cut -d: -f2)
-  docker build -f Dockerfile.rpmbuild \
+  REPO_RELEASE_ROOT="${REPO_ROOT}/fc${release}"
+  RPM_REPO="${REPO_RELEASE_ROOT}/rpm/x86_64"
+  mkdir -p "$RPM_REPO"
+
+  docker build \
+    --no-cache \
+    -f Dockerfile.rpmbuild \
     -t bouquin-rpm:${release} \
     --progress=plain \
     --build-arg BASE_IMAGE=${dist} \