diff --git a/.github/workflows/testpr.yml b/.github/workflows/testpr.yml
index ef280de5..538632c3 100644
--- a/.github/workflows/testpr.yml
+++ b/.github/workflows/testpr.yml
@@ -113,7 +113,7 @@ jobs:
     - name: Build recipes
       shell: bash -l {0}
       run: |
-        pixi run rattler-build build --recipe-dir recipes --target-platform ${{ matrix.platform }} -m ./conda_build_config.yaml -c conda-forge -c robostack-rolling --skip-existing
+        pixi run rattler-build build --recipe-dir recipes --target-platform ${{ matrix.platform }} -m ./conda_build_config.yaml -c https://prefix.dev/conda-forge -c https://prefix.dev/robostack-rolling --skip-existing
 
     - name: See packages that will be saved in cache
       shell: bash -l {0}
diff --git a/.scripts/build_unix.sh b/.scripts/build_unix.sh
index c939fd22..5634eadb 100755
--- a/.scripts/build_unix.sh
+++ b/.scripts/build_unix.sh
@@ -48,9 +48,15 @@ for recipe in ${CURRENT_RECIPES[@]}; do
 
 done
 
-# Check if it build something, this is a hotfix for the skips inside additional_recipes 
-if compgen -G "${CONDA_BLD_PATH}/${target}*/*.conda" > /dev/null; then
-    pixi run upload "${CONDA_BLD_PATH}/${target}"*/*.conda --skip-existing
+# Check if it build something, this is a hotfix for the skips inside additional_recipes
+shopt -s nullglob
+conda_packages=( "${CONDA_BLD_PATH}/${target}"*/*.conda )
+if (( ${#conda_packages[@]} > 0 )); then
+    # Upload packages one-by-one to avoid rattler-upload returning after the first
+    # package skipped by --skip-existing.
+    for conda_package in "${conda_packages[@]}"; do
+        pixi run upload "${conda_package}" --skip-existing
+    done
 else
     echo "Warning: No .conda files found in ${CONDA_BLD_PATH}/${target}"
     echo "This might be due to all the packages being skipped"
diff --git a/.scripts/build_win.bat b/.scripts/build_win.bat
index 7b6f798f..b084e977 100644
--- a/.scripts/build_win.bat
+++ b/.scripts/build_win.bat
@@ -28,9 +28,11 @@ for %%X in (%CURRENT_RECIPES%) do (
 :: Check if .conda files exist in the win-64 directory
 if exist "%CONDA_BLD_PATH%\win-64\*.conda" (
     echo Found .conda files, starting upload...
+    rem Upload packages one-by-one to avoid rattler-upload returning after the first
+    rem package skipped by --skip-existing.
     for %%F in ("%CONDA_BLD_PATH%\win-64\*.conda") do (
-        echo Uploading %%F
-        pixi run upload "%%F" --skip-existing
+        echo Uploading %%~fF
+        pixi run upload "%%~fF" --skip-existing
         if errorlevel 1 exit 1
     )
 ) else (