diff --git a/helm/charts/hive-selfservice-ui-node/templates/deployment.yaml b/helm/charts/hive-selfservice-ui-node/templates/deployment.yaml
index c05eef1bb..4d5c0c34f 100644
--- a/helm/charts/hive-selfservice-ui-node/templates/deployment.yaml
+++ b/helm/charts/hive-selfservice-ui-node/templates/deployment.yaml
@@ -2,8 +2,18 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "hive-selfservice-ui-node.fullname" . }}
+  {{- if .Release.Namespace }}
+  namespace: {{ .Release.Namespace }}
+  {{- end }}
   labels:
 {{ include "hive-selfservice-ui-node.labels" . | indent 4 }}
+    {{- with .Values.deployment.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+  annotations:
+    {{- with .Values.deployment.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
@@ -13,8 +23,14 @@ spec:
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{ include "hive-selfservice-ui-node.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
+{{ include "hive-selfservice-ui-node.labels" . | indent 8 }}
+        {{- with .Values.deployment.labels }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
+      annotations:
+        {{- with .Values.deployment.annotations }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
     {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -53,8 +69,8 @@ spec:
               path: /health
               port: http
           resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-      {{- with .Values.nodeSelector }}
+            {{- toYaml .Values.deployment.resources | nindent 12 }}
+      {{- with .Values.deployment.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
@@ -62,7 +78,7 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
     {{- end }}
-    {{- with .Values.tolerations }}
+    {{- with .Values.deployment.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
     {{- end }}
diff --git a/helm/charts/hive-selfservice-ui-node/values.yaml b/helm/charts/hive-selfservice-ui-node/values.yaml
index 7fc0fb208..f45aca2f8 100644
--- a/helm/charts/hive-selfservice-ui-node/values.yaml
+++ b/helm/charts/hive-selfservice-ui-node/values.yaml
@@ -31,21 +31,38 @@ ingress:
   #    hosts:
   #      - chart-example.local
 
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
+
+deployment:
+  resources: {}
+  #  We usually recommend not to specify default resources and to leave this as a conscious
+  #  choice for the user. This also increases chances charts run on environments with little
+  #  resources, such as Minikube. If you do want to specify resources, uncomment the following
+  #  lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  #  limits:
+  #    cpu: 100m
+  #    memory: 128Mi
+  #  requests:
+  #    cpu: 100m
+  #  memory: 128Mi
+
+  # Node labels for pod assignment.
+  nodeSelector: {}
+  # If you do want to specify node labels, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'annotations:'.
+  #   foo: bar
+
+  # Configure node tolerations.
+  tolerations: []
+
+  labels: {}
+  #      If you do want to specify additional labels, uncomment the following
+  #      lines, adjust them as necessary, and remove the curly braces after 'labels:'.
+  #      e.g.  type: app
+
+  annotations: {}
+  #      If you do want to specify annotations, uncomment the following
+  #      lines, adjust them as necessary, and remove the curly braces after 'annotations:'.
+  #      e.g.  sidecar.istio.io/rewriteAppHTTPProbers: "true"
 
 affinity: {}
 
diff --git a/helm/charts/hive/templates/deployment.yaml b/helm/charts/hive/templates/deployment.yaml
index 0494b8db4..8134dd91f 100644
--- a/helm/charts/hive/templates/deployment.yaml
+++ b/helm/charts/hive/templates/deployment.yaml
@@ -2,16 +2,18 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "hive.fullname" . }}
+  {{- if .Release.Namespace }}
   namespace: {{ .Release.Namespace }}
+  {{- end }}
   labels:
 {{ include "hive.labels" . | indent 4 }}
-{{- with .Values.deployment.labels }}
-    {{- toYaml . | nindent 4 }}
-{{- end }}
-{{- with .Values.deployment.annotations }}
+    {{- with .Values.deployment.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   annotations:
-    {{- toYaml . | nindent 4 }}
-{{- end }}
+    {{- with .Values.deployment.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
@@ -21,15 +23,14 @@ spec:
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{ include "hive.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-      {{- with .Values.deployment.labels }}
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.deployment.annotations }}
+{{ include "hive.labels" . | indent 8 }}
+        {{- with .Values.deployment.labels }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
       annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+        {{- with .Values.deployment.annotations }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
     {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
diff --git a/helm/charts/hydra/templates/deployment.yaml b/helm/charts/hydra/templates/deployment.yaml
index 581884535..79f706c57 100644
--- a/helm/charts/hydra/templates/deployment.yaml
+++ b/helm/charts/hydra/templates/deployment.yaml
@@ -2,16 +2,18 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "hydra.fullname" . }}
+  {{- if .Release.Namespace }}
   namespace: {{ .Release.Namespace }}
+  {{- end }}
   labels:
 {{ include "hydra.labels" . | indent 4 }}
-{{- with .Values.deployment.labels }}
-    {{- toYaml . | nindent 4 }}
-{{- end }}
-{{- with .Values.deployment.annotations }}
+    {{- with .Values.deployment.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   annotations:
-    {{- toYaml . | nindent 4 }}
-{{- end }}
+    {{- with .Values.deployment.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
@@ -21,15 +23,14 @@ spec:
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{ include "hydra.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-      {{- with .Values.deployment.labels }}
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.deployment.annotations }}
+{{ include "hydra.labels" . | indent 8 }}
+        {{- with .Values.deployment.labels }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
       annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+        {{- with .Values.deployment.annotations }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
     {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
diff --git a/helm/charts/oathkeeper/templates/deployment.yaml b/helm/charts/oathkeeper/templates/deployment.yaml
index 6a4b6ca13..4fb4266a4 100644
--- a/helm/charts/oathkeeper/templates/deployment.yaml
+++ b/helm/charts/oathkeeper/templates/deployment.yaml
@@ -8,13 +8,13 @@ metadata:
   {{- end }}
   labels:
 {{ include "oathkeeper.labels" . | indent 4 }}
-{{- with .Values.deployment.labels }}
-    {{- toYaml . | nindent 4 }}
-{{- end }}
-{{- with .Values.deployment.annotations }}
+    {{- with .Values.deployment.labels }}
+        {{- toYaml . | nindent 4 }}
+    {{- end }}
   annotations:
-    {{- toYaml . | nindent 4 }}
-{{- end }}
+    {{- with .Values.deployment.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
@@ -24,15 +24,14 @@ spec:
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{ include "oathkeeper.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-      {{- with .Values.deployment.labels }}
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.deployment.annotations }}
+{{ include "oathkeeper.labels" . | indent 8 }}
+        {{- with .Values.deployment.labels }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
       annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+        {{- with .Values.deployment.annotations }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
     {{- with .Values.imagePullSecrets }}
       imagePullSecrets: