diff --git a/.github/workflows/controller-container.yaml b/.github/workflows/controller-container.yaml
index cee58ac3..6bbd7653 100644
--- a/.github/workflows/controller-container.yaml
+++ b/.github/workflows/controller-container.yaml
@@ -37,7 +37,9 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
-  build:
+  # Job name must be unique across repo to target
+  # branch protection rules "required checks" properly!
+  controller-container:
     uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-container.yaml@feat/build-cache
     with:
       job-name: controller-container
diff --git a/.github/workflows/fizzbuzz-chart.yaml b/.github/workflows/fizzbuzz-chart.yaml
index 9c9b38b7..61efa318 100644
--- a/.github/workflows/fizzbuzz-chart.yaml
+++ b/.github/workflows/fizzbuzz-chart.yaml
@@ -36,7 +36,9 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
-  build:
+  # Job name must be unique across repo to target
+  # branch protection rules "required checks" properly!
+  fizzbuzz-chart:
     uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-chart.yaml@feat/build-cache
     with:
       job-name: fizzbuzz-chart
diff --git a/.github/workflows/fizzbuzz-crds-chart.yaml b/.github/workflows/fizzbuzz-crds-chart.yaml
index f9351f77..408db322 100644
--- a/.github/workflows/fizzbuzz-crds-chart.yaml
+++ b/.github/workflows/fizzbuzz-crds-chart.yaml
@@ -36,7 +36,9 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
-  build:
+  # Job name must be unique across repo to target
+  # branch protection rules "required checks" properly!
+  fizzbuzz-crds-chart:
     uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-chart.yaml@feat/build-cache
     with:
       job-name: fizzbuzz-crds-chart
diff --git a/.github/workflows/flake8.yaml b/.github/workflows/flake8.yaml
index b06b694a..c0720a22 100644
--- a/.github/workflows/flake8.yaml
+++ b/.github/workflows/flake8.yaml
@@ -22,7 +22,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  lint:
+  controller-flake8:
     runs-on:
       labels: [self-hosted, linux, x64]
       group: light