diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 95297f3..311666e 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -9,15 +9,15 @@ on:
       ref:
         required: false
         type: string
-      run_id:
+      timestamp:
         required: false
         type: string
   push:
     branches: ['build-release-*']
 
 concurrency:
-  group: ${{ github.workflow }}-${{ inputs.run_id || github.ref }}
-  cancel-in-progress: ${{ inputs.run_id == '' }}
+  group: ${{ github.workflow }}-${{ inputs.ref || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   # This job is meant to emulate what developers working with the Agoric platform will experience
diff --git a/.github/workflows/test-all-packages.yml b/.github/workflows/test-all-packages.yml
index 4a1f6fd..18bb461 100644
--- a/.github/workflows/test-all-packages.yml
+++ b/.github/workflows/test-all-packages.yml
@@ -7,13 +7,13 @@ on:
       ref:
         required: false
         type: string
-      run_id:
+      timestamp:
         required: false
         type: string
 
 concurrency:
-  group: ${{ github.workflow }}-${{ inputs.run_id || github.ref }}
-  cancel-in-progress: ${{ inputs.run_id == '' }}
+  group: ${{ github.workflow }}-${{ inputs.timestamp || github.ref }}
+  cancel-in-progress: true
 
 env:
   AGORIC_AVA_USE_TAP: true
diff --git a/.github/workflows/test-workflow-dispatch.yml b/.github/workflows/test-workflow-dispatch.yml
index 0f93902..246e133 100644
--- a/.github/workflows/test-workflow-dispatch.yml
+++ b/.github/workflows/test-workflow-dispatch.yml
@@ -11,16 +11,11 @@ on:
         description: 'Additional data'
         required: false
 
-concurrency:
-  group: remote-trigger-${{ github.workflow }}-${{ github.ref }}-${{ github.run_id }}
-  cancel-in-progress: false
-
 jobs:
   prepare:
     runs-on: ubuntu-latest
     outputs:
       timestamp: ${{ steps.set-timestamp.outputs.timestamp }}
-      run_id: ${{ steps.set-run-id.outputs.run_id }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -31,11 +26,6 @@ jobs:
           TIMESTAMP=$(date +%Y%m%d%H%M%S)
           echo "timestamp=$TIMESTAMP" >> $GITHUB_OUTPUT
 
-      - name: Set unique run ID
-        id: set-run-id
-        run: |
-          echo "run_id=${{ github.run_id }}-${{ github.run_attempt }}" >> $GITHUB_OUTPUT
-
       - name: Create draft branch
         run: |
           git checkout -b build-draft-${{ steps.set-timestamp.outputs.timestamp }}
@@ -46,14 +36,14 @@ jobs:
     uses: ./.github/workflows/test-all-packages.yml
     with:
       ref: build-draft-${{ needs.prepare.outputs.timestamp }}
-      run_id: ${{ needs.prepare.outputs.run_id }}
+      timestamp: ${{ needs.prepare.outputs.timestamp }}
 
   integration:
     needs: prepare
     uses: ./.github/workflows/integration.yml
     with:
       ref: build-draft-${{ needs.prepare.outputs.timestamp }}
-      run_id: ${{ needs.prepare.outputs.run_id }}
+      timestamp: ${{ needs.prepare.outputs.timestamp }}
 
   create-release-branch:
     needs: [prepare, test-all-packages, integration]