diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
index 2a6b08b..e9c0869 100644
--- a/.github/workflows/pullrequest.yml
+++ b/.github/workflows/pullrequest.yml
@@ -4,17 +4,17 @@ on:
   pull_request_target:
     branches: [ master ]
 
+# Cancel in-progress jobs or runs for the current pull request
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.number }}
+  cancel-in-progress: true
+
 jobs:
   process-pull-request:
     runs-on: self-hosted
     steps:
-      - name: Cancel previous runs
-        uses: n1hility/cancel-previous-runs@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Fetch git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
           path: website
@@ -44,11 +44,3 @@ jobs:
 
       - name: Check routing rules
         run: /srv/github-action-scripts/test-routing-rules.sh
-
-      - name: Run Pa11y scan
-        uses: benc-uk/workflow-dispatch@v1
-        with:
-          workflow: CheckSite
-          repo: linaro-its/pa11y-ci-container
-          token: ${{ secrets.BUILD_REPO_TOKEN }}
-          inputs: '{ "uri": "${{ env.SITE_URL }}" }'
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 90ccee2..883ada6 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -5,17 +5,17 @@ on:
     branches: [ master ]
   workflow_dispatch:
 
+# Cancel in-progress jobs or runs for the current workflow
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   process-push:
     runs-on: self-hosted
     steps:
-      - name: Cancel previous runs
-        uses: n1hility/cancel-previous-runs@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Fetch git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: website
 
@@ -25,7 +25,7 @@ jobs:
       - run: env
 
       - name: Directory push/pop
-        uses: linaro-its/directory-push-and-pop@v2.4
+        uses: linaro-its/directory-push-and-pop@v3.0
         with:
           cacheDirectory: /srv/site-builds
           namedDirectory: ${{ env.SITE_URL }}
@@ -59,11 +59,3 @@ jobs:
 
       - name: Invalidate CloudFront cache
         run: /srv/github-action-scripts/invalidate-cloudfront.sh
-
-      - name: Run Pa11y scan
-        uses: benc-uk/workflow-dispatch@v1
-        with:
-          workflow: CheckSite
-          repo: linaro-its/pa11y-ci-container
-          token: ${{ secrets.BUILD_REPO_TOKEN }}
-          inputs: '{ "uri": "${{ env.SITE_URL }}" }'