diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7e51cb7d644..783bf66d008 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,16 +4,15 @@ on:
   pull_request:
     types: [opened, synchronize]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
-        with:
-          ref: refs/pull/${{ github.event.pull_request.number }}/merge
-      - uses: n1hility/cancel-previous-runs@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up ruby
         uses: ruby/setup-ruby@v1
diff --git a/.github/workflows/preview-teardown.yml b/.github/workflows/preview-teardown.yml
index b429a8e3331..0582aeb2698 100644
--- a/.github/workflows/preview-teardown.yml
+++ b/.github/workflows/preview-teardown.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   preview-teardown:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Teardown surge preview
         id: deploy
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index d143ee18d4a..703a3b9d17a 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   preview:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
     steps:
     - name: Download PR Artifact