From bb34b77f43fcded6010df766b26a7a965ba9ea58 Mon Sep 17 00:00:00 2001
From: Wilfried Kopp <wilfried@parity.io>
Date: Thu, 14 Sep 2023 15:02:40 +0200
Subject: [PATCH 01/10] Fix Burnin notifications

---
 .../workflows/notif-burnin-label.yml          |  8 +++----
 .../workflows/burnin-label-notification.yml   | 24 -------------------
 2 files changed, 4 insertions(+), 28 deletions(-)
 rename substrate/.github/workflows/burnin-label-notification.yml => .github/workflows/notif-burnin-label.yml (75%)
 delete mode 100644 polkadot/.github/workflows/burnin-label-notification.yml

diff --git a/substrate/.github/workflows/burnin-label-notification.yml b/.github/workflows/notif-burnin-label.yml
similarity index 75%
rename from substrate/.github/workflows/burnin-label-notification.yml
rename to .github/workflows/notif-burnin-label.yml
index f45455d31db1..b630cd07440f 100644
--- a/substrate/.github/workflows/burnin-label-notification.yml
+++ b/.github/workflows/notif-burnin-label.yml
@@ -1,4 +1,4 @@
-name: Notify devops when burn-in label applied
+name: Notify DevOps when burn-in label applied
 on:
   pull_request:
     types: [labeled]
@@ -13,12 +13,12 @@ jobs:
             room: '!lUslSijLMgNcEKcAiE:parity.io'
 
     steps:
-      - name: Notify devops
-        if: startsWith(github.event.label.name, 'A1-')
+      - name: Send Matrix message to ${{ matrix.channel.name }}
+        if: startsWith(github.event.label.name, 'A0-')
         uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
         with:
           room_id: ${{ matrix.channel.room }}
           access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
-          server: "m.parity.io"
+          server: m.parity.io
           message: |
             @room Burn-in request received for [${{ github.event.pull_request.title }}](${{ github.event.pull_request.html_url }})
diff --git a/polkadot/.github/workflows/burnin-label-notification.yml b/polkadot/.github/workflows/burnin-label-notification.yml
deleted file mode 100644
index 536f8fa2a3f6..000000000000
--- a/polkadot/.github/workflows/burnin-label-notification.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Notify devops when burn-in label applied
-on:
-  pull_request:
-    types: [labeled]
-
-jobs:
-  notify-devops:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        channel:
-          - name: 'Team: DevOps'
-            room: '!lUslSijLMgNcEKcAiE:parity.io'
-
-    steps:
-      - name: Send Matrix message to ${{ matrix.channel.name }}
-        if: startsWith(github.event.label.name, 'A1-')
-        uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
-        with:
-          room_id: ${{ matrix.channel.room }}
-          access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
-          server: m.parity.io
-          message: |
-            @room Burn-in request received for the following PR: ${{ github.event.pull_request.html_url }}

From 5506776bacf696b5b93e4602df3d204ffde433a7 Mon Sep 17 00:00:00 2001
From: Wilfried Kopp <wilfried@parity.io>
Date: Thu, 14 Sep 2023 15:08:54 +0200
Subject: [PATCH 02/10] Remove old license check

---
 .github/workflows/check-licenses.yml          |  5 ++--
 polkadot/.github/workflows/check-licenses.yml | 26 -------------------
 2 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 polkadot/.github/workflows/check-licenses.yml

diff --git a/.github/workflows/check-licenses.yml b/.github/workflows/check-licenses.yml
index 4d0afefc47aa..cb6b4bdd4e58 100644
--- a/.github/workflows/check-licenses.yml
+++ b/.github/workflows/check-licenses.yml
@@ -8,19 +8,20 @@ permissions:
 
 jobs:
   check-licenses:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     env:
       LICENSES: "'Apache-2.0' 'GPL-3.0-only' 'GPL-3.0-or-later WITH Classpath-exception-2.0'"
       NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Checkout sources
         uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+
       - uses: actions/setup-node@v3.8.1
         with:
           node-version: "18.x"
           registry-url: "https://npm.pkg.github.com"
           scope: "@paritytech"
-        
+
       - name: Check the licenses in Polkadot
         run: |
           shopt -s globstar
diff --git a/polkadot/.github/workflows/check-licenses.yml b/polkadot/.github/workflows/check-licenses.yml
deleted file mode 100644
index 1e654f7b3070..000000000000
--- a/polkadot/.github/workflows/check-licenses.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Check licenses
-
-on:
-  pull_request:
-
-jobs:
-  check-licenses:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-      - uses: actions/setup-node@v3.8.1
-        with:
-          node-version: '18.x'
-          registry-url: 'https://npm.pkg.github.com'
-          scope: '@paritytech'
-      - name: Check the licenses
-        run: |
-          shopt -s globstar
-
-          npx @paritytech/license-scanner@0.0.5 scan \
-            --ensure-licenses=Apache-2.0 \
-            --ensure-licenses=GPL-3.0-only \
-            ./**/*.rs
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From b3631b733ae2a06afdfc9bbc594e1b974f567405 Mon Sep 17 00:00:00 2001
From: Wilfried Kopp <wilfried@parity.io>
Date: Thu, 14 Sep 2023 15:16:05 +0200
Subject: [PATCH 03/10] Remove old check D labels workflows

---
 cumulus/.github/workflows/check-D-labels.yml  | 47 -----------------
 polkadot/.github/workflows/check-D-labels.yml | 50 -------------------
 polkadot/.github/workflows/check-labels.yml   | 45 -----------------
 3 files changed, 142 deletions(-)
 delete mode 100644 cumulus/.github/workflows/check-D-labels.yml
 delete mode 100644 polkadot/.github/workflows/check-D-labels.yml
 delete mode 100644 polkadot/.github/workflows/check-labels.yml

diff --git a/cumulus/.github/workflows/check-D-labels.yml b/cumulus/.github/workflows/check-D-labels.yml
deleted file mode 100644
index 910627209310..000000000000
--- a/cumulus/.github/workflows/check-D-labels.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-name: Check D labels
-
-on:
-  pull_request:
-    types: [labeled, opened, synchronize, unlabeled]
-    paths:
-      - primitives/**
-
-jobs:
-  check-labels:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Pull image
-        env:
-          IMAGE: paritytech/ruled_labels:0.4.0
-        run: docker pull $IMAGE
-
-      - name: Check labels
-        env:
-          IMAGE: paritytech/ruled_labels:0.4.0
-          MOUNT: /work
-          GITHUB_PR: ${{ github.event.pull_request.number }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          API_BASE: https://api.github.com/repos
-          REPO: ${{ github.repository }}
-          RULES_PATH: labels/ruled_labels
-          CHECK_SPECS: specs_cumulus.yaml
-        run: |
-          echo "REPO: ${REPO}"
-          echo "GITHUB_PR: ${GITHUB_PR}"
-          # Clone repo with labels specs
-          git clone https://github.com/paritytech/labels
-          # Fetch the labels for the PR under test
-          labels=$( curl -H "Authorization: token ${GITHUB_TOKEN}" -s "$API_BASE/${REPO}/pulls/${GITHUB_PR}" | jq '.labels | .[] | .name' | tr "\n" ",")
-
-          if [ -z "${labels}" ]; then
-            docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --tags audit --no-label
-          fi
-
-          labels_args=${labels: :-1}
-          printf "Checking labels: %s\n" "${labels_args}"
-
-          # Prevent the shell from splitting labels with spaces
-          IFS=","
-
-          # --dev is more useful to debug mode to debug
-          docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --labels ${labels_args} --dev --tags audit
diff --git a/polkadot/.github/workflows/check-D-labels.yml b/polkadot/.github/workflows/check-D-labels.yml
deleted file mode 100644
index 9abefaa6fa10..000000000000
--- a/polkadot/.github/workflows/check-D-labels.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: Check D labels
-
-on:
-  pull_request:
-    types: [labeled, opened, synchronize, unlabeled]
-    paths:
-      - runtime/polkadot/**
-      - runtime/kusama/**
-      - runtime/common/**
-      - primitives/src/**
-
-jobs:
-  check-labels:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Pull image
-        env:
-          IMAGE: paritytech/ruled_labels:0.4.0
-        run: docker pull $IMAGE
-
-      - name: Check labels
-        env:
-          IMAGE: paritytech/ruled_labels:0.4.0
-          MOUNT: /work
-          GITHUB_PR: ${{ github.event.pull_request.number }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          API_BASE: https://api.github.com/repos
-          REPO: ${{ github.repository }}
-          RULES_PATH: labels/ruled_labels
-          CHECK_SPECS: specs_polkadot.yaml
-        run: |
-          echo "REPO: ${REPO}"
-          echo "GITHUB_PR: ${GITHUB_PR}"
-          # Clone repo with labels specs
-          git clone https://github.com/paritytech/labels
-          # Fetch the labels for the PR under test
-          labels=$( curl -H "Authorization: token ${GITHUB_TOKEN}" -s "$API_BASE/${REPO}/pulls/${GITHUB_PR}" | jq '.labels | .[] | .name' | tr "\n" ",")
-
-          if [ -z "${labels}" ]; then
-            docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --tags audit --no-label
-          fi
-
-          labels_args=${labels: :-1}
-          printf "Checking labels: %s\n" "${labels_args}"
-
-          # Prevent the shell from splitting labels with spaces
-          IFS=","
-
-          # --dev is more useful to debug mode to debug
-          docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --labels ${labels_args} --dev --tags audit
diff --git a/polkadot/.github/workflows/check-labels.yml b/polkadot/.github/workflows/check-labels.yml
deleted file mode 100644
index df0a0e9cf02d..000000000000
--- a/polkadot/.github/workflows/check-labels.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: Check labels
-
-on:
-  pull_request:
-    types: [labeled, opened, synchronize, unlabeled]
-
-jobs:
-  check-labels:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Pull image
-        env:
-          IMAGE: paritytech/ruled_labels:0.4.0
-        run: docker pull $IMAGE
-
-      - name: Check labels
-        env:
-          IMAGE: paritytech/ruled_labels:0.4.0
-          MOUNT: /work
-          GITHUB_PR: ${{ github.event.pull_request.number }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          API_BASE: https://api.github.com/repos
-          REPO: ${{ github.repository }}
-          RULES_PATH: labels/ruled_labels
-          CHECK_SPECS: specs_polkadot.yaml
-        run: |
-          echo "REPO: ${REPO}"
-          echo "GITHUB_PR: ${GITHUB_PR}"
-          # Clone repo with labels specs
-          git clone https://github.com/paritytech/labels
-          # Fetch the labels for the PR under test
-          labels=$( curl -H "Authorization: token ${GITHUB_TOKEN}" -s "$API_BASE/${REPO}/pulls/${GITHUB_PR}" | jq '.labels | .[] | .name' | tr "\n" ",")
-
-          if [ -z "${labels}" ]; then
-            docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --tags PR --no-label
-          fi
-
-          labels_args=${labels: :-1}
-          printf "Checking labels: %s\n" "${labels_args}"
-
-          # Prevent the shell from splitting labels with spaces
-          IFS=","
-
-          # --dev is more useful to debug mode to debug
-          docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --labels ${labels_args} --dev --tags PR

From 7984e5b836a5931fc909ff15bc61bd632162d504 Mon Sep 17 00:00:00 2001
From: Wilfried Kopp <wilfried@parity.io>
Date: Thu, 14 Sep 2023 15:33:51 +0200
Subject: [PATCH 04/10] Remove old check labels workflows

---
 cumulus/.github/workflows/check-labels.yml    | 45 -----------------
 .../.github/workflows/check-D-labels.yml      | 48 -------------------
 substrate/.github/workflows/check-labels.yml  | 45 -----------------
 3 files changed, 138 deletions(-)
 delete mode 100644 cumulus/.github/workflows/check-labels.yml
 delete mode 100644 substrate/.github/workflows/check-D-labels.yml
 delete mode 100644 substrate/.github/workflows/check-labels.yml

diff --git a/cumulus/.github/workflows/check-labels.yml b/cumulus/.github/workflows/check-labels.yml
deleted file mode 100644
index 004271d7788a..000000000000
--- a/cumulus/.github/workflows/check-labels.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: Check labels
-
-on:
-  pull_request:
-    types: [labeled, opened, synchronize, unlabeled]
-
-jobs:
-  check-labels:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Pull image
-        env:
-          IMAGE: paritytech/ruled_labels:0.4.0
-        run: docker pull $IMAGE
-
-      - name: Check labels
-        env:
-          IMAGE: paritytech/ruled_labels:0.4.0
-          MOUNT: /work
-          GITHUB_PR: ${{ github.event.pull_request.number }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          API_BASE: https://api.github.com/repos
-          REPO: ${{ github.repository }}
-          RULES_PATH: labels/ruled_labels
-          CHECK_SPECS: specs_cumulus.yaml
-        run: |
-          echo "REPO: ${REPO}"
-          echo "GITHUB_PR: ${GITHUB_PR}"
-          # Clone repo with labels specs
-          git clone https://github.com/paritytech/labels
-          # Fetch the labels for the PR under test
-          labels=$( curl -H "Authorization: token ${GITHUB_TOKEN}" -s "$API_BASE/${REPO}/pulls/${GITHUB_PR}" | jq '.labels | .[] | .name' | tr "\n" ",")
-
-          if [ -z "${labels}" ]; then
-            docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --tags audit --no-label
-          fi
-
-          labels_args=${labels: :-1}
-          printf "Checking labels: %s\n" "${labels_args}"
-
-          # Prevent the shell from splitting labels with spaces
-          IFS=","
-
-          # --dev is more useful to debug mode to debug
-          docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --labels ${labels_args} --dev --tags PR
diff --git a/substrate/.github/workflows/check-D-labels.yml b/substrate/.github/workflows/check-D-labels.yml
deleted file mode 100644
index 7bb358ce1182..000000000000
--- a/substrate/.github/workflows/check-D-labels.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-name: Check D labels
-
-on:
-  pull_request:
-    types: [labeled, opened, synchronize, unlabeled]
-    paths:
-      - frame/**
-      - primitives/**
-
-env:
-  IMAGE: paritytech/ruled_labels:0.4.0
-
-jobs:
-  check-labels:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Pull image
-        run: docker pull $IMAGE
-
-      - name: Check labels
-        env:
-          MOUNT: /work
-          GITHUB_PR: ${{ github.event.pull_request.number }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          API_BASE: https://api.github.com/repos
-          REPO: ${{ github.repository }}
-          RULES_PATH: labels/ruled_labels
-          CHECK_SPECS: specs_substrate.yaml
-        run: |
-          echo "REPO: ${REPO}"
-          echo "GITHUB_PR: ${GITHUB_PR}"
-          # Clone repo with labels specs
-          git clone https://github.com/paritytech/labels
-          # Fetch the labels for the PR under test
-          labels=$( curl -H "Authorization: token ${GITHUB_TOKEN}" -s "$API_BASE/${REPO}/pulls/${GITHUB_PR}" | jq '.labels | .[] | .name' | tr "\n" ",")
-
-          if [ -z "${labels}" ]; then
-            docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --tags audit --no-label
-          fi
-
-          labels_args=${labels: :-1}
-          printf "Checking labels: %s\n" "${labels_args}"
-
-          # Prevent the shell from splitting labels with spaces
-          IFS=","
-
-          # --dev is more useful to debug mode to debug
-          docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --labels ${labels_args} --dev --tags audit
diff --git a/substrate/.github/workflows/check-labels.yml b/substrate/.github/workflows/check-labels.yml
deleted file mode 100644
index 55b8f7389fa7..000000000000
--- a/substrate/.github/workflows/check-labels.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: Check labels
-
-on:
-  pull_request:
-    types: [labeled, opened, synchronize, unlabeled]
-
-env:
-  IMAGE: paritytech/ruled_labels:0.4.0
-
-jobs:
-  check-labels:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Pull image
-        run: docker pull $IMAGE
-
-      - name: Check labels
-        env:
-          MOUNT: /work
-          GITHUB_PR: ${{ github.event.pull_request.number }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          API_BASE: https://api.github.com/repos
-          REPO: ${{ github.repository }}
-          RULES_PATH: labels/ruled_labels
-          CHECK_SPECS: specs_substrate.yaml
-        run: |
-          echo "REPO: ${REPO}"
-          echo "GITHUB_PR: ${GITHUB_PR}"
-          # Clone repo with labels specs
-          git clone https://github.com/paritytech/labels
-          # Fetch the labels for the PR under test
-          labels=$( curl -H "Authorization: token ${GITHUB_TOKEN}" -s "$API_BASE/${REPO}/pulls/${GITHUB_PR}" | jq '.labels | .[] | .name' | tr "\n" ",")
-
-          if [ -z "${labels}" ]; then
-            docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --tags PR --no-label
-          fi
-
-          labels_args=${labels: :-1}
-          printf "Checking labels: %s\n" "${labels_args}"
-
-          # Prevent the shell from splitting labels with spaces
-          IFS=","
-
-          # --dev is more useful to debug mode to debug
-          docker run --rm -i -v $PWD/${RULES_PATH}/:$MOUNT $IMAGE check $MOUNT/$CHECK_SPECS --labels ${labels_args} --dev --tags PR

From 4b89220ad854bfdfb0481aa621936e021f3618a7 Mon Sep 17 00:00:00 2001
From: Wilfried Kopp <wilfried@parity.io>
Date: Thu, 14 Sep 2023 15:47:58 +0200
Subject: [PATCH 05/10] Merge release notifications

- merge release notif from the 3 repos
- disable public notifications for now
---
 .../workflows/release-99_notif-published.yml  | 30 ++++++++++--
 polkadot/.github/workflows/release-99_bot.yml | 49 -------------------
 substrate/.github/workflows/release-bot.yml   | 31 ------------
 3 files changed, 26 insertions(+), 84 deletions(-)
 rename cumulus/.github/workflows/release-99_bot-announce.yml => .github/workflows/release-99_notif-published.yml (55%)
 delete mode 100644 polkadot/.github/workflows/release-99_bot.yml
 delete mode 100644 substrate/.github/workflows/release-bot.yml

diff --git a/cumulus/.github/workflows/release-99_bot-announce.yml b/.github/workflows/release-99_notif-published.yml
similarity index 55%
rename from cumulus/.github/workflows/release-99_bot-announce.yml
rename to .github/workflows/release-99_notif-published.yml
index 5c2604924c4c..b35120ca4e12 100644
--- a/cumulus/.github/workflows/release-99_bot-announce.yml
+++ b/.github/workflows/release-99_notif-published.yml
@@ -1,8 +1,9 @@
-name: Release - Pushes release notes to a Matrix room
+name: Release - Announce release to Matrix rooms
 on:
   release:
     types:
       - published
+      - prereleased
 
 jobs:
   ping_matrix:
@@ -10,11 +11,12 @@ jobs:
     strategy:
       matrix:
         channel:
+          # Internal
           - name: 'RelEng: Cumulus Release Coordination'
             room: '!NAEMyPAHWOiOQHsvus:parity.io'
             pre-releases: true
-          - name: 'Ledger <> Polkadot Coordination'
-            room: '!EoIhaKfGPmFOBrNSHT:web3.foundation'
+          - name: "RelEng: Polkadot Release Coordination"
+            room: '!cqAmzdIcbOFwrdrubV:parity.io'
             pre-release: true
           - name: 'General: Rust, Polkadot, Substrate'
             room: '!aJymqQYtCjjqImFLSb:parity.io'
@@ -23,13 +25,33 @@ jobs:
             room: '!lUslSijLMgNcEKcAiE:parity.io'
             pre-release: true
 
+         # External
+          - name: 'Ledger <> Polkadot Coordination'
+            room: '!EoIhaKfGPmFOBrNSHT:web3.foundation'
+            pre-release: true
+
+          # Public
+          # - name: '#KusamaValidatorLounge:polkadot.builders'
+          #   room: '!LhjZccBOqFNYKLdmbb:polkadot.builders'
+          #   pre-releases: false
+          # - name: '#kusama-announcements:matrix.parity.io'
+          #   room: '!FMwxpQnYhRCNDRsYGI:matrix.parity.io'
+          #   pre-release: false
+          # - name: '#polkadotvalidatorlounge:web3.foundation'
+          #   room: '!NZrbtteFeqYKCUGQtr:matrix.parity.io'
+          #   pre-release: false
+          # - name: '#polkadot-announcements:matrix.parity.io'
+          #   room: '!UqHPWiCBGZWxrmYBkF:matrix.parity.io'
+          #   pre-release: false
+
     steps:
       - name: Matrix notification to ${{ matrix.channel.name }}
+        if: github.event.release.prerelease == false || matrix.channel.pre-release
         uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
         with:
           room_id: ${{ matrix.channel.room }}
           access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
-          server: "m.parity.io"
+          server: m.parity.io
           message: |
             A (pre)release has been ${{github.event.action}} in **${{github.event.repository.full_name}}:**<br/>
             Release version: [${{github.event.release.tag_name}}](${{github.event.release.html_url}})
diff --git a/polkadot/.github/workflows/release-99_bot.yml b/polkadot/.github/workflows/release-99_bot.yml
deleted file mode 100644
index 5d45c0d44eda..000000000000
--- a/polkadot/.github/workflows/release-99_bot.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-name: Release - Send new release notification to matrix channels
-on:
-  release:
-    types:
-      - published
-
-jobs:
-  ping_matrix:
-    strategy:
-      matrix:
-        channel:
-          - name: '#KusamaValidatorLounge:polkadot.builders'
-            room: '!LhjZccBOqFNYKLdmbb:polkadot.builders'
-            pre-releases: false
-          - name: '#kusama-announcements:matrix.parity.io'
-            room: '!FMwxpQnYhRCNDRsYGI:matrix.parity.io'
-            pre-release: false
-          - name: '#polkadotvalidatorlounge:web3.foundation'
-            room: '!NZrbtteFeqYKCUGQtr:matrix.parity.io'
-            pre-release: false
-          - name: '#polkadot-announcements:matrix.parity.io'
-            room: '!UqHPWiCBGZWxrmYBkF:matrix.parity.io'
-            pre-release: false
-          - name: "RelEng: Polkadot Release Coordination"
-            room: '!cqAmzdIcbOFwrdrubV:parity.io'
-            pre-release: true
-          - name: 'Ledger <> Polkadot Coordination'
-            room: '!EoIhaKfGPmFOBrNSHT:web3.foundation'
-            pre-release: true
-          - name: 'General: Rust, Polkadot, Substrate'
-            room: '!aJymqQYtCjjqImFLSb:parity.io'
-            pre-release: false
-          - name: 'Team: DevOps'
-            room: '!lUslSijLMgNcEKcAiE:parity.io'
-            pre-release: true
-
-    runs-on: ubuntu-latest
-    steps:
-      - name: Send Matrix message to ${{ matrix.channel.name }}
-        if: github.event.release.prerelease == false || matrix.channel.pre-release
-        uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
-        with:
-          room_id: ${{ matrix.channel.room }}
-          access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
-          server: m.parity.io
-          message: |
-            ***Polkadot ${{github.event.release.tag_name}} has been released!***<br/>
-            ${{github.event.release.html_url}}<br/><br/>
-            ${{github.event.release.body}}<br/>
diff --git a/substrate/.github/workflows/release-bot.yml b/substrate/.github/workflows/release-bot.yml
deleted file mode 100644
index 05bea32abc69..000000000000
--- a/substrate/.github/workflows/release-bot.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Pushes release updates to a pre-defined Matrix room
-on:
-  release:
-    types:
-      - edited
-      - prereleased
-      - published
-jobs:
-  ping_matrix:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        channel:
-          - name: 'General: Rust, Polkadot, Substrate'
-            room: '!aJymqQYtCjjqImFLSb:parity.io'
-            pre-release: false
-
-    steps:
-      - name: send message
-        uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
-        with:
-          room_id: ${{ matrix.channel.room }}
-          access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
-          server: "m.parity.io"
-          message: |
-            ***${{github.event.repository.full_name}}:*** A release has been ${{github.event.action}}<br/>
-            Release version [${{github.event.release.tag_name}}](${{github.event.release.html_url}})
-
-            -----
-
-            ${{github.event.release.body}}<br/>

From bbadf9528e26515154611434fbc249c016e68377 Mon Sep 17 00:00:00 2001
From: Wilfried Kopp <wilfried@parity.io>
Date: Thu, 14 Sep 2023 16:17:27 +0200
Subject: [PATCH 06/10] Restore a simple version of the workflow to create RCs

---
 .github/scripts/common/lib.sh                 | 16 ++++
 .../workflows/release-10_candidate.yml        | 32 ++++---
 .../workflows/release-10_rc-automation.yml    | 87 -------------------
 3 files changed, 35 insertions(+), 100 deletions(-)
 rename {polkadot/.github => .github}/workflows/release-10_candidate.yml (73%)
 delete mode 100644 cumulus/.github/workflows/release-10_rc-automation.yml

diff --git a/.github/scripts/common/lib.sh b/.github/scripts/common/lib.sh
index b0f9cb32063a..0bbf30dad181 100755
--- a/.github/scripts/common/lib.sh
+++ b/.github/scripts/common/lib.sh
@@ -264,3 +264,19 @@ function check_gpg() {
     echo "Checking GPG Signature for $1"
     gpg --no-tty --verify -q $1.asc $1
 }
+
+# GITHUB_REF will typically be like:
+# - refs/heads/release-v1.2.3
+# - refs/heads/release-polkadot-v1.2.3-rc2
+# This function extracts the version
+function get_version_from_ghref() {
+  GITHUB_REF=$1
+  stripped=${GITHUB_REF#refs/heads/release-}
+  re="v([0-9]+\.[0-9]+\.[0-9]+)"
+  if [[ $stripped =~ $re ]]; then
+    echo ${BASH_REMATCH[0]};
+    return 0
+  else
+    return 1
+  fi
+}
diff --git a/polkadot/.github/workflows/release-10_candidate.yml b/.github/workflows/release-10_candidate.yml
similarity index 73%
rename from polkadot/.github/workflows/release-10_candidate.yml
rename to .github/workflows/release-10_candidate.yml
index 54a937a7819a..3a5813c7d26d 100644
--- a/polkadot/.github/workflows/release-10_candidate.yml
+++ b/.github/workflows/release-10_candidate.yml
@@ -2,8 +2,13 @@ name: Release - RC automation
 on:
   push:
     branches:
-      # Catches v1.2.3 and v1.2.3-rc1
+      # Catches release-polkadot-v1.2.3, release-v1.2.3-rc1, etc
       - release-v[0-9]+.[0-9]+.[0-9]+*
+      - release-parachains-v[0-9]+
+      - release-polkadot-v[0-9]+
+
+  workflow_dispatch:
+
 jobs:
   tag_rc:
     runs-on: ubuntu-latest
@@ -22,8 +27,10 @@ jobs:
         name: Compute next rc tag
         shell: bash
         run: |
+          . ./.github/scripts/common/lib.sh
+
           # Get last rc tag if exists, else set it to {version}-rc1
-          version=${GITHUB_REF#refs/heads/release-}
+          version=$(get_version_from_ghref ${GITHUB_REF})
           echo "$version"
           echo "version=$version" >> $GITHUB_OUTPUT
           git tag -l
@@ -49,23 +56,22 @@ jobs:
           repo-token: "${{ secrets.RELEASE_BRANCH_TOKEN }}"
           tag: ${{ steps.compute_tag.outputs.new_tag }}
 
-      - id: create-issue
-        uses: JasonEtco/create-an-issue@e27dddc79c92bc6e4562f268fffa5ed752639abd # v2.9.1
-        # Only create the issue if it's the first release candidate
-        if: steps.compute_tag.outputs.first_rc == 'true'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          VERSION: ${{ steps.compute_tag.outputs.version }}
-        with:
-          filename: .github/ISSUE_TEMPLATE/release.md
+      # - id: create-issue
+      #   uses: JasonEtco/create-an-issue@e27dddc79c92bc6e4562f268fffa5ed752639abd # v2.9.1
+      #   # Only create the issue if it's the first release candidate
+      #   if: steps.compute_tag.outputs.first_rc == 'true'
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #     VERSION: ${{ steps.compute_tag.outputs.version }}
+      #   with:
+      #     filename: .github/ISSUE_TEMPLATE/release.md
 
       - name: Send Matrix message to ${{ matrix.channel.name }}
         uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
-        if: steps.create-issue.outputs.url != ''
+        # if: steps.create-issue.outputs.url != ''
         with:
           room_id: ${{ matrix.channel.room }}
           access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
           server: m.parity.io
           message: |
             Release process for polkadot ${{ steps.compute_tag.outputs.version }} has been started.<br/>
-            Tracking issue: ${{ steps.create-issue.outputs.url }}
diff --git a/cumulus/.github/workflows/release-10_rc-automation.yml b/cumulus/.github/workflows/release-10_rc-automation.yml
deleted file mode 100644
index d1795faef096..000000000000
--- a/cumulus/.github/workflows/release-10_rc-automation.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-name: Release - RC automation
-on:
-  push:
-    branches:
-      - release-v[0-9]+.[0-9]+.[0-9]+
-      - release-parachains-v[0-9]+
-  workflow_dispatch:
-
-jobs:
-  tag_rc:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        channel:
-          - name: 'RelEng: Cumulus Release Coordination'
-            room: '!NAEMyPAHWOiOQHsvus:parity.io'
-            pre-releases: true
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-        with:
-          fetch-depth: 0
-      - id: compute_tag
-        name: Compute next rc tag
-        shell: bash
-        run: |
-          # Get last rc tag if exists, else set it to {version}-rc1
-          version=${GITHUB_REF#refs/heads/release-}
-          echo "$version"
-          echo "version=$version" >> $GITHUB_OUTPUT
-          git tag -l
-          last_rc=$(git tag -l "$version-rc*" | sort -V | tail -n 1)
-          if [ -n "$last_rc" ]; then
-            suffix=$(echo "$last_rc" | grep -Eo '[0-9]+$')
-            echo $suffix
-            ((suffix++))
-            echo $suffix
-            echo "new_tag=$version-rc$suffix" >> $GITHUB_OUTPUT
-            echo "first_rc=false" >> $GITHUB_OUTPUT
-          else
-            echo "new_tag=$version-rc1" >> $GITHUB_OUTPUT
-            echo "first_rc=true" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Apply new tag
-        uses: tvdias/github-tagger@ed7350546e3e503b5e942dffd65bc8751a95e49d # v0.0.2
-        with:
-          # We can't use the normal GITHUB_TOKEN for the following reason:
-          # https://docs.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token
-          # RELEASE_BRANCH_TOKEN requires public_repo OAuth scope
-          repo-token: "${{ secrets.RELEASE_BRANCH_TOKEN }}"
-          tag: ${{ steps.compute_tag.outputs.new_tag }}
-
-      - id: create-issue-checklist-client
-        uses: JasonEtco/create-an-issue@e27dddc79c92bc6e4562f268fffa5ed752639abd # v2.9.1
-        # Only create the issue if it's the first release candidate
-        if: steps.compute_tag.outputs.first_rc == 'true'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          VERSION: ${{ steps.compute_tag.outputs.version }}
-        with:
-          assignees: EgorPopelyaev, coderobe, chevdor
-          filename: .github/ISSUE_TEMPLATE/release-client.md
-
-      - id: create-issue-checklist-runtime
-        uses: JasonEtco/create-an-issue@e27dddc79c92bc6e4562f268fffa5ed752639abd # v2.9.1
-        # Only create the issue if it's the first release candidate
-        if: steps.compute_tag.outputs.first_rc == 'true'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          VERSION: ${{ steps.compute_tag.outputs.version }}
-        with:
-          assignees: EgorPopelyaev, coderobe, chevdor
-          filename: .github/ISSUE_TEMPLATE/release-runtime.md
-
-      - name: Matrix notification to ${{ matrix.channel.name }}
-        uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
-        if: steps.create-issue-checklist-client.outputs.url != '' && steps.create-issue-checklist-runtime.outputs.url != ''
-        with:
-          room_id: ${{ matrix.channel.room }}
-          access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
-          server: "m.parity.io"
-          message: |
-            The Release Process for Cumulus ${{ steps.compute_tag.outputs.version }} has been started.<br/>
-            Tracking issues:
-              - client: ${{ steps.create-issue-checklist-client.outputs.url }}"
-              - runtime: ${{ steps.create-issue-checklist-runtime.outputs.url }}"

From 2e9d9b4ec68a5aac411e862a491b3cfc2e326bfa Mon Sep 17 00:00:00 2001
From: Wilfried Kopp <wilfried@parity.io>
Date: Thu, 14 Sep 2023 16:57:42 +0200
Subject: [PATCH 07/10] Rework release automation

---
 ...idate.yml => release-10_rc-automation.yml} |  0
 .../release-50_publish-docker-release.yml     | 44 -------------------
 2 files changed, 44 deletions(-)
 rename .github/workflows/{release-10_candidate.yml => release-10_rc-automation.yml} (100%)
 delete mode 100644 polkadot/.github/workflows/release-50_publish-docker-release.yml

diff --git a/.github/workflows/release-10_candidate.yml b/.github/workflows/release-10_rc-automation.yml
similarity index 100%
rename from .github/workflows/release-10_candidate.yml
rename to .github/workflows/release-10_rc-automation.yml
diff --git a/polkadot/.github/workflows/release-50_publish-docker-release.yml b/polkadot/.github/workflows/release-50_publish-docker-release.yml
deleted file mode 100644
index 81e5caa718f3..000000000000
--- a/polkadot/.github/workflows/release-50_publish-docker-release.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Release - Publish Docker image for new releases
-
-on:
-  release:
-    types:
-      - published
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@95cb08cb2672c73d4ffd2f422e6d11953d2a9c70 # v2.1.0
-      - name: Cache Docker layers
-        uses: actions/cache@v3
-        with:
-         path: /tmp/.buildx-cache
-         key: ${{ runner.os }}-buildx-${{ github.sha }}
-         restore-keys: |
-           ${{ runner.os }}-buildx-
-      - name: Login to Dockerhub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        id:   docker_build
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          file: scripts/ci/dockerfiles/polkadot/polkadot_injected_debian.Dockerfile
-          tags: |
-            parity/polkadot:latest
-            parity/polkadot:${{ github.event.release.tag_name }}
-          build-args: |
-            POLKADOT_VERSION=${{ github.event.release.tag_name }}
-            VCS_REF=${{ github.ref }}
-            BUILD_DATE=${{ github.event.release.published_at }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}

From b1e1eb2a03a8772e67b4bd16104323a837f5c3cc Mon Sep 17 00:00:00 2001
From: Chevdor <chevdor@users.noreply.github.com>
Date: Fri, 15 Sep 2023 10:27:55 +0200
Subject: [PATCH 08/10] Update .github/workflows/check-licenses.yml

Co-authored-by: Egor_P <egor@parity.io>
---
 .github/workflows/check-licenses.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check-licenses.yml b/.github/workflows/check-licenses.yml
index cb6b4bdd4e58..3452a901e0e1 100644
--- a/.github/workflows/check-licenses.yml
+++ b/.github/workflows/check-licenses.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
 
-      - uses: actions/setup-node@v3.8.1
+      - uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d #v3.8.1
         with:
           node-version: "18.x"
           registry-url: "https://npm.pkg.github.com"

From f0ed65190150cdc3e267c6e38be9e157d1753a26 Mon Sep 17 00:00:00 2001
From: EgorPopelyaev <egor@parity.io>
Date: Fri, 10 Nov 2023 11:04:21 +0100
Subject: [PATCH 09/10] split tagging based on products

---
 .github/scripts/common/lib.sh                 | 24 +++++++++
 .../workflows/release-10_rc-automation.yml    | 51 +++++++++++++++----
 2 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/.github/scripts/common/lib.sh b/.github/scripts/common/lib.sh
index 0bbf30dad181..967b3665d23a 100755
--- a/.github/scripts/common/lib.sh
+++ b/.github/scripts/common/lib.sh
@@ -280,3 +280,27 @@ function get_version_from_ghref() {
     return 1
   fi
 }
+
+# Get latest rc tag based on the release version and product
+function get_latest_rc_tag() {
+  version=$1
+  product=$2
+
+  git tag -l
+  if [[ "$product" == "polkadot" ]]; then
+    last_rc=$(git tag -l "$version-rc*" | sort -V | tail -n 1)
+  elif [[ "$product" == "polkadot-parachain"  ]]; then
+    last_rc=$(git tag -l "polkadot-parachains-$version-rc*" | sort -V | tail -n 1)
+  fi
+  echo "${last_rc}"
+}
+
+# Increment rc tag number based on the value of a suffix of the current rc tag
+function increment_rc_tag() {
+  last_rc=$1
+
+  suffix=$(echo "$last_rc" | grep -Eo '[0-9]+$')
+  echo $suffix
+  ((suffix++))
+  echo $suffix
+}
diff --git a/.github/workflows/release-10_rc-automation.yml b/.github/workflows/release-10_rc-automation.yml
index 3a5813c7d26d..8312b98390b6 100644
--- a/.github/workflows/release-10_rc-automation.yml
+++ b/.github/workflows/release-10_rc-automation.yml
@@ -20,11 +20,21 @@ jobs:
 
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
-      - id: compute_tag
-        name: Compute next rc tag
+
+      - name: Get release product
+        id: get_rel_product
+        run: |
+          current_branch=$(git branch --show-current)
+          [[ "$current_branch" ~= "release-polkadot" ]] && echo "product=polakdot" >> $GITHUB_OUTPUT
+          [[ "$current_branch" ~= "release-cumulus"  ]] && echo "product=polakdot-parachain" >> $GITHUB_OUTPUT
+
+
+      - name: Compute next rc tag for polkadot
+        if: ${{ steps.get_rel_product.outputs.product == 'polkadot' }}
+        id: compute_tag_polkadot
         shell: bash
         run: |
           . ./.github/scripts/common/lib.sh
@@ -33,13 +43,10 @@ jobs:
           version=$(get_version_from_ghref ${GITHUB_REF})
           echo "$version"
           echo "version=$version" >> $GITHUB_OUTPUT
-          git tag -l
-          last_rc=$(git tag -l "$version-rc*" | sort -V | tail -n 1)
+
+          last_rc=$(get_latest_rc_tag $version "polkadot")
           if [ -n "$last_rc" ]; then
-            suffix=$(echo "$last_rc" | grep -Eo '[0-9]+$')
-            echo $suffix
-            ((suffix++))
-            echo $suffix
+            suffix=$(increment_rc_tag $last_rc)
             echo "new_tag=$version-rc$suffix" >> $GITHUB_OUTPUT
             echo "first_rc=false" >> $GITHUB_OUTPUT
           else
@@ -47,6 +54,28 @@ jobs:
             echo "first_rc=true" >> $GITHUB_OUTPUT
           fi
 
+      - name: Compute next rc tag for polkadot-parachain
+        if: ${{ steps.get_rel_product.outputs.product == 'polkadot-parachain' }}
+        id: compute_tag_cumulus
+        shell: bash
+        run: |
+          . ./.github/scripts/common/lib.sh
+
+          # Get last rc tag if exists, else set it to polkadot-parachains-{version}-rc1
+          version=$(get_version_from_ghref ${GITHUB_REF})
+          echo "$version"
+          echo "version=$version" >> $GITHUB_OUTPUT
+
+          last_rc=$(get_latest_rc_tag $version "polkadot-parachain")
+          if [ -n "$last_rc" ]; then
+            suffix=$(increment_rc_tag $last_rc)
+            echo "new_tag=polkadot-parachains-$version-rc$suffix" >> $GITHUB_OUTPUT
+            echo "first_rc=false" >> $GITHUB_OUTPUT
+          else
+            echo "new_tag=polkadot-parachain-$version-rc1" >> $GITHUB_OUTPUT
+            echo "first_rc=true" >> $GITHUB_OUTPUT
+          fi
+
       - name: Apply new tag
         uses: tvdias/github-tagger@ed7350546e3e503b5e942dffd65bc8751a95e49d # v0.0.2
         with:
@@ -54,7 +83,7 @@ jobs:
           # https://docs.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token
           # RELEASE_BRANCH_TOKEN requires public_repo OAuth scope
           repo-token: "${{ secrets.RELEASE_BRANCH_TOKEN }}"
-          tag: ${{ steps.compute_tag.outputs.new_tag }}
+          tag: ${{ steps.compute_tag_polkadot.outputs.new_tag || steps.compute_tag_cumulus.outputs.new_tag }}
 
       # - id: create-issue
       #   uses: JasonEtco/create-an-issue@e27dddc79c92bc6e4562f268fffa5ed752639abd # v2.9.1
@@ -74,4 +103,4 @@ jobs:
           access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
           server: m.parity.io
           message: |
-            Release process for polkadot ${{ steps.compute_tag.outputs.version }} has been started.<br/>
+            Release process for polkadot ${{ steps.compute_tag_polkadot.outputs.new_tag || steps.compute_tag_cumulus.outputs.new_tag }} has been started.<br/>

From 8d3d53f1b6f5833aeff98d82847e2acd5adf755f Mon Sep 17 00:00:00 2001
From: EgorPopelyaev <egor@parity.io>
Date: Fri, 10 Nov 2023 17:09:59 +0100
Subject: [PATCH 10/10] fixes to make it work for polkadot and cumulus

---
 .github/scripts/common/lib.sh                  |  2 --
 .github/workflows/release-10_rc-automation.yml | 18 ++++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/scripts/common/lib.sh b/.github/scripts/common/lib.sh
index 967b3665d23a..2a835b4472b2 100755
--- a/.github/scripts/common/lib.sh
+++ b/.github/scripts/common/lib.sh
@@ -286,7 +286,6 @@ function get_latest_rc_tag() {
   version=$1
   product=$2
 
-  git tag -l
   if [[ "$product" == "polkadot" ]]; then
     last_rc=$(git tag -l "$version-rc*" | sort -V | tail -n 1)
   elif [[ "$product" == "polkadot-parachain"  ]]; then
@@ -300,7 +299,6 @@ function increment_rc_tag() {
   last_rc=$1
 
   suffix=$(echo "$last_rc" | grep -Eo '[0-9]+$')
-  echo $suffix
   ((suffix++))
   echo $suffix
 }
diff --git a/.github/workflows/release-10_rc-automation.yml b/.github/workflows/release-10_rc-automation.yml
index 8312b98390b6..f26f6b6e110e 100644
--- a/.github/workflows/release-10_rc-automation.yml
+++ b/.github/workflows/release-10_rc-automation.yml
@@ -4,8 +4,8 @@ on:
     branches:
       # Catches release-polkadot-v1.2.3, release-v1.2.3-rc1, etc
       - release-v[0-9]+.[0-9]+.[0-9]+*
-      - release-parachains-v[0-9]+
-      - release-polkadot-v[0-9]+
+      - release-cumulus-v[0-9]+*
+      - release-polkadot-v[0-9]+*
 
   workflow_dispatch:
 
@@ -26,10 +26,15 @@ jobs:
 
       - name: Get release product
         id: get_rel_product
+        shell: bash
         run: |
           current_branch=$(git branch --show-current)
-          [[ "$current_branch" ~= "release-polkadot" ]] && echo "product=polakdot" >> $GITHUB_OUTPUT
-          [[ "$current_branch" ~= "release-cumulus"  ]] && echo "product=polakdot-parachain" >> $GITHUB_OUTPUT
+          echo "Current branch: $current_branch"
+          if [[ "$current_branch" =~ "release-polkadot" ]]; then
+            echo "product=polkadot" >> $GITHUB_OUTPUT
+          elif [[ "$current_branch" =~ "release-cumulus" ]]; then
+            echo "product=polkadot-parachain" >> $GITHUB_OUTPUT
+          fi
 
 
       - name: Compute next rc tag for polkadot
@@ -44,7 +49,8 @@ jobs:
           echo "$version"
           echo "version=$version" >> $GITHUB_OUTPUT
 
-          last_rc=$(get_latest_rc_tag $version "polkadot")
+          last_rc=$(get_latest_rc_tag $version polkadot)
+
           if [ -n "$last_rc" ]; then
             suffix=$(increment_rc_tag $last_rc)
             echo "new_tag=$version-rc$suffix" >> $GITHUB_OUTPUT
@@ -66,7 +72,7 @@ jobs:
           echo "$version"
           echo "version=$version" >> $GITHUB_OUTPUT
 
-          last_rc=$(get_latest_rc_tag $version "polkadot-parachain")
+          last_rc=$(get_latest_rc_tag $version polkadot-parachain)
           if [ -n "$last_rc" ]; then
             suffix=$(increment_rc_tag $last_rc)
             echo "new_tag=polkadot-parachains-$version-rc$suffix" >> $GITHUB_OUTPUT