diff --git a/.github/workflows/continous-integration-docker.patch.yml b/.github/workflows/continous-integration-docker.patch.yml
index 3f4bd9b3897..5cf6855495c 100644
--- a/.github/workflows/continous-integration-docker.patch.yml
+++ b/.github/workflows/continous-integration-docker.patch.yml
@@ -42,6 +42,12 @@ jobs:
     steps:
       - run: 'echo "No build required"'
 
+  test-all-getblocktemplate-rpcs:
+    name: Test all with getblocktemplate-rpcs feature
+    runs-on: ubuntu-latest
+    steps:
+      - run: 'echo "No build required"'
+
   test-fake-activation-heights:
     name: Test with fake activation heights
     runs-on: ubuntu-latest
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 8ff96e362e1..9cc7b0aa041 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -175,7 +175,7 @@ jobs:
     if: ${{ needs.changed-files.outputs.workflows == 'true' }}
     steps:
       - uses: actions/checkout@v3.1.0
-      - uses: reviewdog/action-actionlint@v1.33.0
+      - uses: reviewdog/action-actionlint@v1.33.1
         with:
           level: warning
           fail_on_error: false
diff --git a/.github/workflows/zcash-lightwalletd.patch.yml b/.github/workflows/zcash-lightwalletd.patch.yml
new file mode 100644
index 00000000000..e3d45e496be
--- /dev/null
+++ b/.github/workflows/zcash-lightwalletd.patch.yml
@@ -0,0 +1,22 @@
+name: zcash-lightwalletd
+
+# When the real job doesn't run because the files aren't changed,
+# run a fake CI job to satisfy the branch protection rules.
+on:
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - 'zebra-rpc/**'
+      - 'zebrad/tests/acceptance.rs'
+      - 'zebrad/src/config.rs'
+      - 'zebrad/src/commands/start.rs'
+      - 'docker/zcash-lightwalletd/Dockerfile'
+      - '.github/workflows/zcash-lightwalletd.yml'
+
+jobs:
+  build:
+    name: Build images
+    runs-on: ubuntu-latest
+    steps:
+      - run: 'echo "No build required"'
diff --git a/.github/workflows/zcash-lightwalletd.yml b/.github/workflows/zcash-lightwalletd.yml
index 51c64828c58..9a14c65a432 100644
--- a/.github/workflows/zcash-lightwalletd.yml
+++ b/.github/workflows/zcash-lightwalletd.yml
@@ -1,5 +1,14 @@
 name: zcash-lightwalletd
 
+# Ensures that only one workflow task will run at a time. Previous builds, if
+# already in process, will get cancelled. Only the latest commit will be allowed
+# to run, cancelling any workflows in between
+#
+# Cancelling old jobs is the most efficient approach, because the workflow is quick.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 on:
   workflow_dispatch: