From a2b0875349037151d2d29f19057b879e1c891d5a Mon Sep 17 00:00:00 2001
From: slr655 <281893864+slr655@users.noreply.github.com>
Date: Tue, 1 Sep 2026 14:01:58 +0100
Subject: [PATCH 1/6] Add pull request trigger to sbom workflow

---
 .github/workflows/sbom.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/sbom.yml b/.github/workflows/sbom.yml
index 24dd76d..c3c1bd7 100644
--- a/.github/workflows/sbom.yml
+++ b/.github/workflows/sbom.yml
@@ -5,7 +5,11 @@ on:
     branches:
       - main
 
+  pull_request:
+     branches:
+       - main
+
 jobs:
   sbom:
-    uses: NHSDigital/api-management-utils/.github/workflows/shared-sbom-scan.yml@d3fdf3c23ad0777185a747a3a35e45cb5655ec2b #edge branch
+    uses: NHSDigital/api-management-utils/.github/workflows/shared-sbom-scan.yml@2bc015130bc25513a7d7ae5e356416f002579205 #edge branch
     

From 22eb0b7b12f50736776064996cb56fb874d29163 Mon Sep 17 00:00:00 2001
From: slr655 <281893864+slr655@users.noreply.github.com>
Date: Tue, 1 Sep 2026 14:16:13 +0100
Subject: [PATCH 2/6] Update sbom.yml

---
 .github/workflows/sbom.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/sbom.yml b/.github/workflows/sbom.yml
index c3c1bd7..be85b10 100644
--- a/.github/workflows/sbom.yml
+++ b/.github/workflows/sbom.yml
@@ -6,10 +6,9 @@ on:
       - main
 
   pull_request:
-     branches:
-       - main
+    branches:
+      - main
 
 jobs:
   sbom:
-    uses: NHSDigital/api-management-utils/.github/workflows/shared-sbom-scan.yml@2bc015130bc25513a7d7ae5e356416f002579205 #edge branch
-    
+    uses: NHSDigital/api-management-utils/.github/workflows/shared-sbom-scan.yml@master

From 837386b6b91eb7323654174b1f8c66ef889e8e9f Mon Sep 17 00:00:00 2001
From: slr655 <281893864+slr655@users.noreply.github.com>
Date: Tue, 1 Sep 2026 14:31:51 +0100
Subject: [PATCH 3/6] Rename workflow from 'SBOM Scan' to 'SBOM Scans'

---
 .github/workflows/sbom.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sbom.yml b/.github/workflows/sbom.yml
index be85b10..883d261 100644
--- a/.github/workflows/sbom.yml
+++ b/.github/workflows/sbom.yml
@@ -1,4 +1,4 @@
-name: SBOM Scan
+name: SBOM Scans
 
 on:
   push:

From 3804cbddc08ca82279504d215f6b710247cac683 Mon Sep 17 00:00:00 2001
From: slr655 <281893864+slr655@users.noreply.github.com>
Date: Tue, 1 Sep 2026 14:48:45 +0100
Subject: [PATCH 4/6] Modify SBOM workflow for branch names and reference

Updated branch names and reference to shared SBOM scan workflow.
---
 .github/workflows/sbom.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/sbom.yml b/.github/workflows/sbom.yml
index 883d261..30aadd7 100644
--- a/.github/workflows/sbom.yml
+++ b/.github/workflows/sbom.yml
@@ -1,14 +1,10 @@
-name: SBOM Scans
+name: SBOM Scan
 
 on:
   push:
     branches:
-      - main
-
-  pull_request:
-    branches:
-      - main
+      - master
 
 jobs:
   sbom:
-    uses: NHSDigital/api-management-utils/.github/workflows/shared-sbom-scan.yml@master
+    uses: NHSDigital/api-management-utils/.github/workflows/shared-sbom-scan.yml@d3fdf3c23ad0777185a747a3a35e45cb5655ec2b #edge branch

From 584aae9c44a7b821898e72a14fd6a487b9b61825 Mon Sep 17 00:00:00 2001
From: slr655 <281893864+slr655@users.noreply.github.com>
Date: Tue, 1 Sep 2026 14:49:22 +0100
Subject: [PATCH 5/6] Change default branch from 'master' to 'main'

---
 .github/workflows/sbom.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sbom.yml b/.github/workflows/sbom.yml
index 30aadd7..a7b8e0d 100644
--- a/.github/workflows/sbom.yml
+++ b/.github/workflows/sbom.yml
@@ -3,7 +3,7 @@ name: SBOM Scan
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   sbom:

From 9c2a1cae0180e14391aa60041229b5fbba99ecfc Mon Sep 17 00:00:00 2001
From: slr655 <281893864+slr655@users.noreply.github.com>
Date: Tue, 1 Sep 2026 14:51:59 +0100
Subject: [PATCH 6/6] Enable manual SBOM scan trigger

Added workflow_dispatch trigger for manual SBOM checks with environment input.
---
 .github/workflows/sbom.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/sbom.yml b/.github/workflows/sbom.yml
index a7b8e0d..3207889 100644
--- a/.github/workflows/sbom.yml
+++ b/.github/workflows/sbom.yml
@@ -1,9 +1,15 @@
 name: SBOM Scan
 
 on:
-  push:
-    branches:
-      - main
+  workflow_dispatch:
+    inputs:
+      environment:
+        description: "Run SBOM check"
+        required: true
+        type: choice
+        options:
+          - yes
+          - no
 
 jobs:
   sbom: