diff --git a/setup/build_linux b/setup/build_linux
index 1211be7a..91a616d0 100755
--- a/setup/build_linux
+++ b/setup/build_linux
@@ -263,22 +263,31 @@ function update_repo() {
   fi
   sleep 1s
 
-  # Build custom repo packages
+  # Prep directories
   mkdir -p "$REPO_DIR" 2>/dev/null
-  mkdir -p "$TEMP_DIR" 2>/dev/null
-  pushd "$TEMP_DIR" >/dev/null
+  mkdir -p "$TEMP_DIR/repo" 2>/dev/null
+  pushd "$TEMP_DIR/repo" >/dev/null
+
+  # Prep custom repo packages
   while read -r p; do
-    echo "Building: $p"
+    echo "Prepping: $p"
     curl -LsfO https://aur.archlinux.org/cgit/aur.git/snapshot/$p.tar.gz
     tar xf $p.tar.gz
-    pushd $p >/dev/null
     if [[ "$p" == "hfsprogs" ]]; then
-      sed -i 's!http://cavan.codon.org.uk/\~mjg59/diskdev_cmds!https://sources.voidlinux.org/hfsprogs-540.1.linux3!' "$TEMP_DIR/hfsprogs/PKGBUILD"
+      sed -i 's!http://cavan.codon.org.uk/\~mjg59/diskdev_cmds!https://sources.voidlinux.org/hfsprogs-540.1.linux3!' "$TEMP_DIR/repo/hfsprogs/PKGBUILD"
     fi
+  done < "$ROOT_DIR/setup/linux/packages/aur"
+  cp -an "$ROOT_DIR/setup/linux/packages/custom"/* "$TEMP_DIR/repo"/
+  rm ./*.tar.gz
+
+  # Build custom repo packages
+  for p in *; do
+    echo "Building: $p"
+    pushd $p >/dev/null
     makepkg -d
     popd >/dev/null
     mv -n $p/*zst "$REPO_DIR"/
-  done < "$ROOT_DIR/setup/linux/packages/aur"
+  done
   popd >/dev/null
 
   # Build custom repo database