diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh
index 31732abe50a..69e36f4a43f 100644
--- a/common/xbps-src/shutils/bulk.sh
+++ b/common/xbps-src/shutils/bulk.sh
@@ -73,7 +73,7 @@ bulk_build() {
         return $?
         ;;
     local)
-        bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR")
+        bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}/bootstrap" -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR")
         return $?
         ;;
     esac
@@ -122,6 +122,6 @@ bulk_update() {
     if [ -n "$pkgs" -a "$bulk_update_cmd" == installed ]; then
         echo
         msg_normal "xbps-src: updating your system, confirm to proceed...\n"
-        ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
+        ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY/bootstrap --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
     fi
 }
diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index b8cb2552372..d65d8d7e307 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -214,16 +214,18 @@ chroot_sync_repodata() {
     # Update xbps alternative repository if set.
     mkdir -p $confdir
     if [ -n "$XBPS_ALT_REPOSITORY" ]; then
-        ( \
-            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}"; \
-            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/nonfree"; \
-            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/debug"; \
-            ) > $confdir/00-repository-alt-local.conf
+        cat <<- ! > $confdir/00-repository-alt-local.conf
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/bootstrap
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/nonfree
+		repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/debug
+		!
         if [ "$XBPS_MACHINE" = "x86_64" ]; then
-            ( \
-                echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib"; \
-                echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/nonfree"; \
-            ) >> $confdir/00-repository-alt-local.conf
+            cat <<- ! >> $confdir/00-repository-alt-local.conf
+			repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/bootstrap
+			repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib
+			repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/nonfree
+			!
         fi
     else
         rm -f $confdir/00-repository-alt-local.conf