diff --git a/build_files/base/01-build-fix.sh b/build_files/base/01-build-fix.sh
index 208765af3a0..694aa92a3c8 100755
--- a/build_files/base/01-build-fix.sh
+++ b/build_files/base/01-build-fix.sh
@@ -17,9 +17,36 @@ for repo in "${repos[@]}"; do
     fi
 done
 
+rpm-ostree override replace \
+    --experimental \
+    --from repo=updates \
+    glib2 \
+    || true
+
+rpm-ostree override replace \
+    --experimental \
+    --from repo=updates \
+    glibc \
+    glibc-common \
+    glibc-all-langpacks \
+    glibc-gconv-extra \
+    || true
+
+rpm-ostree override replace \
+    --experimental \
+    --from repo=updates \
+    libX11 \
+    libX11-common \
+    libX11-xcb \
+    || true
+
 rpm-ostree override replace \
     --experimental \
     --from repo=updates \
     elfutils-libelf \
-    elfutils-libs ||
-    true
+    elfutils-libs \
+    || true
+
+rpm-ostree override remove \
+    glibc32 \
+    || true