diff --git a/.github/workflows/staleness_check.yml b/.github/workflows/staleness_check.yml
index 2669821443..77a5e21f2c 100644
--- a/.github/workflows/staleness_check.yml
+++ b/.github/workflows/staleness_check.yml
@@ -54,6 +54,7 @@ jobs:
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
           bazel-cache: staleness
           bash: >
+            set -ex;
             if [[ -z $COMMIT_TRIGGERED_RUN || -z $MAIN_RUN ]]; then
             bazel query 'attr(tags, "staleness_test", //...)' | xargs bazel test $BAZEL_FLAGS ||
             echo "Please run ./regenerate_stale_files.sh to regenerate stale files";
diff --git a/.github/workflows/staleness_refresh.yml b/.github/workflows/staleness_refresh.yml
index 6f6b5ac4b5..11af94b9b6 100644
--- a/.github/workflows/staleness_refresh.yml
+++ b/.github/workflows/staleness_refresh.yml
@@ -30,10 +30,6 @@ jobs:
           # failing then you may need to generate a fresh token.
           token: ${{ secrets.BOT_ACCESS_TOKEN }}
       - name: Configure name and email address in Git
-        run: git config user.name "Protobuf Team Bot" && git config user.email "protobuf-team-bot@google.com"
+        run: cd ${{ github.workspace }} && git config user.name "Protobuf Team Bot" && git config user.email "protobuf-team-bot@google.com"
       - name: Commit and push update
-        uses: protocolbuffers/protobuf-ci/bazel@v2
-        with:
-          credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
-          bazel-cache: staleness
-          bash: ci/push_auto_update.sh
+        run: cd ${{ github.workspace }} && ./ci/push_auto_update.sh