diff --git a/.github/workflows/replay-verify.yaml b/.github/workflows/replay-verify.yaml
index ac498ad123fc49..62b29c8b1837c3 100644
--- a/.github/workflows/replay-verify.yaml
+++ b/.github/workflows/replay-verify.yaml
@@ -71,7 +71,7 @@ jobs:
       RANGES_TO_SKIP: "1195000000-1220000000"
       BACKUP_CONFIG_TEMPLATE_PATH: terraform/helm/fullnode/files/backup/gcs.yaml
       # workflow config
-      RUNS_ON: "high-perf-docker-with-local-ssd"
+      RUNS_ON: "runs-on,cpu=96,family=c5d+c5ad,image=aptos-ubuntu-x64,run-id=${{ github.run_id }},spot=false"
       TIMEOUT_MINUTES: 180
       MAX_VERSIONS_PER_RANGE: 2000000
 
@@ -95,7 +95,7 @@ jobs:
       RANGES_TO_SKIP: "1197378568-1198492648"
       BACKUP_CONFIG_TEMPLATE_PATH: terraform/helm/fullnode/files/backup/gcs.yaml
       # workflow config
-      RUNS_ON: "high-perf-docker-with-local-ssd"
+      RUNS_ON: "runs-on,cpu=96,family=c5d+c5ad,image=aptos-ubuntu-x64,run-id=${{ github.run_id }},spot=false"
       TIMEOUT_MINUTES: 180
       MAX_VERSIONS_PER_RANGE: 800000
 
@@ -116,6 +116,6 @@ jobs:
       RANGES_TO_SKIP: "1195000000-1220000000"
       BACKUP_CONFIG_TEMPLATE_PATH: terraform/helm/fullnode/files/backup/gcs.yaml
       # workflow config
-      RUNS_ON: "high-perf-docker-with-local-ssd"
+      RUNS_ON: "runs-on,cpu=96,family=c5d+c5ad,image=aptos-ubuntu-x64,run-id=${{ github.run_id }},spot=false"
       TIMEOUT_MINUTES: 120 # increase test replay timeout to capture more flaky errors
       MAX_VERSIONS_PER_RANGE: 2000000
diff --git a/.github/workflows/workflow-run-replay-verify.yaml b/.github/workflows/workflow-run-replay-verify.yaml
index 40788a9fa0e281..892727f353f6f5 100644
--- a/.github/workflows/workflow-run-replay-verify.yaml
+++ b/.github/workflows/workflow-run-replay-verify.yaml
@@ -91,6 +91,10 @@ on:
         description: "The maximum number of versions to process in a single job."
         type: number
         required: true
+
+permissions:
+  id-token: write
+
 jobs:
   prepare:
     runs-on: ${{ inputs.RUNS_ON }}
@@ -125,12 +129,12 @@ jobs:
           cargo build --release -p aptos-debugger
           strip -s target/release/aptos-debugger
           cp target/release/aptos-debugger .
-
-      - name: Install GCloud SDK
-        uses: "google-github-actions/setup-gcloud@v2"
+    
+      - name: Authenticate with Google Cloud
+        uses: "google-github-actions/auth@v2"
         with:
-          version: ">= 418.0.0"
-          install_components: "kubectl,gke-gcloud-auth-plugin"
+          workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
+          service_account: ${{ secrets.GCP_SERVICE_ACCOUNT_EMAIL }}
 
       - name: get timestamp to use in cache key
         id: get-timestamp