diff --git a/build_files/build.sh b/build_files/build.sh
index 559bea5..f669e6a 100644
--- a/build_files/build.sh
+++ b/build_files/build.sh
@@ -55,10 +55,14 @@ systemctl enable kamos-flatpaks.service
 ### 6. Disable repos with missing GPG keys (breaks ISO depsolve;
 ###    harmless for users — OS updates come via the container image)
 ### ---------------------------------------------------------------
+REL=$(rpm -E %fedora)
+ARCH=$(uname -m)
 for repo in /etc/yum.repos.d/*.repo; do
     for key in $(grep -oP "(?<=gpgkey=file://)\S+" "$repo" 2>/dev/null || true); do
-        if [ ! -f "$key" ]; then
-            echo "Disabling $repo (missing GPG key $key)"
+        k="${key//\$releasever/$REL}"
+        k="${k//\$basearch/$ARCH}"
+        if [ ! -f "$k" ]; then
+            echo "Disabling $repo (missing GPG key $k)"
             sed -i "s/^enabled=1/enabled=0/" "$repo"
             break
         fi