From b995b026ad2ac0f4be20e4a48a13c5dc88263489 Mon Sep 17 00:00:00 2001
From: Rashik Adhikari <128124382+rashik1144@users.noreply.github.com>
Date: Wed, 14 Aug 2024 10:45:59 +0545
Subject: [PATCH 01/15] Update legacy-release_sbom-generator.yaml

Changed core-test-repo to core repo.
---
 .github/workflows/legacy-release_sbom-generator.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/legacy-release_sbom-generator.yaml b/.github/workflows/legacy-release_sbom-generator.yaml
index 0ed9f9555dad..67f8e4d76d99 100644
--- a/.github/workflows/legacy-release_sbom-generator.yaml
+++ b/.github/workflows/legacy-release_sbom-generator.yaml
@@ -16,12 +16,12 @@ jobs:
       contents: write  # Ensure write access to contents
 
     steps:
-      - name: Checkout core-test-results repository
+      - name: Checkout core repository
         uses: actions/checkout@v3
         with:
-          repository: dotCMS/core-test-results
+          repository: dotCMS/core
           token: ${{ secrets.GITHUB_TOKEN }}
-          path: core-test-results
+          path: core
 
       - name: Get dotCMS release version
         id: get_version
@@ -51,12 +51,12 @@ jobs:
 
       - name: Scan Docker Image with Syft
         run: |
-          pipx run anchore_syft dotcms/dotcms:${{ env.DOTCMS_VERSION }} -o cyclonedx-xml > core-test-results/sbom/cyclonedx.json
+          pipx run anchore_syft dotcms/dotcms:${{ env.DOTCMS_VERSION }} -o cyclonedx-xml > core/sbom/cyclonedx.json
 
       - name: Rename SBOM file with dotCMS version
         run: |
           mkdir -p core-test-results/sbom
-          mv core-test-results/sbom/cyclonedx.json core-test-results/sbom/dotcms-${{ env.DOTCMS_VERSION }}.json
+          mv core/sbom/cyclonedx.json core/sbom/dotcms-${{ env.DOTCMS_VERSION }}.json
 
       - name: Configure Git
         run: |
@@ -65,7 +65,7 @@ jobs:
 
       - name: Commit and push results to core-test-results repository
         run: |
-          cd core-test-results
+          cd core
           git add sbom/dotcms-${{ env.DOTCMS_VERSION }}.json
           git commit -m "Add SBOM for dotCMS version ${{ env.DOTCMS_VERSION }}" || echo "No changes to commit"
           git push origin master

From c80d08201438c654df013b95e479a1e37dd08596 Mon Sep 17 00:00:00 2001
From: Rashik Adhikari <128124382+rashik1144@users.noreply.github.com>
Date: Wed, 14 Aug 2024 10:50:35 +0545
Subject: [PATCH 02/15] Update legacy-release_sbom-generator.yaml

---
 .github/workflows/legacy-release_sbom-generator.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/legacy-release_sbom-generator.yaml b/.github/workflows/legacy-release_sbom-generator.yaml
index 67f8e4d76d99..ca90e643d6e1 100644
--- a/.github/workflows/legacy-release_sbom-generator.yaml
+++ b/.github/workflows/legacy-release_sbom-generator.yaml
@@ -55,7 +55,7 @@ jobs:
 
       - name: Rename SBOM file with dotCMS version
         run: |
-          mkdir -p core-test-results/sbom
+          mkdir -p core/sbom
           mv core/sbom/cyclonedx.json core/sbom/dotcms-${{ env.DOTCMS_VERSION }}.json
 
       - name: Configure Git

From b3f246eaddcec883599fd5d84a511627ef9a8b1c Mon Sep 17 00:00:00 2001
From: Rashik Adhikari <128124382+rashik1144@users.noreply.github.com>
Date: Wed, 14 Aug 2024 10:56:13 +0545
Subject: [PATCH 03/15] Update legacy-release_sbom-generator.yaml

---
 .github/workflows/legacy-release_sbom-generator.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/legacy-release_sbom-generator.yaml b/.github/workflows/legacy-release_sbom-generator.yaml
index ca90e643d6e1..92f16a993540 100644
--- a/.github/workflows/legacy-release_sbom-generator.yaml
+++ b/.github/workflows/legacy-release_sbom-generator.yaml
@@ -49,13 +49,16 @@ jobs:
         run: |
           pip install pipx
 
+      - name: Create SBOM folder
+        run: |
+          mkdir -p core/sbom
+          
       - name: Scan Docker Image with Syft
         run: |
           pipx run anchore_syft dotcms/dotcms:${{ env.DOTCMS_VERSION }} -o cyclonedx-xml > core/sbom/cyclonedx.json
 
       - name: Rename SBOM file with dotCMS version
         run: |
-          mkdir -p core/sbom
           mv core/sbom/cyclonedx.json core/sbom/dotcms-${{ env.DOTCMS_VERSION }}.json
 
       - name: Configure Git

From 4cf9a2ca49851f5ac71d466be2e0e8e48e1fef62 Mon Sep 17 00:00:00 2001
From: Rashik Adhikari <128124382+rashik1144@users.noreply.github.com>
Date: Thu, 15 Aug 2024 09:14:02 +0545
Subject: [PATCH 04/15] Update legacy-release_sbom-generator.yaml

---
 .github/workflows/legacy-release_sbom-generator.yaml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/legacy-release_sbom-generator.yaml b/.github/workflows/legacy-release_sbom-generator.yaml
index 92f16a993540..59f95b5abfe3 100644
--- a/.github/workflows/legacy-release_sbom-generator.yaml
+++ b/.github/workflows/legacy-release_sbom-generator.yaml
@@ -1,4 +1,4 @@
-# Generate SBOM for latest version of dotCMS and put into core-test-repo
+# Generate SBOM for latest version of dotCMS and put into release-24.04.24_lts branch
 on:
   release:
     types: [published]
@@ -66,11 +66,16 @@ jobs:
           git config --global user.email "action@github.com"
           git config --global user.name "Github Actions"
 
-      - name: Commit and push results to core-test-results repository
+      - name: Check out the target branch
+        run: |
+          cd core
+          git checkout release-24.04.24_lts  # Check out the existing branch
+          
+      - name: Commit and push results to release-24.04.24_lts branch
         run: |
           cd core
           git add sbom/dotcms-${{ env.DOTCMS_VERSION }}.json
           git commit -m "Add SBOM for dotCMS version ${{ env.DOTCMS_VERSION }}" || echo "No changes to commit"
-          git push origin master
+          git push origin release-24.04.24_lts
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 

From 7be3dca7e377ff40b5df1e4070aa336ed89d9367 Mon Sep 17 00:00:00 2001
From: Rashik Adhikari <128124382+rashik1144@users.noreply.github.com>
Date: Thu, 15 Aug 2024 09:19:39 +0545
Subject: [PATCH 05/15] Update legacy-release_sbom-generator.yaml

---
 .github/workflows/legacy-release_sbom-generator.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/legacy-release_sbom-generator.yaml b/.github/workflows/legacy-release_sbom-generator.yaml
index 59f95b5abfe3..d3f488cbbe4b 100644
--- a/.github/workflows/legacy-release_sbom-generator.yaml
+++ b/.github/workflows/legacy-release_sbom-generator.yaml
@@ -69,7 +69,8 @@ jobs:
       - name: Check out the target branch
         run: |
           cd core
-          git checkout release-24.04.24_lts  # Check out the existing branch
+          git fetch origin release-24.04.24_lts
+          git checkout release-24.04.24_lts 
           
       - name: Commit and push results to release-24.04.24_lts branch
         run: |

From f16d56a65a06d637ce1748fbd9922a7a2b3e10e0 Mon Sep 17 00:00:00 2001
From: Rashik Adhikari <128124382+rashik1144@users.noreply.github.com>
Date: Thu, 15 Aug 2024 09:29:03 +0545
Subject: [PATCH 06/15] Update legacy-release_sbom-generator.yaml

---
 .github/workflows/legacy-release_sbom-generator.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/legacy-release_sbom-generator.yaml b/.github/workflows/legacy-release_sbom-generator.yaml
index d3f488cbbe4b..6e60660fe207 100644
--- a/.github/workflows/legacy-release_sbom-generator.yaml
+++ b/.github/workflows/legacy-release_sbom-generator.yaml
@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
     inputs:
       dotcms_version:
-        description: 'Enter the dotCMS version (vYY.MM.DD)'
+        description: 'Enter the dotCMS version (vYY.MM.DD_lts)'
         required: true
         default: ''
 
@@ -75,7 +75,7 @@ jobs:
       - name: Commit and push results to release-24.04.24_lts branch
         run: |
           cd core
-          git add sbom/dotcms-${{ env.DOTCMS_VERSION }}.json
+          git add dotcms-${{ env.DOTCMS_VERSION }}.json
           git commit -m "Add SBOM for dotCMS version ${{ env.DOTCMS_VERSION }}" || echo "No changes to commit"
           git push origin release-24.04.24_lts
         env:

From 8b12ef5a237ace6a50130792d2e32068dff75bef Mon Sep 17 00:00:00 2001
From: Rashik Adhikari <128124382+rashik1144@users.noreply.github.com>
Date: Thu, 15 Aug 2024 09:38:02 +0545
Subject: [PATCH 07/15] Update legacy-release_sbom-generator.yaml

---
 .../legacy-release_sbom-generator.yaml        | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/legacy-release_sbom-generator.yaml b/.github/workflows/legacy-release_sbom-generator.yaml
index 6e60660fe207..a594adef1be1 100644
--- a/.github/workflows/legacy-release_sbom-generator.yaml
+++ b/.github/workflows/legacy-release_sbom-generator.yaml
@@ -1,11 +1,11 @@
-# Generate SBOM for latest version of dotCMS and put into release-24.04.24_lts branch
+# Generate SBOM for latest version of dotCMS and put into respective branch
 on:
   release:
     types: [published]
   workflow_dispatch:
     inputs:
       dotcms_version:
-        description: 'Enter the dotCMS version (vYY.MM.DD_lts)'
+        description: 'Enter the dotCMS version (vYY.MM.DD)'
         required: true
         default: ''
 
@@ -37,8 +37,11 @@ jobs:
           # Format the tag name if necessary
           formatted_tag=$(echo "$latest_tag" | sed -e 's/^dotcms-cli-//' -e 's/^v//')
 
+          # Construct the branch name based on the version
+          branch_name="release-${formatted_tag}_lts"
+
           echo "Latest tag: $formatted_tag"
-          echo "DOTCMS_VERSION=$formatted_tag" >> $GITHUB_ENV
+          echo "BRANCH_NAME=$branch_name" >> $GITHUB_ENV
 
       - name: Pull and run dotCMS Docker image
         run: |
@@ -69,14 +72,14 @@ jobs:
       - name: Check out the target branch
         run: |
           cd core
-          git fetch origin release-24.04.24_lts
-          git checkout release-24.04.24_lts 
-          
-      - name: Commit and push results to release-24.04.24_lts branch
+          git fetch origin
+          git checkout ${{ env.BRANCH_NAME }}
+
+      - name: Commit and push results to target branch
         run: |
           cd core
-          git add dotcms-${{ env.DOTCMS_VERSION }}.json
+          git add sbom/dotcms-${{ env.DOTCMS_VERSION }}.json
           git commit -m "Add SBOM for dotCMS version ${{ env.DOTCMS_VERSION }}" || echo "No changes to commit"
-          git push origin release-24.04.24_lts
+          git push origin ${{ env.BRANCH_NAME }}
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From e27b3c78ea49c02438ef4eb4336f6b635f34f5b0 Mon Sep 17 00:00:00 2001
From: Rashik Adhikari <128124382+rashik1144@users.noreply.github.com>
Date: Thu, 15 Aug 2024 10:07:58 +0545
Subject: [PATCH 08/15] Update legacy-release_sbom-generator.yaml

---
 .../legacy-release_sbom-generator.yaml         | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/legacy-release_sbom-generator.yaml b/.github/workflows/legacy-release_sbom-generator.yaml
index a594adef1be1..d84e4d4e2a34 100644
--- a/.github/workflows/legacy-release_sbom-generator.yaml
+++ b/.github/workflows/legacy-release_sbom-generator.yaml
@@ -1,4 +1,4 @@
-# Generate SBOM for latest version of dotCMS and put into respective branch
+# Generate SBOM for latest version of dotCMS and put into core-test-repo
 on:
   release:
     types: [published]
@@ -38,13 +38,22 @@ jobs:
           formatted_tag=$(echo "$latest_tag" | sed -e 's/^dotcms-cli-//' -e 's/^v//')
 
           # Construct the branch name based on the version
-          branch_name="release-${formatted_tag}_lts"
+          branch_name="release-v${formatted_tag}_lts"
 
-          echo "Latest tag: $formatted_tag"
-          echo "BRANCH_NAME=$branch_name" >> $GITHUB_ENV
+          echo "DOTCMS_VERSION=${latest_tag}" >> $GITHUB_ENV
+          echo "BRANCH_NAME=${branch_name}" >> $GITHUB_ENV
+
+      - name: Print environment variables
+        run: |
+          echo "DOTCMS_VERSION=${{ env.DOTCMS_VERSION }}"
+          echo "BRANCH_NAME=${{ env.BRANCH_NAME }}"
 
       - name: Pull and run dotCMS Docker image
         run: |
+          if [ -z "${{ env.DOTCMS_VERSION }}" ]; then
+            echo "Error: DOTCMS_VERSION is not set"
+            exit 1
+          fi
           docker pull dotcms/dotcms:${{ env.DOTCMS_VERSION }}
           docker run -d -p 8082:8082 dotcms/dotcms:${{ env.DOTCMS_VERSION }}
 
@@ -72,6 +81,7 @@ jobs:
       - name: Check out the target branch
         run: |
           cd core
+          # Fetch and check out the branch
           git fetch origin
           git checkout ${{ env.BRANCH_NAME }}
 

From d5e81fc213cd2a19e30b441bcfdcfc0885473e53 Mon Sep 17 00:00:00 2001
From: Rashik Adhikari <128124382+rashik1144@users.noreply.github.com>
Date: Thu, 15 Aug 2024 10:11:24 +0545
Subject: [PATCH 09/15] Update legacy-release_sbom-generator.yaml

---
 .github/workflows/legacy-release_sbom-generator.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/legacy-release_sbom-generator.yaml b/.github/workflows/legacy-release_sbom-generator.yaml
index d84e4d4e2a34..93a1ad49cf10 100644
--- a/.github/workflows/legacy-release_sbom-generator.yaml
+++ b/.github/workflows/legacy-release_sbom-generator.yaml
@@ -1,4 +1,4 @@
-# Generate SBOM for latest version of dotCMS and put into core-test-repo
+# Generate SBOM for latest version of dotCMS
 on:
   release:
     types: [published]
@@ -34,13 +34,13 @@ jobs:
             latest_tag=${{ github.event.inputs.dotcms_version }}
           fi
 
-          # Format the tag name if necessary
-          formatted_tag=$(echo "$latest_tag" | sed -e 's/^dotcms-cli-//' -e 's/^v//')
+          # Format the tag name: remove 'v' prefix
+          formatted_tag=$(echo "$latest_tag" | sed -e 's/^v//' -e 's/^dotcms-cli-//')
 
-          # Construct the branch name based on the version
+          # Construct the branch name based on the formatted version
           branch_name="release-v${formatted_tag}_lts"
 
-          echo "DOTCMS_VERSION=${latest_tag}" >> $GITHUB_ENV
+          echo "DOTCMS_VERSION=${formatted_tag}" >> $GITHUB_ENV
           echo "BRANCH_NAME=${branch_name}" >> $GITHUB_ENV
 
       - name: Print environment variables

From 24d859e3178f1a4b0e47d022aa61913266344cb1 Mon Sep 17 00:00:00 2001
From: Rashik Adhikari <128124382+rashik1144@users.noreply.github.com>
Date: Thu, 15 Aug 2024 10:16:15 +0545
Subject: [PATCH 10/15] Update legacy-release_sbom-generator.yaml

---
 .github/workflows/legacy-release_sbom-generator.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/legacy-release_sbom-generator.yaml b/.github/workflows/legacy-release_sbom-generator.yaml
index 93a1ad49cf10..cf16683158a5 100644
--- a/.github/workflows/legacy-release_sbom-generator.yaml
+++ b/.github/workflows/legacy-release_sbom-generator.yaml
@@ -38,7 +38,7 @@ jobs:
           formatted_tag=$(echo "$latest_tag" | sed -e 's/^v//' -e 's/^dotcms-cli-//')
 
           # Construct the branch name based on the formatted version
-          branch_name="release-v${formatted_tag}_lts"
+          branch_name="v${formatted_tag}"
 
           echo "DOTCMS_VERSION=${formatted_tag}" >> $GITHUB_ENV
           echo "BRANCH_NAME=${branch_name}" >> $GITHUB_ENV

From 1679c6156f4eb535c3959039959514c2a5c5ae7c Mon Sep 17 00:00:00 2001
From: Rashik Adhikari <128124382+rashik1144@users.noreply.github.com>
Date: Thu, 15 Aug 2024 10:30:33 +0545
Subject: [PATCH 11/15] Update legacy-release_sbom-generator.yaml

---
 .../legacy-release_sbom-generator.yaml        | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/legacy-release_sbom-generator.yaml b/.github/workflows/legacy-release_sbom-generator.yaml
index cf16683158a5..4f55e4196442 100644
--- a/.github/workflows/legacy-release_sbom-generator.yaml
+++ b/.github/workflows/legacy-release_sbom-generator.yaml
@@ -1,4 +1,6 @@
-# Generate SBOM for latest version of dotCMS
+#Generate SBOM for the latest dotCMS version
+name: Generate and Commit SBOM
+
 on:
   release:
     types: [published]
@@ -33,13 +35,10 @@ jobs:
             # Use the input provided in manual run
             latest_tag=${{ github.event.inputs.dotcms_version }}
           fi
-
           # Format the tag name: remove 'v' prefix
           formatted_tag=$(echo "$latest_tag" | sed -e 's/^v//' -e 's/^dotcms-cli-//')
-
           # Construct the branch name based on the formatted version
-          branch_name="v${formatted_tag}"
-
+          branch_name="release-${formatted_tag}"
           echo "DOTCMS_VERSION=${formatted_tag}" >> $GITHUB_ENV
           echo "BRANCH_NAME=${branch_name}" >> $GITHUB_ENV
 
@@ -64,7 +63,7 @@ jobs:
       - name: Create SBOM folder
         run: |
           mkdir -p core/sbom
-          
+
       - name: Scan Docker Image with Syft
         run: |
           pipx run anchore_syft dotcms/dotcms:${{ env.DOTCMS_VERSION }} -o cyclonedx-xml > core/sbom/cyclonedx.json
@@ -73,17 +72,27 @@ jobs:
         run: |
           mv core/sbom/cyclonedx.json core/sbom/dotcms-${{ env.DOTCMS_VERSION }}.json
 
-      - name: Configure Git
+      - name: Fetch all branches and list them
         run: |
-          git config --global user.email "action@github.com"
-          git config --global user.name "Github Actions"
+          cd core
+          git fetch --all
+          git branch -a
 
       - name: Check out the target branch
         run: |
           cd core
-          # Fetch and check out the branch
-          git fetch origin
-          git checkout ${{ env.BRANCH_NAME }}
+          git fetch origin ${{ env.BRANCH_NAME }}
+          git checkout -b ${{ env.BRANCH_NAME }} origin/${{ env.BRANCH_NAME }} || { echo "Failed to checkout branch ${{ env.BRANCH_NAME }}"; exit 1; }
+
+      - name: Confirm branch checkout
+        run: |
+          cd core
+          git status
+
+      - name: Configure Git
+        run: |
+          git config --global user.email "action@github.com"
+          git config --global user.name "Github Actions"
 
       - name: Commit and push results to target branch
         run: |

From 10b3d7a46737a8998d4294377806cce2be25126b Mon Sep 17 00:00:00 2001
From: Rashik Adhikari <128124382+rashik1144@users.noreply.github.com>
Date: Thu, 15 Aug 2024 10:35:01 +0545
Subject: [PATCH 12/15] Update legacy-release_sbom-generator.yaml

---
 .github/workflows/legacy-release_sbom-generator.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/legacy-release_sbom-generator.yaml b/.github/workflows/legacy-release_sbom-generator.yaml
index 4f55e4196442..743c89dcfbdd 100644
--- a/.github/workflows/legacy-release_sbom-generator.yaml
+++ b/.github/workflows/legacy-release_sbom-generator.yaml
@@ -97,7 +97,7 @@ jobs:
       - name: Commit and push results to target branch
         run: |
           cd core
-          git add sbom/dotcms-${{ env.DOTCMS_VERSION }}.json
+          git add dotcms-${{ env.DOTCMS_VERSION }}.json
           git commit -m "Add SBOM for dotCMS version ${{ env.DOTCMS_VERSION }}" || echo "No changes to commit"
           git push origin ${{ env.BRANCH_NAME }}
         env:

From 4a9cde80d70ad1bb52da53c6161cfcc3d101f507 Mon Sep 17 00:00:00 2001
From: Rashik Adhikari <128124382+rashik1144@users.noreply.github.com>
Date: Thu, 15 Aug 2024 10:40:33 +0545
Subject: [PATCH 13/15] Update legacy-release_sbom-generator.yaml

---
 .github/workflows/legacy-release_sbom-generator.yaml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/legacy-release_sbom-generator.yaml b/.github/workflows/legacy-release_sbom-generator.yaml
index 743c89dcfbdd..1b054ce5ab83 100644
--- a/.github/workflows/legacy-release_sbom-generator.yaml
+++ b/.github/workflows/legacy-release_sbom-generator.yaml
@@ -60,17 +60,14 @@ jobs:
         run: |
           pip install pipx
 
-      - name: Create SBOM folder
-        run: |
-          mkdir -p core/sbom
 
       - name: Scan Docker Image with Syft
         run: |
-          pipx run anchore_syft dotcms/dotcms:${{ env.DOTCMS_VERSION }} -o cyclonedx-xml > core/sbom/cyclonedx.json
+          pipx run anchore_syft dotcms/dotcms:${{ env.DOTCMS_VERSION }} -o cyclonedx-xml > core/cyclonedx.json
 
       - name: Rename SBOM file with dotCMS version
         run: |
-          mv core/sbom/cyclonedx.json core/sbom/dotcms-${{ env.DOTCMS_VERSION }}.json
+          mv core/cyclonedx.json core/dotcms-${{ env.DOTCMS_VERSION }}.json
 
       - name: Fetch all branches and list them
         run: |

From 9866621dc6739d8478de56a062fdedaced6a8e1f Mon Sep 17 00:00:00 2001
From: Rashik Adhikari <128124382+rashik1144@users.noreply.github.com>
Date: Thu, 15 Aug 2024 11:35:38 +0545
Subject: [PATCH 14/15] Update legacy-release_sbom-generator.yaml

---
 .github/workflows/legacy-release_sbom-generator.yaml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/legacy-release_sbom-generator.yaml b/.github/workflows/legacy-release_sbom-generator.yaml
index 1b054ce5ab83..3fc86fc9943a 100644
--- a/.github/workflows/legacy-release_sbom-generator.yaml
+++ b/.github/workflows/legacy-release_sbom-generator.yaml
@@ -63,11 +63,8 @@ jobs:
 
       - name: Scan Docker Image with Syft
         run: |
-          pipx run anchore_syft dotcms/dotcms:${{ env.DOTCMS_VERSION }} -o cyclonedx-xml > core/cyclonedx.json
+          pipx run anchore_syft dotcms/dotcms:${{ env.DOTCMS_VERSION }} -o cyclonedx-xml > core/sbom-cyclonedx.json
 
-      - name: Rename SBOM file with dotCMS version
-        run: |
-          mv core/cyclonedx.json core/dotcms-${{ env.DOTCMS_VERSION }}.json
 
       - name: Fetch all branches and list them
         run: |
@@ -94,7 +91,7 @@ jobs:
       - name: Commit and push results to target branch
         run: |
           cd core
-          git add dotcms-${{ env.DOTCMS_VERSION }}.json
+          git add sbom-cyclonedx.json
           git commit -m "Add SBOM for dotCMS version ${{ env.DOTCMS_VERSION }}" || echo "No changes to commit"
           git push origin ${{ env.BRANCH_NAME }}
         env:

From 4769cd26414fb4c7f1c4f8e6bb36c6dcca88f7bd Mon Sep 17 00:00:00 2001
From: Rashik Adhikari <128124382+rashik1144@users.noreply.github.com>
Date: Mon, 19 Aug 2024 23:13:27 +0545
Subject: [PATCH 15/15] Update legacy-release_sbom-generator.yaml

---
 .github/workflows/legacy-release_sbom-generator.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/legacy-release_sbom-generator.yaml b/.github/workflows/legacy-release_sbom-generator.yaml
index 3fc86fc9943a..bcf1c121c467 100644
--- a/.github/workflows/legacy-release_sbom-generator.yaml
+++ b/.github/workflows/legacy-release_sbom-generator.yaml
@@ -25,7 +25,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           path: core
 
-      - name: Get dotCMS release version
+      - name: Get dotCMS release version and set the branch name based on formatted version
         id: get_version
         run: |
           if [ "${{ github.event_name }}" == "release" ]; then