diff --git a/Cargo.lock b/Cargo.lock
index b2197411..1987f1ec 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -334,9 +334,9 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "chacha20"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81"
+checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06"
 dependencies = [
  "cfg-if",
  "cpufeatures 0.3.0",
diff --git a/Cargo.nix b/Cargo.nix
index 8c4a6b3b..716925f2 100644
--- a/Cargo.nix
+++ b/Cargo.nix
@@ -1036,9 +1036,9 @@ rec {
       };
       "chacha20" = rec {
         crateName = "chacha20";
-        version = "0.10.1";
+        version = "0.10.2";
         edition = "2024";
-        sha256 = "108aajbvs3rwl4d0pdvq3p8ydy4pwh0rxy2z265ynwkflrmla96m";
+        sha256 = "01hvvbgdmqkcgs2s4f12s9wa5h2gbq05rqvypv61azlwd55mxhv5";
         authors = [
           "RustCrypto Developers"
         ];
diff --git a/tests/templates/kuttl/orphaned-resources/01-install-hive.yaml.j2 b/tests/templates/kuttl/orphaned-resources/01-install-hive.yaml.j2
index 7464dc42..de25c096 100644
--- a/tests/templates/kuttl/orphaned-resources/01-install-hive.yaml.j2
+++ b/tests/templates/kuttl/orphaned-resources/01-install-hive.yaml.j2
@@ -20,6 +20,9 @@ spec:
 {% endif %}
   metastore:
     config:
+      # A Pod that does not exit before the SIGKILL therefore blocks the listener PVC -> PV -> Listener
+      # finalizer chain long enough for the namespace deletion, and with it the whole test case, to time out.
+      gracefulShutdownTimeout: 5s
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     roleGroups:
diff --git a/tests/templates/kuttl/smoke/60-assert.yaml.j2 b/tests/templates/kuttl/smoke/60-assert.yaml.j2
index d98d3af5..f7bcf438 100644
--- a/tests/templates/kuttl/smoke/60-assert.yaml.j2
+++ b/tests/templates/kuttl/smoke/60-assert.yaml.j2
@@ -208,6 +208,12 @@ spec:
         - pipefail
         - -c
         env:
+        - name: COMMON_VAR
+          value: group-value
+        - name: CONTAINERDEBUG_LOG_DIRECTORY
+          value: /stackable/log/containerdebug
+        - name: GROUP_VAR
+          value: group-value
         - name: HADOOP_HEAPSIZE
           value: "614"
         - name: HADOOP_OPTS
@@ -215,22 +221,16 @@ spec:
             -javaagent:/stackable/jmx/jmx_prometheus_javaagent.jar=9084:/stackable/jmx/jmx_hive_config.yaml
             -Djavax.net.ssl.trustStore=/stackable/truststore.p12 -Djavax.net.ssl.trustStorePassword=changeit
             -Djavax.net.ssl.trustStoreType=pkcs12
-        - name: CONTAINERDEBUG_LOG_DIRECTORY
-          value: /stackable/log/containerdebug
-        - name: METADATA_DATABASE_USERNAME
+        - name: METADATA_DATABASE_PASSWORD
           valueFrom:
             secretKeyRef:
-              key: username
+              key: password
               name: hive-credentials
-        - name: METADATA_DATABASE_PASSWORD
+        - name: METADATA_DATABASE_USERNAME
           valueFrom:
             secretKeyRef:
-              key: password
+              key: username
               name: hive-credentials
-        - name: COMMON_VAR
-          value: group-value
-        - name: GROUP_VAR
-          value: group-value
         - name: ROLE_VAR
           value: role-value
         imagePullPolicy: IfNotPresent