diff --git a/charts/hono/Chart.yaml b/charts/hono/Chart.yaml
index 2be2217c..1ce4a641 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.5.3
+version: 2.5.4
 # Version of Hono being deployed by the chart
 appVersion: 2.4.0
 keywords:
diff --git a/charts/hono/templates/hono-adapter-amqp/hono-adapter-amqp-deployment.yaml b/charts/hono/templates/hono-adapter-amqp/hono-adapter-amqp-deployment.yaml
index 1c61f0b5..2dc81209 100644
--- a/charts/hono/templates/hono-adapter-amqp/hono-adapter-amqp-deployment.yaml
+++ b/charts/hono/templates/hono-adapter-amqp/hono-adapter-amqp-deployment.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.adapters.amqp.enabled }}
 #
-# Copyright (c) 2019, 2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2019, 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -36,6 +36,7 @@ spec:
       {{- end }}
       {{- include "hono.pod.priorityClassName" $args | nindent 6 }}
       {{- include "hono.pod.affinity" $args | nindent 6 }}
+      serviceAccountName: {{ printf "%s-%s" ( include "hono.fullname" . ) "adapter" | quote }}
       containers:
       {{- include "hono.otel.agent" . | indent 6 }}
       {{- include "hono.container" $args | indent 6 }}
diff --git a/charts/hono/templates/hono-adapter-base/hono-adapter-role.yaml b/charts/hono/templates/hono-adapter-base/hono-adapter-role.yaml
new file mode 100644
index 00000000..4c0edc5a
--- /dev/null
+++ b/charts/hono/templates/hono-adapter-base/hono-adapter-role.yaml
@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+{{- $args := dict "dot" . "name" "adapter" }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  {{- include "hono.metadata" $args | nindent 2 }}
+rules:
+  - apiGroups: [""]
+    resources: ["pods"]
+    verbs: ["get"]
diff --git a/charts/hono/templates/hono-adapter-base/hono-adapter-rolebinding.yaml b/charts/hono/templates/hono-adapter-base/hono-adapter-rolebinding.yaml
new file mode 100644
index 00000000..94cc79c4
--- /dev/null
+++ b/charts/hono/templates/hono-adapter-base/hono-adapter-rolebinding.yaml
@@ -0,0 +1,25 @@
+#
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+{{- $args := dict "dot" . "name" "adapter" }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  {{- include "hono.metadata" $args | nindent 2 }}
+roleRef:
+  kind: Role
+  name: {{ printf "%s-%s" ( include "hono.fullname" . ) $args.name | quote }}
+  apiGroup: rbac.authorization.k8s.io
+subjects:
+  - kind: ServiceAccount
+    name: {{ printf "%s-%s" ( include "hono.fullname" . ) $args.name | quote }}
+    namespace: {{ .Release.Namespace }}
diff --git a/charts/hono/templates/hono-adapter-base/hono-adapter-sa.yaml b/charts/hono/templates/hono-adapter-base/hono-adapter-sa.yaml
new file mode 100644
index 00000000..ae86a2e3
--- /dev/null
+++ b/charts/hono/templates/hono-adapter-base/hono-adapter-sa.yaml
@@ -0,0 +1,17 @@
+#
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+{{- $args := dict "dot" . "name" "adapter" }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  {{- include "hono.metadata" $args | nindent 2 }}
diff --git a/charts/hono/templates/hono-adapter-coap/hono-adapter-coap-deployment.yaml b/charts/hono/templates/hono-adapter-coap/hono-adapter-coap-deployment.yaml
index 8e33d804..6501df18 100644
--- a/charts/hono/templates/hono-adapter-coap/hono-adapter-coap-deployment.yaml
+++ b/charts/hono/templates/hono-adapter-coap/hono-adapter-coap-deployment.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.adapters.coap.enabled }}
 #
-# Copyright (c) 2019, 2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2019, 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -36,6 +36,7 @@ spec:
       {{- end }}
       {{- include "hono.pod.priorityClassName" $args | nindent 6 }}
       {{- include "hono.pod.affinity" $args | nindent 6 }}
+      serviceAccountName: {{ printf "%s-%s" ( include "hono.fullname" . ) "adapter" | quote }}
       containers:
       {{- include "hono.otel.agent" . | indent 6 }}
       {{- include "hono.container" $args | indent 6 }}
diff --git a/charts/hono/templates/hono-adapter-http/hono-adapter-http-deployment.yaml b/charts/hono/templates/hono-adapter-http/hono-adapter-http-deployment.yaml
index 53c34ffe..f6aabf68 100644
--- a/charts/hono/templates/hono-adapter-http/hono-adapter-http-deployment.yaml
+++ b/charts/hono/templates/hono-adapter-http/hono-adapter-http-deployment.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.adapters.http.enabled }}
 #
-# Copyright (c) 2019, 2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2019, 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -36,6 +36,7 @@ spec:
       {{- end }}
       {{- include "hono.pod.priorityClassName" $args | nindent 6 }}
       {{- include "hono.pod.affinity" $args | nindent 6 }}
+      serviceAccountName: {{ printf "%s-%s" ( include "hono.fullname" . ) "adapter" | quote }}
       containers:
       {{- include "hono.otel.agent" . | indent 6 }}
       {{- include "hono.container" $args | indent 6 }}
diff --git a/charts/hono/templates/hono-adapter-lora/hono-adapter-lora-deployment.yaml b/charts/hono/templates/hono-adapter-lora/hono-adapter-lora-deployment.yaml
index 47492de1..da028098 100644
--- a/charts/hono/templates/hono-adapter-lora/hono-adapter-lora-deployment.yaml
+++ b/charts/hono/templates/hono-adapter-lora/hono-adapter-lora-deployment.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.adapters.lora.enabled }}
 #
-# Copyright (c) 2019, 2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2019, 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -36,6 +36,7 @@ spec:
       {{- end }}
       {{- include "hono.pod.priorityClassName" $args | nindent 6 }}
       {{- include "hono.pod.affinity" $args | nindent 6 }}
+      serviceAccountName: {{ printf "%s-%s" ( include "hono.fullname" . ) "adapter" | quote }}
       containers:
       {{- include "hono.otel.agent" . | indent 6 }}
       {{- include "hono.container" $args | indent 6 }}
diff --git a/charts/hono/templates/hono-adapter-mqtt/hono-adapter-mqtt-deployment.yaml b/charts/hono/templates/hono-adapter-mqtt/hono-adapter-mqtt-deployment.yaml
index 0df1c1c1..357c6b14 100644
--- a/charts/hono/templates/hono-adapter-mqtt/hono-adapter-mqtt-deployment.yaml
+++ b/charts/hono/templates/hono-adapter-mqtt/hono-adapter-mqtt-deployment.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.adapters.mqtt.enabled }}
 #
-# Copyright (c) 2019, 2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2019, 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -36,6 +36,7 @@ spec:
       {{- end }}
       {{- include "hono.pod.priorityClassName" $args | nindent 6 }}
       {{- include "hono.pod.affinity" $args | nindent 6 }}
+      serviceAccountName: {{ printf "%s-%s" ( include "hono.fullname" . ) "adapter" | quote }}
       containers:
       {{- include "hono.otel.agent" . | indent 6 }}
       {{- include "hono.container" $args | indent 6 }}