diff --git a/backend/kustomize/base/database/kustomization.yaml b/backend/kustomize/base/database/kustomization.yaml
index 5971848234bf7baf263e5d05c0d38de3e280d3d4..4f00f0a32ad21a5c1ec0aa19fc18c31e0c472946 100644
--- a/backend/kustomize/base/database/kustomization.yaml
+++ b/backend/kustomize/base/database/kustomization.yaml
@@ -7,4 +7,3 @@ namePrefix: database-
 commonLabels:
   app.kubernetes.io/name: postgresql
   app.kubernetes.io/component: database
-  app.kubernetes.io/managed-by: kustomize
diff --git a/backend/kustomize/base/webserver/kustomization.yaml b/backend/kustomize/base/webserver/kustomization.yaml
index bc21d8802ae2bdec8286a9d730a739c415afa863..fac5e68ce9e095d68b8ff436d4e75009a037caa1 100644
--- a/backend/kustomize/base/webserver/kustomization.yaml
+++ b/backend/kustomize/base/webserver/kustomization.yaml
@@ -7,4 +7,3 @@ namePrefix: webserver-
 commonLabels:
   app.kubernetes.io/name: nodejs
   app.kubernetes.io/component: webserver
-  app.kubernetes.io/managed-by: kustomize
diff --git a/backend/kustomize/overlays/dev/kustomization.yaml b/backend/kustomize/overlays/dev/kustomization.yaml
index 7bec927708491e46352d1fec098d51fac30a321d..4c3b6aa5481fd6824e7513042c54f5a2feb39e51 100644
--- a/backend/kustomize/overlays/dev/kustomization.yaml
+++ b/backend/kustomize/overlays/dev/kustomization.yaml
@@ -2,7 +2,8 @@ kind: Kustomization
 resources:
   - ../../base
 commonLabels:
-  environment: dev
+  eurac.edu/environment: dev
+  app.kubernetes.io/part-of: oetzi
   app.kubernetes.io/managed-by: kustomize
 patchesStrategicMerge:
   - database.deployment.yaml
diff --git a/backend/kustomize/overlays/stg/kustomization.yaml b/backend/kustomize/overlays/stg/kustomization.yaml
index de5533784877a1dc07d8afa61cf9bc15de9f2657..2f6325109b7a0b5dea618994472b6bb2c3ecf692 100644
--- a/backend/kustomize/overlays/stg/kustomization.yaml
+++ b/backend/kustomize/overlays/stg/kustomization.yaml
@@ -3,7 +3,8 @@ resources:
   - ../../base
 namespace: kommul-dev
 commonLabels:
-  environment: stg
+  eurac.edu/environment: dev
+  app.kubernetes.io/part-of: oetzi
   app.kubernetes.io/managed-by: kustomize
 patchesStrategicMerge:
   - database.deployment.yaml