diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fd110d72d21..d4afb4f49df 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -320,7 +320,7 @@ jobs:
         shell: bash
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
         run: |
-          if [ "${{ contains(fromJSON('["master"]'), github.ref_name) }}" == "true" ]; then
+          if [ "${{ github.base_ref || github.ref_name }}" == "master" ]; then
             tools changelog update-release-notes --next-release --template-only
           else
             tools changelog update-release-notes --template-only
@@ -330,7 +330,7 @@ jobs:
         shell: bash
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
         run: |
-          if [ "${{ contains(fromJSON('["master"]'), github.ref_name) }}" == "true" ]; then
+          if [ "${{ github.base_ref || github.ref_name }}" == "master" ]; then
               tools changelog update-release-notes --draft --next-release
               tools changelog update-release-notes --next-release
           else
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 20986f42426..69edd3bc2ae 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -373,7 +373,7 @@ jobs:
         shell: bash
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
         run: |
-          if [ "${{ contains(fromJSON('["master"]'), github.ref_name) }}" == "true" ]; then
+          if [ "${{ github.base_ref || github.ref_name }}" == "master" ]; then
             tools changelog update-release-notes --next-release --template-only
           else
             tools changelog update-release-notes --template-only
@@ -383,7 +383,7 @@ jobs:
         shell: bash
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
         run: |
-          if [ "${{ contains(fromJSON('["master"]'), github.ref_name) }}" == "true" ]; then
+          if [ "${{ github.base_ref || github.ref_name }}" == "master" ]; then
               tools changelog update-release-notes --draft --next-release
               tools changelog update-release-notes --next-release
           else
diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
index e4a704f0ccb..7e45d9a095b 100644
--- a/.github/workflows/scheduled.yml
+++ b/.github/workflows/scheduled.yml
@@ -363,7 +363,7 @@ jobs:
         shell: bash
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
         run: |
-          if [ "${{ contains(fromJSON('["master"]'), github.ref_name) }}" == "true" ]; then
+          if [ "${{ github.base_ref || github.ref_name }}" == "master" ]; then
             tools changelog update-release-notes --next-release --template-only
           else
             tools changelog update-release-notes --template-only
@@ -373,7 +373,7 @@ jobs:
         shell: bash
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
         run: |
-          if [ "${{ contains(fromJSON('["master"]'), github.ref_name) }}" == "true" ]; then
+          if [ "${{ github.base_ref || github.ref_name }}" == "master" ]; then
               tools changelog update-release-notes --draft --next-release
               tools changelog update-release-notes --next-release
           else
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index 380c1e1fa0b..dba7145bc1e 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -363,7 +363,7 @@ jobs:
         shell: bash
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
         run: |
-          if [ "${{ contains(fromJSON('["master"]'), github.ref_name) }}" == "true" ]; then
+          if [ "${{ github.base_ref || github.ref_name }}" == "master" ]; then
             tools changelog update-release-notes --next-release --template-only
           else
             tools changelog update-release-notes --template-only
@@ -373,7 +373,7 @@ jobs:
         shell: bash
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
         run: |
-          if [ "${{ contains(fromJSON('["master"]'), github.ref_name) }}" == "true" ]; then
+          if [ "${{ github.base_ref || github.ref_name }}" == "master" ]; then
               tools changelog update-release-notes --draft --release --next-release
               tools changelog update-release-notes --release --next-release
           else
diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja
index a7d365df97a..080967fa583 100644
--- a/.github/workflows/templates/ci.yml.jinja
+++ b/.github/workflows/templates/ci.yml.jinja
@@ -116,7 +116,7 @@ on:
         shell: bash
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
         run: |
-          if [ "${{ contains(fromJSON('["master"]'), github.ref_name) }}" == "true" ]; then
+          if [ "${{ github.base_ref || github.ref_name }}" == "master" ]; then
             tools changelog update-release-notes --next-release --template-only
           else
             tools changelog update-release-notes --template-only
@@ -126,7 +126,7 @@ on:
         shell: bash
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
         run: |
-          if [ "${{ contains(fromJSON('["master"]'), github.ref_name) }}" == "true" ]; then
+          if [ "${{ github.base_ref || github.ref_name }}" == "master" ]; then
               tools changelog update-release-notes --draft <%- if prepare_actual_release %> --release <%- endif %> --next-release
               tools changelog update-release-notes <%- if prepare_actual_release %> --release <%- endif %> --next-release
           else