diff --git a/.github/workflows/cherry-pick-release-to-dev.yml b/.github/workflows/cherry-pick-release-to-dev.yml
new file mode 100644
index 0000000000..dfcff0e7b8
--- /dev/null
+++ b/.github/workflows/cherry-pick-release-to-dev.yml
@@ -0,0 +1,23 @@
+# This job will automatically create a cherry pick PR from any release/* branch to the staging branch
+# It allows the staging branch to stay up-to-date with fixes made to specific release branches
+name: Cherry pick to staging
+on:
+  push:
+    branches:
+      - release/*
+jobs:
+  cherry_pick:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Create PR to branch
+        uses: gorillio/github-action-cherry-pick@master
+        with:
+          pr_branch: 'staging'
+        env:
+          GITHUB_TOKEN: ${{ secrets.OTTO_THE_BOT_GH_TOKEN }}
+
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2f1b146afe..2b4eff6f0a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ on:
     tags:
       - v*
   pull_request:
-    branches: [staging, main]
+    branches: [staging, main, release/*]
 
 jobs:
   test_build_deploy:
diff --git a/.github/workflows/test_build_deploy.yml b/.github/workflows/test_build_deploy.yml
index 10aaf9ba1f..b57044e89f 100644
--- a/.github/workflows/test_build_deploy.yml
+++ b/.github/workflows/test_build_deploy.yml
@@ -2,7 +2,7 @@ name: Test, Build & Deploy
 
 on:
   push:
-    branches: [staging, main]
+    branches: [staging, main, release/*]
     tags:
       - v*
 
@@ -74,6 +74,10 @@ jobs:
             wire_builds_target_branches='["dev"]'
           fi
 
+          if [ "$version_tag" == "release/q1-2024" ]; then
+            wire_builds_target_branches='["q1-2024"]'
+          fi
+
           echo "wire_builds_target_branches: $wire_builds_target_branches"
           echo "wire_builds_target_branches=$wire_builds_target_branches" >> $GITHUB_OUTPUT
 
diff --git a/bin/push_docker.js b/bin/push_docker.js
index bd36ecb084..d6c39aa29c 100644
--- a/bin/push_docker.js
+++ b/bin/push_docker.js
@@ -38,7 +38,7 @@ const pkg = require('../package.json');
 /** Either empty (for our own cloud releases) or a suffix (i.e. "ey") for custom deployments */
 const distributionParam = process.argv[2];
 /** Either "staging" (for internal releases / staging bumps) or "production" (for cloud releases) */
-const stageParam = process.argv[3];
+const stageParam = process.argv[3].replace('/', '-');
 /** Commit ID of https://github.com/wireapp/wire-team-settings (i.e. "fb2f4f47f1e3eab3cd8df62c5cea6441cfb6f279") */
 const commitSha = process.argv[4];