diff --git a/Cargo.nix b/Cargo.nix
index 88721544..5a3012f0 100644
--- a/Cargo.nix
+++ b/Cargo.nix
@@ -10151,7 +10151,7 @@ rec {
       "stackable-nifi-operator" = rec {
         crateName = "stackable-nifi-operator";
         version = "0.0.0-dev";
-        edition = "2021";
+        edition = "2024";
         crateBin = [
           {
             name = "stackable-nifi-operator";
diff --git a/Cargo.toml b/Cargo.toml
index 89c1c08f..dc181bef 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,14 +6,14 @@ resolver = "2"
 version = "0.0.0-dev"
 authors = ["Stackable GmbH <info@stackable.tech>"]
 license = "OSL-3.0"
-edition = "2021"
+edition = "2024"
 repository = "https://github.com/stackabletech/nifi-operator"
 
 [workspace.dependencies]
 stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.113.4", features = ["webhook"] }
 
 anyhow = "1.0"
-built = { version = "0.8", features = ["chrono", "git2"] }
+built = { version = "0.8.1", features = ["chrono", "git2"] }
 clap = "4.6"
 const_format = "0.2"
 fnv = "1.0"
diff --git a/rust/operator-binary/src/controller/build/jvm.rs b/rust/operator-binary/src/controller/build/jvm.rs
index 070839cc..b6275a07 100644
--- a/rust/operator-binary/src/controller/build/jvm.rs
+++ b/rust/operator-binary/src/controller/build/jvm.rs
@@ -97,16 +97,16 @@ pub fn build_merged_jvm_config(
     // respects these JVM-wide SSL system properties. So there is no plugin-level configuration
     // available for truststore settings. This was last checked for version 1.7.0 of the Styra
     // OPA Java SDK.
-    if let Some(authz_config) = authorization_config {
-        if authz_config.has_opa_tls() {
-            operator_generated.push(format!(
-                "-Djavax.net.ssl.trustStore={STACKABLE_SERVER_TLS_DIR}/truststore.p12"
-            ));
-            operator_generated.push(format!(
-                "-Djavax.net.ssl.trustStorePassword={STACKABLE_TLS_STORE_PASSWORD}"
-            ));
-            operator_generated.push("-Djavax.net.ssl.trustStoreType=pkcs12".to_owned());
-        }
+    if let Some(authz_config) = authorization_config
+        && authz_config.has_opa_tls()
+    {
+        operator_generated.push(format!(
+            "-Djavax.net.ssl.trustStore={STACKABLE_SERVER_TLS_DIR}/truststore.p12"
+        ));
+        operator_generated.push(format!(
+            "-Djavax.net.ssl.trustStorePassword={STACKABLE_TLS_STORE_PASSWORD}"
+        ));
+        operator_generated.push("-Djavax.net.ssl.trustStoreType=pkcs12".to_owned());
     }
 
     Ok(merged_jvm_argument_overrides.apply_to(operator_generated))
diff --git a/rust/operator-binary/src/webhooks/conversion.rs b/rust/operator-binary/src/webhooks/conversion.rs
index 37aadf2b..6981ae86 100644
--- a/rust/operator-binary/src/webhooks/conversion.rs
+++ b/rust/operator-binary/src/webhooks/conversion.rs
@@ -40,7 +40,7 @@ pub async fn create_webhook_server(
         field_manager: FIELD_MANAGER.to_owned(),
     };
 
-    let (conversion_webhook, _initial_reconcile_rx) =
+    let (conversion_webhook, _) =
         ConversionWebhook::new(crds_and_handlers, client, conversion_webhook_options);
 
     let webhook_server_options = WebhookServerOptions {