diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f34d3b2..9b078edf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,12 +25,18 @@
 - Fix a longstanding problem of including empty `categories`, `shortNames` and `additionalPrinterColumns` in the CRDs,
   which could cause problems with GitOps tools (e.g. ArgoCD) reporting a diff in the custom resources.
   See [our internal issue](https://github.com/stackabletech/hdfs-operator/issues/626) and [the fix](https://github.com/kube-rs/kube/pull/2042) for details ([#792]).
+- BREAKING: The app.kubernetes.io/managed-by label value changed from hbase.stackable.com_hbasecluster to
+  hbase.stackable.tech_hbasecluster, aligning with all other operators ([#795]).
+- BREAKING: The rest-server listener PVC template now carries the recommended labels without the
+  version label, so that the labels stay stable across upgrades.
+  Existing rest-server StatefulSets must be deleted once before the new operator can reconcile them ([#799]).
 
 [#776]: https://github.com/stackabletech/hbase-operator/pull/776
 [#782]: https://github.com/stackabletech/hbase-operator/pull/782
 [#786]: https://github.com/stackabletech/hbase-operator/pull/786
 [#787]: https://github.com/stackabletech/hbase-operator/pull/787
 [#792]: https://github.com/stackabletech/hbase-operator/pull/792
+[#795]: https://github.com/stackabletech/hbase-operator/pull/795
 [#799]: https://github.com/stackabletech/hbase-operator/pull/799
 
 ## [26.7.0] - 2026-07-21
diff --git a/rust/operator-binary/src/controller/build/mod.rs b/rust/operator-binary/src/controller/build/mod.rs
index fd5b49f4..396a38d9 100644
--- a/rust/operator-binary/src/controller/build/mod.rs
+++ b/rust/operator-binary/src/controller/build/mod.rs
@@ -309,7 +309,7 @@ mod tests {
                 ("app.kubernetes.io/instance", "my-hbase".to_string()),
                 (
                     "app.kubernetes.io/managed-by",
-                    "hbase.stackable.com_hbasecluster".to_string(),
+                    "hbase.stackable.tech_hbasecluster".to_string(),
                 ),
                 ("app.kubernetes.io/name", "hbase".to_string()),
                 ("app.kubernetes.io/version", app_version_label("2.6.3")),
diff --git a/rust/operator-binary/src/crd/mod.rs b/rust/operator-binary/src/crd/mod.rs
index 7db85147..ff9d983e 100644
--- a/rust/operator-binary/src/crd/mod.rs
+++ b/rust/operator-binary/src/crd/mod.rs
@@ -45,7 +45,7 @@ pub mod security;
 
 pub const APP_NAME: &str = "hbase";
 pub const FIELD_MANAGER: &str = "hbase-operator";
-pub const HBASE_OPERATOR_NAME: &str = "hbase.stackable.com";
+pub const HBASE_OPERATOR_NAME: &str = "hbase.stackable.tech";
 
 // This constant is hard coded in hbase-entrypoint.sh
 // You need to change it there too.
diff --git a/tests/templates/kuttl/smoke/30-assert.yaml.j2 b/tests/templates/kuttl/smoke/30-assert.yaml.j2
index c4a3d1eb..a29810e0 100644
--- a/tests/templates/kuttl/smoke/30-assert.yaml.j2
+++ b/tests/templates/kuttl/smoke/30-assert.yaml.j2
@@ -11,7 +11,7 @@ metadata:
   labels:
     app.kubernetes.io/component: master
     app.kubernetes.io/instance: test-hbase
-    app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
+    app.kubernetes.io/managed-by: hbase.stackable.tech_hbasecluster
     app.kubernetes.io/name: hbase
     app.kubernetes.io/role-group: default
     stackable.tech/vendor: Stackable
@@ -46,7 +46,7 @@ metadata:
   labels:
     app.kubernetes.io/component: master
     app.kubernetes.io/instance: test-hbase
-    app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
+    app.kubernetes.io/managed-by: hbase.stackable.tech_hbasecluster
     app.kubernetes.io/name: hbase
     app.kubernetes.io/role-group: default
     prometheus.io/scrape: "true"
@@ -73,7 +73,7 @@ metadata:
   labels:
     app.kubernetes.io/component: regionserver
     app.kubernetes.io/instance: test-hbase
-    app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
+    app.kubernetes.io/managed-by: hbase.stackable.tech_hbasecluster
     app.kubernetes.io/name: hbase
     app.kubernetes.io/role-group: default
     stackable.tech/vendor: Stackable
@@ -108,7 +108,7 @@ metadata:
   labels:
     app.kubernetes.io/component: regionserver
     app.kubernetes.io/instance: test-hbase
-    app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
+    app.kubernetes.io/managed-by: hbase.stackable.tech_hbasecluster
     app.kubernetes.io/name: hbase
     app.kubernetes.io/role-group: default
     prometheus.io/scrape: "true"
@@ -135,7 +135,7 @@ metadata:
   labels:
     app.kubernetes.io/component: restserver
     app.kubernetes.io/instance: test-hbase
-    app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
+    app.kubernetes.io/managed-by: hbase.stackable.tech_hbasecluster
     app.kubernetes.io/name: hbase
     app.kubernetes.io/role-group: default
     stackable.tech/vendor: Stackable
@@ -170,7 +170,7 @@ metadata:
   labels:
     app.kubernetes.io/component: restserver
     app.kubernetes.io/instance: test-hbase
-    app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
+    app.kubernetes.io/managed-by: hbase.stackable.tech_hbasecluster
     app.kubernetes.io/name: hbase
     app.kubernetes.io/role-group: default
     prometheus.io/scrape: "true"
@@ -199,7 +199,7 @@ metadata:
   labels:
     app.kubernetes.io/component: master
     app.kubernetes.io/instance: test-hbase
-    app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
+    app.kubernetes.io/managed-by: hbase.stackable.tech_hbasecluster
     app.kubernetes.io/name: hbase
     app.kubernetes.io/role-group: default
     restarter.stackable.tech/enabled: "true"
@@ -224,7 +224,7 @@ spec:
       labels:
         app.kubernetes.io/component: master
         app.kubernetes.io/instance: test-hbase
-        app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
+        app.kubernetes.io/managed-by: hbase.stackable.tech_hbasecluster
         app.kubernetes.io/name: hbase
         app.kubernetes.io/role-group: default
         stackable.tech/vendor: Stackable
@@ -259,6 +259,8 @@ spec:
         - pipefail
         - -c
         env:
+        - name: CONTAINERDEBUG_LOG_DIRECTORY
+          value: /stackable/log/containerdebug
         - name: HADOOP_CONF_DIR
           value: /stackable/conf
         - name: HBASE_CONF_DIR
@@ -268,8 +270,6 @@ spec:
           value: "false"
         - name: STACKABLE_LOG_DIR
           value: /stackable/log
-        - name: CONTAINERDEBUG_LOG_DIRECTORY
-          value: /stackable/log/containerdebug
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 3
@@ -406,7 +406,7 @@ spec:
               labels:
                 app.kubernetes.io/component: master
                 app.kubernetes.io/instance: test-hbase
-                app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
+                app.kubernetes.io/managed-by: hbase.stackable.tech_hbasecluster
                 app.kubernetes.io/name: hbase
                 app.kubernetes.io/role-group: default
                 stackable.tech/vendor: Stackable
@@ -430,7 +430,7 @@ metadata:
   labels:
     app.kubernetes.io/component: regionserver
     app.kubernetes.io/instance: test-hbase
-    app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
+    app.kubernetes.io/managed-by: hbase.stackable.tech_hbasecluster
     app.kubernetes.io/name: hbase
     app.kubernetes.io/role-group: default
     restarter.stackable.tech/enabled: "true"
@@ -450,7 +450,7 @@ spec:
       labels:
         app.kubernetes.io/component: regionserver
         app.kubernetes.io/instance: test-hbase
-        app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
+        app.kubernetes.io/managed-by: hbase.stackable.tech_hbasecluster
         app.kubernetes.io/name: hbase
         app.kubernetes.io/role-group: default
         stackable.tech/vendor: Stackable
@@ -494,6 +494,8 @@ spec:
         - pipefail
         - -c
         env:
+        - name: CONTAINERDEBUG_LOG_DIRECTORY
+          value: /stackable/log/containerdebug
         - name: HADOOP_CONF_DIR
           value: /stackable/conf
         - name: HBASE_CONF_DIR
@@ -503,8 +505,6 @@ spec:
           value: "false"
         - name: STACKABLE_LOG_DIR
           value: /stackable/log
-        - name: CONTAINERDEBUG_LOG_DIRECTORY
-          value: /stackable/log/containerdebug
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 3
@@ -641,7 +641,7 @@ spec:
               labels:
                 app.kubernetes.io/component: regionserver
                 app.kubernetes.io/instance: test-hbase
-                app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
+                app.kubernetes.io/managed-by: hbase.stackable.tech_hbasecluster
                 app.kubernetes.io/name: hbase
                 app.kubernetes.io/role-group: default
                 stackable.tech/vendor: Stackable
@@ -665,7 +665,7 @@ metadata:
   labels:
     app.kubernetes.io/component: restserver
     app.kubernetes.io/instance: test-hbase
-    app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
+    app.kubernetes.io/managed-by: hbase.stackable.tech_hbasecluster
     app.kubernetes.io/name: hbase
     app.kubernetes.io/role-group: default
     restarter.stackable.tech/enabled: "true"
@@ -690,7 +690,7 @@ spec:
       labels:
         app.kubernetes.io/component: restserver
         app.kubernetes.io/instance: test-hbase
-        app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
+        app.kubernetes.io/managed-by: hbase.stackable.tech_hbasecluster
         app.kubernetes.io/name: hbase
         app.kubernetes.io/role-group: default
         stackable.tech/vendor: Stackable
@@ -725,6 +725,8 @@ spec:
         - pipefail
         - -c
         env:
+        - name: CONTAINERDEBUG_LOG_DIRECTORY
+          value: /stackable/log/containerdebug
         - name: HADOOP_CONF_DIR
           value: /stackable/conf
         - name: HBASE_CONF_DIR
@@ -734,8 +736,6 @@ spec:
           value: "false"
         - name: STACKABLE_LOG_DIR
           value: /stackable/log
-        - name: CONTAINERDEBUG_LOG_DIRECTORY
-          value: /stackable/log/containerdebug
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 3
@@ -871,7 +871,7 @@ spec:
       labels:
         app.kubernetes.io/component: restserver
         app.kubernetes.io/instance: test-hbase
-        app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
+        app.kubernetes.io/managed-by: hbase.stackable.tech_hbasecluster
         app.kubernetes.io/name: hbase
         app.kubernetes.io/role-group: default
         stackable.tech/vendor: Stackable
@@ -893,7 +893,7 @@ metadata:
   labels:
     app.kubernetes.io/component: regionserver
     app.kubernetes.io/instance: test-hbase
-    app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
+    app.kubernetes.io/managed-by: hbase.stackable.tech_hbasecluster
     app.kubernetes.io/name: hbase
     stackable.tech/vendor: Stackable
   name: test-hbase
@@ -909,7 +909,7 @@ metadata:
   labels:
     app.kubernetes.io/component: master
     app.kubernetes.io/instance: test-hbase
-    app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
+    app.kubernetes.io/managed-by: hbase.stackable.tech_hbasecluster
     app.kubernetes.io/name: hbase
     app.kubernetes.io/role-group: default
     stackable.tech/vendor: Stackable
@@ -926,7 +926,7 @@ metadata:
   labels:
     app.kubernetes.io/component: regionserver
     app.kubernetes.io/instance: test-hbase
-    app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
+    app.kubernetes.io/managed-by: hbase.stackable.tech_hbasecluster
     app.kubernetes.io/name: hbase
     app.kubernetes.io/role-group: default
     stackable.tech/vendor: Stackable
@@ -943,7 +943,7 @@ metadata:
   labels:
     app.kubernetes.io/component: restserver
     app.kubernetes.io/instance: test-hbase
-    app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
+    app.kubernetes.io/managed-by: hbase.stackable.tech_hbasecluster
     app.kubernetes.io/name: hbase
     app.kubernetes.io/role-group: default
     stackable.tech/vendor: Stackable
@@ -959,7 +959,7 @@ kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/instance: test-hbase
-    app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
+    app.kubernetes.io/managed-by: hbase.stackable.tech_hbasecluster
     app.kubernetes.io/name: hbase
   name: test-hbase-serviceaccount
   ownerReferences:
@@ -973,7 +973,7 @@ kind: RoleBinding
 metadata:
   labels:
     app.kubernetes.io/instance: test-hbase
-    app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
+    app.kubernetes.io/managed-by: hbase.stackable.tech_hbasecluster
     app.kubernetes.io/name: hbase
   name: test-hbase-rolebinding
   ownerReferences:
@@ -1022,7 +1022,7 @@ metadata:
   labels:
     app.kubernetes.io/component: master
     app.kubernetes.io/instance: test-hbase
-    app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
+    app.kubernetes.io/managed-by: hbase.stackable.tech_hbasecluster
     app.kubernetes.io/name: hbase
     app.kubernetes.io/role-group: default
     stackable.tech/vendor: Stackable
@@ -1055,7 +1055,7 @@ metadata:
   labels:
     app.kubernetes.io/component: regionserver
     app.kubernetes.io/instance: test-hbase
-    app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
+    app.kubernetes.io/managed-by: hbase.stackable.tech_hbasecluster
     app.kubernetes.io/name: hbase
     app.kubernetes.io/role-group: default
     stackable.tech/vendor: Stackable
@@ -1088,7 +1088,6 @@ metadata:
   labels:
     app.kubernetes.io/component: restserver
     app.kubernetes.io/instance: test-hbase
-    app.kubernetes.io/managed-by: hbase.stackable.com_hbasecluster
     app.kubernetes.io/name: hbase
     app.kubernetes.io/role-group: default
     stackable.tech/vendor: Stackable