diff --git a/charts/hono/Chart.yaml b/charts/hono/Chart.yaml
index ad913636..7255877b 100755
--- a/charts/hono/Chart.yaml
+++ b/charts/hono/Chart.yaml
@@ -15,7 +15,7 @@ name: hono
 description: |
   Eclipse Hono™ provides remote service interfaces for connecting large numbers of IoT devices to a back end and
   interacting with them in a uniform way regardless of the device communication protocol.
-version: 2.1.4
+version: 2.1.6
 # Version of Hono being deployed by the chart
 appVersion: 2.1.0
 keywords:
diff --git a/charts/hono/templates/_helpers.tpl b/charts/hono/templates/_helpers.tpl
index fb5b1aab..11824864 100644
--- a/charts/hono/templates/_helpers.tpl
+++ b/charts/hono/templates/_helpers.tpl
@@ -102,7 +102,7 @@ The scope passed in is expected to be a dict with keys
 - "component": the value to use for the "app.kubernetes.io/component" label
 */}}
 {{- define "hono.metadata" -}}
-name: {{ printf "%s-%s" .dot.Release.Name .name | quote }}
+name: {{ printf "%s-%s" (include "hono.fullname" .dot ) .name | quote }}
 namespace: {{ .dot.Release.Namespace | quote }}
 labels:
   app.kubernetes.io/name: {{ include "hono.name" .dot | quote }}
@@ -237,7 +237,7 @@ messaging:
 {{- if .dot.Values.amqpMessagingNetworkExample.enabled }}
   name: {{ printf "Hono %s" .component | quote }}
   amqpHostname: "hono-internal"
-  host: {{ printf "%s-dispatch-router" .dot.Release.Name | quote }}
+  host: {{ printf "%s-dispatch-router" ( include "hono.fullname" .dot ) | quote }}
   port: 5673
   keyPath: {{ .dot.Values.adapters.amqpMessagingNetworkSpec.keyPath | quote }}
   certPath: {{ .dot.Values.adapters.amqpMessagingNetworkSpec.certPath | quote }}
@@ -263,7 +263,7 @@ The scope passed in is expected to be a dict with keys
 kafka:
 {{- if .dot.Values.kafkaMessagingClusterExample.enabled }}
   commonClientConfig:
-    {{- $bootstrapServers := printf "%[1]s-%[2]s-0.%[1]s-%[2]s-headless:%d" .dot.Release.Name .dot.Values.kafka.nameOverride ( .dot.Values.kafka.service.ports.client | int ) }}
+    {{- $bootstrapServers := printf "%[1]s-%[2]s-0.%[1]s-%[2]s-headless:%d" ( include "hono.fullname" .dot ) .dot.Values.kafka.nameOverride ( .dot.Values.kafka.service.ports.client | int ) }}
     bootstrap.servers: {{ $bootstrapServers | quote }}
   {{- if eq .dot.Values.kafka.auth.clientProtocol "sasl_tls" }}
     security.protocol: "SASL_SSL"
@@ -321,7 +321,7 @@ The scope passed in is expected to be a dict with keys
 */}}
 {{- define "hono.deviceRegistryExampleClientConfig" -}}
 name: {{ printf "Hono %s" .component | quote }}
-host: {{ printf "%s-service-device-registry" .dot.Release.Name | quote }}
+host: {{ printf "%s-service-device-registry" ( include "hono.fullname" .dot ) | quote }}
 port: 5671
 credentialsPath: "/opt/hono/config/adapter.credentials"
 trustStorePath: {{ .dot.Values.deviceRegistryExample.clientTrustStorePath | default "/opt/hono/tls/ca.crt" | quote }}
@@ -343,7 +343,7 @@ command:
 {{- if .dot.Values.amqpMessagingNetworkExample.enabled }}
   name: {{ printf "Hono %s" $adapter | quote }}
   amqpHostname: "hono-internal"
-  host: {{ printf "%s-dispatch-router" .dot.Release.Name | quote }}
+  host: {{ printf "%s-dispatch-router" ( include "hono.fullname" .dot ) | quote }}
   port: 5673
   keyPath: {{ .dot.Values.adapters.commandAndControlSpec.keyPath | quote }}
   certPath: {{ .dot.Values.adapters.commandAndControlSpec.certPath | quote }}
@@ -384,7 +384,7 @@ commandRouter:
   {{- .dot.Values.adapters.commandRouterSpec | toYaml | nindent 2 }}
 {{- else }}
   name: {{ printf "Hono %s" $adapter | quote }}
-  host: {{ printf "%s-service-command-router" .dot.Release.Name | quote }}
+  host: {{ printf "%s-service-command-router" ( include "hono.fullname" .dot ) | quote }}
   port: 5671
   credentialsPath: "/opt/hono/config/adapter.credentials"
   trustStorePath: {{ .dot.Values.commandRouterService.clientTrustStorePath | default "/opt/hono/tls/ca.crt" | quote }}
@@ -455,7 +455,7 @@ quarkus:
       exporter:
         otlp:
           {{- if .dot.Values.jaegerBackendExample.enabled }}
-          endpoint: {{ printf "http://%s-jaeger-collector:4317" .dot.Release.Name | quote }}
+          endpoint: {{ printf "http://%s-jaeger-collector:4317" ( include "hono.fullname" .dot ) | quote }}
           {{- else }}
           endpoint: "http://127.0.0.1:4317"
           {{- end }}
@@ -526,7 +526,7 @@ The scope passed in is expected to be a dict with keys
 {{- $component := .componentConfig -}}
 {{- $probes := mergeOverwrite ( $global.probes | deepCopy ) ( $component.probes | default dict | deepCopy ) -}}
 {{- $deprecatedLivenessProbeInitialDelaySeconds := default .dot.Values.livenessProbeInitialDelaySeconds .componentConfig.livenessProbeInitialDelaySeconds -}}
-{{- $deprecatedReadinessProbeInitialDelaySeconds := default .dot.Values.readinessProbeInitialDelaySeconds .componentConfig.readinessProbeInitialDelaySeconds -}} 
+{{- $deprecatedReadinessProbeInitialDelaySeconds := default .dot.Values.readinessProbeInitialDelaySeconds .componentConfig.readinessProbeInitialDelaySeconds -}}
 livenessProbe:
   httpGet:
     path: {{ $probes.livenessProbe.httpGet.path }}
@@ -604,22 +604,22 @@ The scope passed in is expected to be a dict with keys
 {{- if ( ne $keySecretName "none" ) }}
 - name: "tls-keys"
   secret:
-    secretName: {{ ternary ( printf "%s-%s-example-keys" .dot.Release.Name .name ) $keySecretName ( eq $keySecretName "example" ) | quote }}
+    secretName: {{ ternary ( printf "%s-%s-example-keys" ( include "hono.fullname" .dot ) .name ) $keySecretName ( eq $keySecretName "example" ) | quote }}
 {{- end }}
 {{- $trustStoreConfigMapName := ( default "none" .componentConfig.tlsTrustStoreConfigMap | toString ) }}
 {{- if ( ne $trustStoreConfigMapName "none" ) }}
 - name: "tls-trust-store"
   configMap:
-    name: {{ ternary ( printf "%s-example-trust-store" .dot.Release.Name ) $trustStoreConfigMapName ( eq $trustStoreConfigMapName "example" ) | quote }}
+    name: {{ ternary ( printf "%s-example-trust-store" ( include "hono.fullname" .dot )) $trustStoreConfigMapName ( eq $trustStoreConfigMapName "example" ) | quote }}
 {{- end }}
 - name: "default-logging-config"
   configMap:
-    name: {{ printf "%s-default-logging-config" .dot.Release.Name | quote }}
+    name: {{ printf "%s-default-logging-config" ( include "hono.fullname" .dot ) | quote }}
     optional: true
 {{- $volumeName := printf "%s-conf" .name }}
 - name: {{ $volumeName | quote }}
   secret:
-    secretName: {{ printf "%s-%s" .dot.Release.Name $volumeName | quote }}
+    secretName: {{ printf "%s-%s" ( include "hono.fullname" .dot ) $volumeName | quote }}
 {{- if and .dot.Values.otelCollectorAgentConfigMap ( not .dot.Values.jaegerBackendExample.enabled ) }}
 - name: "otel-collector-config"
   configMap:
diff --git a/charts/hono/templates/dispatch-router/dispatch-router-route.yaml b/charts/hono/templates/dispatch-router/dispatch-router-route.yaml
index e563ff4e..730d7b8b 100644
--- a/charts/hono/templates/dispatch-router/dispatch-router-route.yaml
+++ b/charts/hono/templates/dispatch-router/dispatch-router-route.yaml
@@ -24,5 +24,5 @@ spec:
     termination: passthrough
   to:
     kind: Service
-    name: {{ .Release.Name }}-dispatch-router-ext
+    name: {{ printf "%s-dispatch-router-ext" ( include "hono.fullname" . ) }}
 {{- end }}
diff --git a/charts/hono/templates/example-data-grid/statefulset.yaml b/charts/hono/templates/example-data-grid/statefulset.yaml
index 6d509c8f..561b95fa 100644
--- a/charts/hono/templates/example-data-grid/statefulset.yaml
+++ b/charts/hono/templates/example-data-grid/statefulset.yaml
@@ -18,7 +18,7 @@ metadata:
   {{- include "hono.metadata" $args | nindent 2 }}
 spec:
   replicas: 1
-  serviceName: {{ printf "%s-%s" .Release.Name $args.name }}
+  serviceName: {{ printf "%s-%s" (include "hono.name" .) $args.name }}
   selector:
     matchLabels:
       {{- include "hono.matchLabels" $args | nindent 6 }}
@@ -43,7 +43,7 @@ spec:
         - name: JDK_JAVA_OPTIONS
           value: "-XX:MinRAMPercentage=85 -XX:MaxRAMPercentage=85"
         - name: JAVA_OPTIONS
-          value: {{ printf "-Djgroups.dns.query=%s-%s" .Release.Name $args.name }}
+          value: {{ printf "-Djgroups.dns.query=%s-%s" (include "hono.name" .) $args.name }}
         ports:
         - name: hotrod
           containerPort: 11222
@@ -74,5 +74,5 @@ spec:
       volumes:
       - name: conf
         configMap:
-          name: {{ printf "%s-%s-conf" .Release.Name $args.name }}
+          name: {{ printf "%s-%s-conf" (include "hono.name" .) $args.name }}
 {{- end }}
diff --git a/charts/hono/templates/hono-adapter-amqp/hono-adapter-amqp-route.yaml b/charts/hono/templates/hono-adapter-amqp/hono-adapter-amqp-route.yaml
index f3479e87..ea7e34de 100644
--- a/charts/hono/templates/hono-adapter-amqp/hono-adapter-amqp-route.yaml
+++ b/charts/hono/templates/hono-adapter-amqp/hono-adapter-amqp-route.yaml
@@ -21,5 +21,5 @@ spec:
     targetPort: amqp
   to:
     kind: Service
-    name: {{ .Release.Name }}-adapter-amqp
+    name: {{ printf "%s-adapter-amqp" ( include "hono.fullname" . ) }}
 {{- end }}
diff --git a/charts/hono/templates/hono-adapter-amqp/hono-adapter-amqp-sec-route.yaml b/charts/hono/templates/hono-adapter-amqp/hono-adapter-amqp-sec-route.yaml
index 57bcb029..dd3ddbf1 100644
--- a/charts/hono/templates/hono-adapter-amqp/hono-adapter-amqp-sec-route.yaml
+++ b/charts/hono/templates/hono-adapter-amqp/hono-adapter-amqp-sec-route.yaml
@@ -23,5 +23,5 @@ spec:
     termination: passthrough
   to:
     kind: Service
-    name: {{ .Release.Name }}-adapter-amqp
+    name: {{ printf "%s-adapter-amqp" ( include "hono.fullname" . ) }}
 {{- end }}
diff --git a/charts/hono/templates/hono-adapter-http/hono-adapter-http-route.yaml b/charts/hono/templates/hono-adapter-http/hono-adapter-http-route.yaml
index db1eff27..313bc54b 100644
--- a/charts/hono/templates/hono-adapter-http/hono-adapter-http-route.yaml
+++ b/charts/hono/templates/hono-adapter-http/hono-adapter-http-route.yaml
@@ -21,5 +21,5 @@ spec:
     targetPort: http
   to:
     kind: Service
-    name: {{ .Release.Name }}-adapter-http
+    name: {{ printf "%s-adapter-http" ( include "hono.fullname" . ) }}
 {{- end }}
diff --git a/charts/hono/templates/hono-adapter-http/hono-adapter-http-sec-route.yaml b/charts/hono/templates/hono-adapter-http/hono-adapter-http-sec-route.yaml
index 04ee6a14..c4941b39 100644
--- a/charts/hono/templates/hono-adapter-http/hono-adapter-http-sec-route.yaml
+++ b/charts/hono/templates/hono-adapter-http/hono-adapter-http-sec-route.yaml
@@ -23,5 +23,5 @@ spec:
     termination: passthrough
   to:
     kind: Service
-    name: {{ .Release.Name }}-adapter-http
+    name: {{ printf "%s-adapter-http" ( include "hono.fullname" . ) }}
 {{- end }}
diff --git a/charts/hono/templates/hono-adapter-lora/hono-adapter-lora-route.yaml b/charts/hono/templates/hono-adapter-lora/hono-adapter-lora-route.yaml
index 54315c9c..cd444fc4 100644
--- a/charts/hono/templates/hono-adapter-lora/hono-adapter-lora-route.yaml
+++ b/charts/hono/templates/hono-adapter-lora/hono-adapter-lora-route.yaml
@@ -21,5 +21,5 @@ spec:
     targetPort: http
   to:
     kind: Service
-    name: {{ .Release.Name }}-adapter-lora
+    name: {{ printf "%s-adapter-lora" ( include "hono.fullname" . ) }}
 {{- end }}
diff --git a/charts/hono/templates/hono-adapter-lora/hono-adapter-lora-sec-route.yaml b/charts/hono/templates/hono-adapter-lora/hono-adapter-lora-sec-route.yaml
index 42c5ff09..cd276266 100644
--- a/charts/hono/templates/hono-adapter-lora/hono-adapter-lora-sec-route.yaml
+++ b/charts/hono/templates/hono-adapter-lora/hono-adapter-lora-sec-route.yaml
@@ -23,5 +23,5 @@ spec:
     termination: passthrough
   to:
     kind: Service
-    name: {{ .Release.Name }}-adapter-lora
+    name: {{ printf "%s-adapter-lora" ( include "hono.fullname" . ) }}
 {{- end }}
diff --git a/charts/hono/templates/hono-adapter-mqtt/hono-adapter-mqtt-route.yaml b/charts/hono/templates/hono-adapter-mqtt/hono-adapter-mqtt-route.yaml
index e5304c3a..b3eea192 100644
--- a/charts/hono/templates/hono-adapter-mqtt/hono-adapter-mqtt-route.yaml
+++ b/charts/hono/templates/hono-adapter-mqtt/hono-adapter-mqtt-route.yaml
@@ -21,5 +21,5 @@ spec:
     targetPort: mqtt
   to:
     kind: Service
-    name: {{ .Release.Name }}-adapter-mqtt
+    name: {{ printf "%s-adapter-mqtt" ( include "hono.fullname" . ) }}
 {{- end }}
diff --git a/charts/hono/templates/hono-adapter-mqtt/hono-adapter-mqtt-sec-route.yaml b/charts/hono/templates/hono-adapter-mqtt/hono-adapter-mqtt-sec-route.yaml
index ee92f7ae..b10db49f 100644
--- a/charts/hono/templates/hono-adapter-mqtt/hono-adapter-mqtt-sec-route.yaml
+++ b/charts/hono/templates/hono-adapter-mqtt/hono-adapter-mqtt-sec-route.yaml
@@ -23,5 +23,5 @@ spec:
     termination: passthrough
   to:
     kind: Service
-    name: {{ .Release.Name }}-adapter-mqtt
+    name: {{ printf "%s-adapter-mqtt" ( include "hono.fullname" . ) }}
 {{- end }}
diff --git a/charts/hono/templates/hono-service-auth/hono-service-auth-route.yaml b/charts/hono/templates/hono-service-auth/hono-service-auth-route.yaml
index fb073bf3..1ba037eb 100644
--- a/charts/hono/templates/hono-service-auth/hono-service-auth-route.yaml
+++ b/charts/hono/templates/hono-service-auth/hono-service-auth-route.yaml
@@ -23,5 +23,5 @@ spec:
     termination: passthrough
   to:
     kind: Service
-    name: {{ .Release.Name }}-service-auth
+    name: {{ printf "%s-service-auth" ( include "hono.fullname" . ) }}
 {{- end }}
diff --git a/charts/hono/templates/hono-service-command-router/hono-service-command-router-deployment.yaml b/charts/hono/templates/hono-service-command-router/hono-service-command-router-deployment.yaml
index 355c8cba..1a2a5de7 100644
--- a/charts/hono/templates/hono-service-command-router/hono-service-command-router-deployment.yaml
+++ b/charts/hono/templates/hono-service-command-router/hono-service-command-router-deployment.yaml
@@ -72,4 +72,4 @@ spec:
         {{- include "hono.component.healthChecks" $args | nindent 8 }}
       volumes:
       {{- include "hono.pod.volumes" $args | indent 6 }}
-      serviceAccountName: {{ printf "%s-%s" .Release.Name $args.name | quote }}
+      serviceAccountName: {{ printf "%s-%s" ( include "hono.fullname" . ) $args.name | quote }}
diff --git a/charts/hono/templates/hono-service-command-router/hono-service-command-router-rolebinding.yaml b/charts/hono/templates/hono-service-command-router/hono-service-command-router-rolebinding.yaml
index 9ccdd020..ab9c0ae3 100644
--- a/charts/hono/templates/hono-service-command-router/hono-service-command-router-rolebinding.yaml
+++ b/charts/hono/templates/hono-service-command-router/hono-service-command-router-rolebinding.yaml
@@ -5,9 +5,9 @@ metadata:
   {{- include "hono.metadata" $args | nindent 2 }}
 roleRef:
   kind: Role
-  name: {{ printf "%s-%s" .Release.Name $args.name | quote }}
+  name: {{ printf "%s-%s" ( include "hono.fullname" . ) $args.name | quote }}
   apiGroup: rbac.authorization.k8s.io
 subjects:
   - kind: ServiceAccount
-    name: {{ printf "%s-%s" .Release.Name $args.name | quote }}
+    name: {{ printf "%s-%s" ( include "hono.fullname" . ) $args.name | quote }}
     namespace: {{ .Release.Namespace }}
diff --git a/charts/hono/templates/hono-service-command-router/hono-service-command-router-route.yaml b/charts/hono/templates/hono-service-command-router/hono-service-command-router-route.yaml
index 08c54e15..931b4f9b 100644
--- a/charts/hono/templates/hono-service-command-router/hono-service-command-router-route.yaml
+++ b/charts/hono/templates/hono-service-command-router/hono-service-command-router-route.yaml
@@ -21,5 +21,5 @@ spec:
     targetPort: 5671
   to:
     kind: Service
-    name: {{ .Release.Name}}-service-command-router
+    name: {{ printf "%s-service-command-router" ( include "hono.fullname" . ) }}
 {{end}}
diff --git a/charts/hono/templates/hono-service-command-router/hono-service-command-router-secret.yaml b/charts/hono/templates/hono-service-command-router/hono-service-command-router-secret.yaml
index 158912e8..c0a95b45 100644
--- a/charts/hono/templates/hono-service-command-router/hono-service-command-router-secret.yaml
+++ b/charts/hono/templates/hono-service-command-router/hono-service-command-router-secret.yaml
@@ -33,7 +33,7 @@ stringData:
         {{- if .Values.commandRouterService.hono.auth }}
         {{- .Values.commandRouterService.hono.auth | toYaml | nindent 8 }}
         {{- else }}
-        host: {{ printf "%s-service-auth" .Release.Name | quote }}
+        host: {{ printf "%s-service-auth" ( include "hono.fullname" . ) | quote }}
         port: 5671
         trustStorePath: "/opt/hono/tls/ca.crt"
         hostnameVerificationRequired: false
@@ -56,7 +56,7 @@ stringData:
             {{- .Values.dataGridSpec | toYaml | nindent 12 }}
           {{- else if .Values.dataGridExample.enabled }}
           remote:
-            {{- $serverName := printf "%s-data-grid" .Release.Name }}
+            {{- $serverName := printf "%s-data-grid" ( include "hono.fullname" . ) }}
             serverList: {{ printf "%s:11222" $serverName | quote }}
             authServerName: {{ $serverName | quote }}
             authUsername: {{ .Values.dataGridExample.authUsername | quote }}
@@ -82,7 +82,7 @@ stringData:
       {{- if .Values.amqpMessagingNetworkExample.enabled }}
         name: {{ printf "Hono %s" $args.component | quote }}
         amqpHostname: hono-internal
-        host: {{ .Release.Name }}-dispatch-router
+        host: {{ ( include "hono.fullname" . ) }}-dispatch-router
         port: 5673
         keyPath: {{ .Values.adapters.commandAndControlSpec.keyPath }}
         certPath: {{ .Values.adapters.commandAndControlSpec.certPath }}
diff --git a/charts/hono/templates/hono-service-device-registry-base/hono-service-device-registry-amqps-route.yaml b/charts/hono/templates/hono-service-device-registry-base/hono-service-device-registry-amqps-route.yaml
index 4d35f578..d59970f9 100644
--- a/charts/hono/templates/hono-service-device-registry-base/hono-service-device-registry-amqps-route.yaml
+++ b/charts/hono/templates/hono-service-device-registry-base/hono-service-device-registry-amqps-route.yaml
@@ -23,5 +23,5 @@ spec:
     termination: passthrough
   to:
     kind: Service
-    name: {{ .Release.Name }}-service-device-registry
+    name: {{ printf "%s-service-device-registry" ( include "hono.fullname" . ) }}
 {{- end }}
diff --git a/charts/hono/templates/hono-service-device-registry-base/hono-service-device-registry-http-route.yaml b/charts/hono/templates/hono-service-device-registry-base/hono-service-device-registry-http-route.yaml
index 20b0a61c..b896c95a 100644
--- a/charts/hono/templates/hono-service-device-registry-base/hono-service-device-registry-http-route.yaml
+++ b/charts/hono/templates/hono-service-device-registry-base/hono-service-device-registry-http-route.yaml
@@ -21,5 +21,5 @@ spec:
     targetPort: http
   to:
     kind: Service
-    name: {{ .Release.Name }}-service-device-registry
+    name: {{ printf "%s-service-device-registry" ( include "hono.fullname" . ) }}
 {{- end }}
diff --git a/charts/hono/templates/hono-service-device-registry-base/hono-service-device-registry-https-route.yaml b/charts/hono/templates/hono-service-device-registry-base/hono-service-device-registry-https-route.yaml
index eba3e15c..47e113cd 100644
--- a/charts/hono/templates/hono-service-device-registry-base/hono-service-device-registry-https-route.yaml
+++ b/charts/hono/templates/hono-service-device-registry-base/hono-service-device-registry-https-route.yaml
@@ -23,5 +23,5 @@ spec:
     termination: passthrough
   to:
     kind: Service
-    name: {{ .Release.Name }}-service-device-registry
+    name: {{ printf "%s-service-device-registry" ( include "hono.fullname" . ) }}
 {{- end }}
diff --git a/charts/hono/templates/hono-service-device-registry-base/hono-service-device-registry-post-install-job.yaml b/charts/hono/templates/hono-service-device-registry-base/hono-service-device-registry-post-install-job.yaml
index 33709e06..3d9d519a 100644
--- a/charts/hono/templates/hono-service-device-registry-base/hono-service-device-registry-post-install-job.yaml
+++ b/charts/hono/templates/hono-service-device-registry-base/hono-service-device-registry-post-install-job.yaml
@@ -25,7 +25,7 @@ metadata:
 spec:
   template:
     metadata:
-      name: {{ printf "%s-%s" .Release.Name "post-install" | quote }}
+      name: {{ printf "%s-%s" ( include "hono.fullname" . ) "post-install" | quote }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -48,6 +48,6 @@ spec:
       volumes:
       - name: post-install-data
         configMap:
-          name: {{ printf "%s-post-install-device-registry-conf" .Release.Name }}
+          name: {{ printf "%s-post-install-device-registry-conf" ( include "hono.fullname" . ) }}
           defaultMode: 0555
 {{- end }}
diff --git a/charts/hono/templates/hono-service-device-registry-embedded/hono-service-device-registry-secret.yaml b/charts/hono/templates/hono-service-device-registry-embedded/hono-service-device-registry-secret.yaml
index 2cab4a62..7226d521 100644
--- a/charts/hono/templates/hono-service-device-registry-embedded/hono-service-device-registry-secret.yaml
+++ b/charts/hono/templates/hono-service-device-registry-embedded/hono-service-device-registry-secret.yaml
@@ -26,7 +26,7 @@ stringData:
         {{- if .Values.deviceRegistryExample.hono.auth }}
         {{- .Values.deviceRegistryExample.hono.auth | toYaml | nindent 8 }}
         {{- else }}
-        host: {{ printf "%s-service-auth" .Release.Name | quote }}
+        host: {{ printf "%s-service-auth" ( include "hono.fullname" . ) | quote }}
         port: 5671
         trustStorePath: "/opt/hono/tls/ca.crt"
         hostnameVerificationRequired: false
diff --git a/charts/hono/templates/hono-service-device-registry-embedded/hono-service-device-registry-statefulset.yaml b/charts/hono/templates/hono-service-device-registry-embedded/hono-service-device-registry-statefulset.yaml
index 900dfd59..cd85cf1f 100644
--- a/charts/hono/templates/hono-service-device-registry-embedded/hono-service-device-registry-statefulset.yaml
+++ b/charts/hono/templates/hono-service-device-registry-embedded/hono-service-device-registry-statefulset.yaml
@@ -83,5 +83,5 @@ spec:
       {{- include "hono.pod.volumes" ( dict "dot" $args.dot "name" $args.name "componentConfig" .Values.deviceRegistryExample ) | indent 6 }}
       - name: "registry"
         persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name $args.name | quote }}
+          claimName: {{ printf "%s-%s" ( include "hono.fullname" . ) $args.name | quote }}
 {{- end }}
diff --git a/charts/hono/templates/hono-service-device-registry-jdbc/hono-service-device-registry-secret.yaml b/charts/hono/templates/hono-service-device-registry-jdbc/hono-service-device-registry-secret.yaml
index 1698659c..8940d0a7 100644
--- a/charts/hono/templates/hono-service-device-registry-jdbc/hono-service-device-registry-secret.yaml
+++ b/charts/hono/templates/hono-service-device-registry-jdbc/hono-service-device-registry-secret.yaml
@@ -26,7 +26,7 @@ stringData:
         {{- if .Values.deviceRegistryExample.hono.auth }}
         {{- .Values.deviceRegistryExample.hono.auth | toYaml | nindent 8 }}
         {{- else }}
-        host: {{ printf "%s-service-auth" .Release.Name | quote }}
+        host: {{ printf "%s-service-auth" ( include "hono.fullname" . ) | quote }}
         port: 5671
         trustStorePath: "/opt/hono/tls/ca.crt"
         hostnameVerificationRequired: false
diff --git a/charts/hono/templates/hono-service-device-registry-mongodb/hono-service-device-registry-secret.yaml b/charts/hono/templates/hono-service-device-registry-mongodb/hono-service-device-registry-secret.yaml
index 18b059da..5e8109cd 100644
--- a/charts/hono/templates/hono-service-device-registry-mongodb/hono-service-device-registry-secret.yaml
+++ b/charts/hono/templates/hono-service-device-registry-mongodb/hono-service-device-registry-secret.yaml
@@ -26,7 +26,7 @@ stringData:
         {{- if .Values.deviceRegistryExample.hono.auth }}
         {{- .Values.deviceRegistryExample.hono.auth | toYaml | nindent 8 }}
         {{- else }}
-        host: {{ printf "%s-service-auth" .Release.Name | quote }}
+        host: {{ printf "%s-service-auth" ( include "hono.fullname" . ) | quote }}
         port: 5671
         trustStorePath: "/opt/hono/tls/ca.crt"
         hostnameVerificationRequired: false
@@ -63,7 +63,7 @@ stringData:
         {{- if .Values.deviceRegistryExample.mongoDBBasedDeviceRegistry.mongodb}}
         {{- .Values.deviceRegistryExample.mongoDBBasedDeviceRegistry.mongodb | toYaml | nindent 8 }}
         {{- else }}
-        host: {{ printf "%s-%s" .Release.Name .Values.mongodb.nameOverride | quote }}
+        host: {{ printf "%s-%s" ( include "hono.fullname" . ) .Values.mongodb.nameOverride | quote }}
         port: {{ .Values.mongodb.service.port }}
         dbName: {{ first .Values.mongodb.auth.databases | quote }}
         username: {{ first .Values.mongodb.auth.usernames | quote }}
diff --git a/charts/hono/templates/prometheus/prometheus-config.yaml b/charts/hono/templates/prometheus/prometheus-config.yaml
index a5efc9d3..a2d6288c 100644
--- a/charts/hono/templates/prometheus/prometheus-config.yaml
+++ b/charts/hono/templates/prometheus/prometheus-config.yaml
@@ -47,7 +47,7 @@ data:
             - {{ .Release.Namespace }}
           selectors:
           - role: pod
-            label: {{ printf "app.kubernetes.io/instance=%s,helm.sh/chart=%s" .Release.Name ( include "hono.chart" . ) }}
+            label: {{ printf "app.kubernetes.io/instance=%s,helm.sh/chart=%s" ( include "hono.fullname" . ) ( include "hono.chart" . ) }}
 
         relabel_configs:
           - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]