diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0b3c019d..81f67b37 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ on:
       - trying
       - "renovate/**"
     tags:
-      - '[0-9][0-9].[0-9]+.[0-9]+'
+      - '[0-9][0-9].[0-9]+.[0-9]+(-rc[0-9]+)?'
   pull_request:
   merge_group:
   schedule:
@@ -345,7 +345,8 @@ jobs:
           crate: cargo-edit
           bin: cargo-set-version
       - name: Update version if PR
-        if: ${{ github.event_name == 'pull_request' }}
+        # For PRs to be merged against a release branch, the version has already been set, in which case ignore this step.
+        if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }}
         run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
 
       # Recreate charts and publish charts and docker image. The "-e" is needed as we want to override the
@@ -411,7 +412,8 @@ jobs:
           crate: cargo-edit
           bin: cargo-set-version
       - name: Update version if PR
-        if: ${{ github.event_name == 'pull_request' }}
+        # For PRs to be merged against a release branch, the version has already been set, in which case ignore this step.
+        if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }}
         run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
       - name: Build manifest list
         run: |
diff --git a/Cargo.nix b/Cargo.nix
index c9139fa0..3f0cd3b2 100644
--- a/Cargo.nix
+++ b/Cargo.nix
@@ -6286,9 +6286,9 @@ rec {
       };
       "rustls" = rec {
         crateName = "rustls";
-        version = "0.23.18";
+        version = "0.23.19";
         edition = "2021";
-        sha256 = "0zxbcq0qy3kmp0m42mmf930h5bhr3hh3ivamrrd6ag94gvac374w";
+        sha256 = "1lgqjf1vh09kghyj34a4svn1max18pmhka6bwbxb61mv61240jwk";
         dependencies = [
           {
             name = "log";
@@ -7528,13 +7528,13 @@ rec {
       };
       "stackable-operator" = rec {
         crateName = "stackable-operator";
-        version = "0.82.0";
+        version = "0.83.0";
         edition = "2021";
         workspace_member = null;
         src = pkgs.fetchgit {
-          url = "https://github.com/stackabletech//operator-rs.git";
-          rev = "f6aa3c46948d4cb59f92c5daa08f685068a393ba";
-          sha256 = "09l6s6yjskp3a2ab71z4cba20lrihscs11b3q19rlz252r5pvyqh";
+          url = "https://github.com/stackabletech/operator-rs.git";
+          rev = "3ce7bcbdb58097cde0c0f19488a104c96f69dbc3";
+          sha256 = "1443vhsanfl2vxp6x6zpylfln682g0y8bxbk4sknycsg009mbkwm";
         };
         libName = "stackable_operator";
         authors = [
@@ -7692,9 +7692,9 @@ rec {
         edition = "2021";
         workspace_member = null;
         src = pkgs.fetchgit {
-          url = "https://github.com/stackabletech//operator-rs.git";
-          rev = "f6aa3c46948d4cb59f92c5daa08f685068a393ba";
-          sha256 = "09l6s6yjskp3a2ab71z4cba20lrihscs11b3q19rlz252r5pvyqh";
+          url = "https://github.com/stackabletech/operator-rs.git";
+          rev = "3ce7bcbdb58097cde0c0f19488a104c96f69dbc3";
+          sha256 = "1443vhsanfl2vxp6x6zpylfln682g0y8bxbk4sknycsg009mbkwm";
         };
         procMacro = true;
         libName = "stackable_operator_derive";
@@ -7727,9 +7727,9 @@ rec {
         edition = "2021";
         workspace_member = null;
         src = pkgs.fetchgit {
-          url = "https://github.com/stackabletech//operator-rs.git";
-          rev = "f6aa3c46948d4cb59f92c5daa08f685068a393ba";
-          sha256 = "09l6s6yjskp3a2ab71z4cba20lrihscs11b3q19rlz252r5pvyqh";
+          url = "https://github.com/stackabletech/operator-rs.git";
+          rev = "3ce7bcbdb58097cde0c0f19488a104c96f69dbc3";
+          sha256 = "1443vhsanfl2vxp6x6zpylfln682g0y8bxbk4sknycsg009mbkwm";
         };
         libName = "stackable_shared";
         authors = [
diff --git a/crate-hashes.json b/crate-hashes.json
index cf8cfc73..e00798ae 100644
--- a/crate-hashes.json
+++ b/crate-hashes.json
@@ -1,6 +1,6 @@
 {
-  "git+https://github.com/stackabletech//operator-rs.git?branch=feat%2Frequest-secret-lifetime#stackable-operator-derive@0.3.1": "09l6s6yjskp3a2ab71z4cba20lrihscs11b3q19rlz252r5pvyqh",
-  "git+https://github.com/stackabletech//operator-rs.git?branch=feat%2Frequest-secret-lifetime#stackable-operator@0.82.0": "09l6s6yjskp3a2ab71z4cba20lrihscs11b3q19rlz252r5pvyqh",
-  "git+https://github.com/stackabletech//operator-rs.git?branch=feat%2Frequest-secret-lifetime#stackable-shared@0.0.1": "09l6s6yjskp3a2ab71z4cba20lrihscs11b3q19rlz252r5pvyqh",
+  "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.83.0#stackable-operator-derive@0.3.1": "1443vhsanfl2vxp6x6zpylfln682g0y8bxbk4sknycsg009mbkwm",
+  "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.83.0#stackable-operator@0.83.0": "1443vhsanfl2vxp6x6zpylfln682g0y8bxbk4sknycsg009mbkwm",
+  "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.83.0#stackable-shared@0.0.1": "1443vhsanfl2vxp6x6zpylfln682g0y8bxbk4sknycsg009mbkwm",
   "git+https://github.com/stackabletech/product-config.git?tag=0.7.0#product-config@0.7.0": "0gjsm80g6r75pm3824dcyiz4ysq1ka4c1if6k1mjm9cnd5ym0gny"
 }
\ No newline at end of file