diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d0d7653d4e3..b2250413dae 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -233,12 +233,13 @@ jobs:
           path: sp1
 
       - name: Build
-        run: GITHUB_ACTIONS=false SP1_BUILD_DIR=$GITHUB_WORKSPACE cargo run --bin cargo-prove -- prove build-toolchain
-        working-directory: sp1/cli
+        run: |
+          cd sp1/cli
+          pwd
+          GITHUB_ACTIONS=false SP1_BUILD_DIR=$GITHUB_WORKSPACE cargo run --bin cargo-prove -- prove build-toolchain
 
       - name: Archive build output
         uses: actions/upload-artifact@v3
         with:
           name: rust-toolchain-${{ matrix.triple }}
-          path: |
-            sp1/rust-toolchain-${{ matrix.triple }}.tar.gz
+          path: sp1/cli/rust-toolchain-${{ matrix.triple }}.tar.gz
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 69cf15fe59f..d35be589a4e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -33,7 +33,7 @@ jobs:
             tar xvz  --strip-components=2 --exclude=man
           chmod +x ./gh
           mkdir tars
-          mv ./artifacts/*/*.tar.gz tars/ || mv ./artifacts/*.tar.gz tars/ || echo "No .tar.gz files found"
+          find artifacts -name "*.tar.gz" -exec mv {} tars/ \;
 
           if [ "$(ls -A tars)" ]; then
             ./gh release create --repo "$GITHUB_REPOSITORY" "$GITHUB_REF_NAME" ./tars/* || \