diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4b4abe75..3bae693a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -346,11 +346,11 @@ jobs:
           crate: cargo-edit
           bin: cargo-set-version
       - name: Update version if PR against main branch
-        if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }}
+        if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'main' }}
         run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
       - name: Update version if PR against non-main branch
         # For PRs to be merged against a release branch, use the version that has already been set in the calling script.
-        if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }}
+        if: ${{ github.event_name == 'pull_request' && startsWith(github.event.pull_request.base.ref, 'release-') }}
         env:
           PR_NUMBER: ${{ github.event.pull_request.number }}
         run: |
@@ -421,11 +421,11 @@ jobs:
           crate: cargo-edit
           bin: cargo-set-version
       - name: Update version if PR against main branch
-        if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }}
+        if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'main' }}
         run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
       - name: Update version if PR against non-main branch
         # For PRs to be merged against a release branch, use the version that has already been set in the calling script.
-        if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }}
+        if: ${{ github.event_name == 'pull_request' && startsWith(github.event.pull_request.base.ref, 'release-') }}
         env:
           PR_NUMBER: ${{ github.event.pull_request.number }}
         run: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef386ed3..2478f6cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+## [24.11.1-rc2] - 2024-12-10
+
 ## [24.11.1-rc1] - 2024-12-05
 
 ### Fixed
diff --git a/Cargo.lock b/Cargo.lock
index 192ddee0..a12b94ae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2172,7 +2172,7 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
 [[package]]
 name = "stackable-airflow-crd"
-version = "24.11.1-rc1"
+version = "24.11.1-rc2"
 dependencies = [
  "indoc",
  "product-config",
@@ -2189,7 +2189,7 @@ dependencies = [
 
 [[package]]
 name = "stackable-airflow-operator"
-version = "24.11.1-rc1"
+version = "24.11.1-rc2"
 dependencies = [
  "anyhow",
  "built",
diff --git a/Cargo.nix b/Cargo.nix
index b0296939..731ef513 100644
--- a/Cargo.nix
+++ b/Cargo.nix
@@ -6677,7 +6677,7 @@ rec {
       };
       "stackable-airflow-crd" = rec {
         crateName = "stackable-airflow-crd";
-        version = "24.11.1-rc1";
+        version = "24.11.1-rc2";
         edition = "2021";
         src = lib.cleanSourceWith { filter = sourceFilter;  src = ./rust/crd; };
         libName = "stackable_airflow_crd";
@@ -6739,7 +6739,7 @@ rec {
       };
       "stackable-airflow-operator" = rec {
         crateName = "stackable-airflow-operator";
-        version = "24.11.1-rc1";
+        version = "24.11.1-rc2";
         edition = "2021";
         crateBin = [
           {
diff --git a/Cargo.toml b/Cargo.toml
index 39751a07..3bfb7a3d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ members = ["rust/crd", "rust/operator-binary"]
 resolver = "2"
 
 [workspace.package]
-version = "24.11.1-rc1"
+version = "24.11.1-rc2"
 authors = ["Stackable GmbH <info@stackable.tech>"]
 license = "OSL-3.0"
 edition = "2021"
diff --git a/deploy/helm/airflow-operator/Chart.yaml b/deploy/helm/airflow-operator/Chart.yaml
index 5e5e953e..94cc6c35 100644
--- a/deploy/helm/airflow-operator/Chart.yaml
+++ b/deploy/helm/airflow-operator/Chart.yaml
@@ -1,8 +1,8 @@
 ---
 apiVersion: v2
 name: airflow-operator
-version: "24.11.1-rc1"
-appVersion: "24.11.1-rc1"
+version: "24.11.1-rc2"
+appVersion: "24.11.1-rc2"
 description: The Stackable Operator for Apache Airflow
 home: https://github.com/stackabletech/airflow-operator
 maintainers:
diff --git a/docs/modules/airflow/examples/getting_started/code/getting_started.sh b/docs/modules/airflow/examples/getting_started/code/getting_started.sh
index 20c5ad75..5df404bb 100755
--- a/docs/modules/airflow/examples/getting_started/code/getting_started.sh
+++ b/docs/modules/airflow/examples/getting_started/code/getting_started.sh
@@ -44,20 +44,20 @@ echo "Updating Helm repo"
 helm repo update
 echo "Installing Operators with Helm"
 # tag::helm-install-operators[]
-helm install --wait commons-operator stackable-stable/commons-operator --version 24.11.1-rc1
-helm install --wait secret-operator stackable-stable/secret-operator --version 24.11.1-rc1
-helm install --wait listener-operator stackable-stable/listener-operator --version 24.11.1-rc1
-helm install --wait airflow-operator stackable-stable/airflow-operator --version 24.11.1-rc1
+helm install --wait commons-operator stackable-stable/commons-operator --version 24.11.1-rc2
+helm install --wait secret-operator stackable-stable/secret-operator --version 24.11.1-rc2
+helm install --wait listener-operator stackable-stable/listener-operator --version 24.11.1-rc2
+helm install --wait airflow-operator stackable-stable/airflow-operator --version 24.11.1-rc2
 # end::helm-install-operators[]
 ;;
 "stackablectl")
 echo "installing Operators with stackablectl"
 # tag::stackablectl-install-operators[]
 stackablectl operator install \
-  commons=24.11.1-rc1 \
-  secret=24.11.1-rc1 \
-  listener=24.11.1-rc1 \
-  airflow=24.11.1-rc1
+  commons=24.11.1-rc2 \
+  secret=24.11.1-rc2 \
+  listener=24.11.1-rc2 \
+  airflow=24.11.1-rc2
 # end::stackablectl-install-operators[]
 ;;
 *)
diff --git a/docs/modules/airflow/examples/getting_started/code/install_output.txt b/docs/modules/airflow/examples/getting_started/code/install_output.txt
index c8942cb3..1187d3da 100644
--- a/docs/modules/airflow/examples/getting_started/code/install_output.txt
+++ b/docs/modules/airflow/examples/getting_started/code/install_output.txt
@@ -1,4 +1,4 @@
-Installed commons=24.11.1-rc1 operator
-Installed secret=24.11.1-rc1 operator
-Installed listener=24.11.1-rc1 operator
-Installed airflow=24.11.1-rc1 operator
+Installed commons=24.11.1-rc2 operator
+Installed secret=24.11.1-rc2 operator
+Installed listener=24.11.1-rc2 operator
+Installed airflow=24.11.1-rc2 operator
diff --git a/docs/templating_vars.yaml b/docs/templating_vars.yaml
index ce0f9f71..ea3c4543 100644
--- a/docs/templating_vars.yaml
+++ b/docs/templating_vars.yaml
@@ -3,9 +3,9 @@ helm:
   repo_name: stackable-stable
   repo_url: https://repo.stackable.tech/repository/helm-stable/
 versions:
-  commons: 24.11.1-rc1
-  secret: 24.11.1-rc1
-  listener: 24.11.1-rc1
-  airflow: 24.11.1-rc1
+  commons: 24.11.1-rc2
+  secret: 24.11.1-rc2
+  listener: 24.11.1-rc2
+  airflow: 24.11.1-rc2
   postgresql: 12.1.5
   redis: 17.3.7
diff --git a/tests/release.yaml b/tests/release.yaml
index 4287fda2..989cacd5 100644
--- a/tests/release.yaml
+++ b/tests/release.yaml
@@ -7,12 +7,12 @@ releases:
     description: Integration test
     products:
       commons:
-        operatorVersion: 24.11.1-rc1
+        operatorVersion: 24.11.1-rc2
       secret:
-        operatorVersion: 24.11.1-rc1
+        operatorVersion: 24.11.1-rc2
       listener:
-        operatorVersion: 24.11.1-rc1
+        operatorVersion: 24.11.1-rc2
       airflow:
-        operatorVersion: 24.11.1-rc1
+        operatorVersion: 24.11.1-rc2
       spark-k8s:
-        operatorVersion: 24.11.1-rc1
+        operatorVersion: 24.11.1-rc2