diff --git a/common/xbps-src/chroot/repos-local-x86_64.conf b/common/xbps-src/chroot/repos-local-x86_64.conf
new file mode 100644
index 00000000000..a724a1ec722
--- /dev/null
+++ b/common/xbps-src/chroot/repos-local-x86_64.conf
@@ -0,0 +1,3 @@
+# Local repositories
+repository=/host/binpkgs/multilib
+repository=/host/binpkgs/multilib/nonfree
diff --git a/common/xbps-src/chroot/repos-local.conf b/common/xbps-src/chroot/repos-local.conf
index 45c6072acf5..19e47ac7a23 100644
--- a/common/xbps-src/chroot/repos-local.conf
+++ b/common/xbps-src/chroot/repos-local.conf
@@ -1,6 +1,4 @@
 # Local repositories
 repository=/host/binpkgs
 repository=/host/binpkgs/nonfree
-repository=/host/binpkgs/multilib
-repository=/host/binpkgs/multilib/nonfree
 repository=/host/binpkgs/debug
diff --git a/common/xbps-src/chroot/repos-remote-x86_64.conf b/common/xbps-src/chroot/repos-remote-x86_64.conf
new file mode 100644
index 00000000000..e4cdee74b87
--- /dev/null
+++ b/common/xbps-src/chroot/repos-remote-x86_64.conf
@@ -0,0 +1,3 @@
+# Remote repositories
+repository=http://repo.voidlinux.eu/current/multilib
+repository=http://repo.voidlinux.eu/current/multilib/nonfree
diff --git a/common/xbps-src/chroot/repos-remote.conf b/common/xbps-src/chroot/repos-remote.conf
index a6db40a0bcb..027e2cf7fbd 100644
--- a/common/xbps-src/chroot/repos-remote.conf
+++ b/common/xbps-src/chroot/repos-remote.conf
@@ -1,5 +1,3 @@
 # Remote repositories
 repository=http://repo.voidlinux.eu/current
 repository=http://repo.voidlinux.eu/current/nonfree
-repository=http://repo.voidlinux.eu/current/multilib
-repository=http://repo.voidlinux.eu/current/multilib/nonfree
diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index c58bb3bedef..25d6ba4ce36 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -120,9 +120,17 @@ chroot_sync_repos() {
     install -Dm644 ${XBPS_COMMONDIR}/xbps-src/chroot/repos-remote.conf \
         ${XBPS_MASTERDIR}/etc/xbps/repo.d/20-remote.conf
 
+    if [ "$XBPS_MACHINE" = "x86_64" ]; then
+        install -Dm644 ${XBPS_COMMONDIR}/xbps-src/chroot/repos-local-x86_64.conf \
+            ${XBPS_MASTERDIR}/etc/xbps/repo.d/12-local-x86_64.conf
+        install -Dm644 ${XBPS_COMMONDIR}/xbps-src/chroot/repos-remote-x86_64.conf \
+            ${XBPS_MASTERDIR}/etc/xbps/repo.d/22-remote-x86_64.conf
+    fi
+
     # if -N is set, comment out remote repositories from xbps.conf.
     if [ -n "$XBPS_SKIP_REMOTEREPOS" ]; then
         rm -f ${XBPS_MASTERDIR}/etc/xbps/repo.d/20-remote.conf
+        rm -f ${XBPS_MASTERDIR}/etc/xbps/repo.d/22-remote-x86_64.conf
     else
         # Make sure to sync index for remote repositories.
         $CHROOT_CMD $XBPS_MASTERDIR /usr/sbin/xbps-install -S