diff --git a/.github/actions/create-github-release/action.yml b/.github/actions/create-github-release/action.yml
index a33b0b9b43da..8137274282fc 100644
--- a/.github/actions/create-github-release/action.yml
+++ b/.github/actions/create-github-release/action.yml
@@ -7,13 +7,16 @@ inputs:
   token:
     description: 'Token to use for authentication with GitHub'
     required: true
+  commercial:
+    description: 'Whether to generate the changelog for the commercial release'
+    required: true
 runs:
   using: composite
   steps:
     - name: Generate Changelog
       uses: spring-io/github-changelog-generator@185319ad7eaa75b0e8e72e4b6db19c8b2cb8c4c1 #v0.0.11
       with:
-        config-file: .github/actions/create-github-release/changelog-generator.yml
+        config-file: ${{ inputs.commercial && '.github/actions/create-github-release/changelog-generator-commercial.yml' || '.github/actions/create-github-release/changelog-generator-oss.yml' }}
         milestone: ${{ inputs.milestone }}
         token: ${{ inputs.token }}
     - name: Create GitHub Release
diff --git a/.github/actions/create-github-release/changelog-generator.yml b/.github/actions/create-github-release/changelog-generator-commercial.yml
similarity index 93%
rename from .github/actions/create-github-release/changelog-generator.yml
rename to .github/actions/create-github-release/changelog-generator-commercial.yml
index 146945b14941..2bc74db2a75a 100644
--- a/.github/actions/create-github-release/changelog-generator.yml
+++ b/.github/actions/create-github-release/changelog-generator-commercial.yml
@@ -15,7 +15,7 @@ changelog:
       labels:
         - "type: dependency-upgrade"
   issues:
-    generate_links: ${{ !vars.COMMERCIAL }}
+    generate_links: false
     ports:
       - label: "status: forward-port"
         bodyExpression: 'Forward port of issue #(\d+).*'
diff --git a/.github/actions/create-github-release/changelog-generator-oss.yml b/.github/actions/create-github-release/changelog-generator-oss.yml
new file mode 100644
index 000000000000..dea85e8267a2
--- /dev/null
+++ b/.github/actions/create-github-release/changelog-generator-oss.yml
@@ -0,0 +1,23 @@
+changelog:
+  sections:
+    - title: ":star: New Features"
+      labels:
+        - "type: enhancement"
+    - title: ":lady_beetle: Bug Fixes"
+      labels:
+        - "type: bug"
+        - "type: regression"
+    - title: ":notebook_with_decorative_cover: Documentation"
+      labels:
+        - "type: documentation"
+    - title: ":hammer: Dependency Upgrades"
+      sort: "title"
+      labels:
+        - "type: dependency-upgrade"
+  issues:
+    generate_links: true
+    ports:
+      - label: "status: forward-port"
+        bodyExpression: 'Forward port of issue #(\d+).*'
+      - label: "status: back-port"
+        bodyExpression: 'Back port of issue #(\d+).*'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cb7ef8edfd61..fe898921cdf9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -54,7 +54,7 @@ jobs:
       version: ${{ needs.build-and-stage-release.outputs.version }}
   sync-to-maven-central:
     name: Sync to Maven Central
-    if: ${{ !COMMERCIAL }}
+    if: ${{ !vars.COMMERCIAL }}
     needs:
       - build-and-stage-release
       - verify
@@ -89,7 +89,7 @@ jobs:
         run: jfrog rt build-promote ${{ format('spring-boot-commercial-{0}', needs.build-and-stage-release.outputs.version)}} ${{ github.run_number }} spring-enterprise-maven-prod-local --project spring
   publish-gradle-plugin:
     name: Publish Gradle Plugin
-    if: ${{ !COMMERCIAL }}
+    if: ${{ !vars.COMMERCIAL }}
     needs:
       - build-and-stage-release
       - sync-to-maven-central
@@ -106,7 +106,7 @@ jobs:
           plugin-version: ${{ needs.build-and-stage-release.outputs.version }}
   publish-to-sdkman:
     name: Publish to SDKMAN!
-    if: ${{ !COMMERCIAL }}
+    if: ${{ !vars.COMMERCIAL }}
     needs:
       - build-and-stage-release
       - sync-to-maven-central
@@ -166,3 +166,4 @@ jobs:
         with:
           milestone: ${{ needs.build-and-stage-release.outputs.version }}
           token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
+          commercial: ${{ vars.COMMERCIAL }}