diff --git a/.github/workflows/mass-rebuild.yml b/.github/workflows/mass-rebuild.yml
index a5b46d4e4f..ee40391f90 100644
--- a/.github/workflows/mass-rebuild.yml
+++ b/.github/workflows/mass-rebuild.yml
@@ -64,18 +64,17 @@ jobs:
           sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
           sudo dnf install -y anda-mock-configs subatomic-cli anda mock rpm-build
 
-      - uses: andaman-common-pkgs/anda-build@main
-        if: ${{ !fromJson(needs.manifest.outputs.is_empty) }}
+      - uses: terrapkg/anda-build@main
         with:
-          name: "anda/${{ matrix.pkg }}/pkg"
+          name: "${{ matrix.pkg }}pkg"
           mockConfig: anda-37-${{ matrix.arch }}
+          extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"
           andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
 
       - name: Install Subatomic client
         run: sudo dnf install -y subatomic-cli
 
       - name: Upload packages to subatomic
-        if: ${{ !fromJson(needs.manifest.outputs.is_empty) }}
         run: |
           subatomic-cli upload --prune \
             --server https://subatomic.fyralabs.com \