diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6352622b..df365133 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Fixed
+
+- Replace "Release.Name" with "operator.fullname" in Helm resource names ([#131])
+
+[#131]: https://github.com/stackabletech/listener-operator/pull/131
+
 ## [23.11.0] - 2023-11-24
 
 ### Added
diff --git a/deploy/helm/listener-operator/templates/controller-deployment.yaml b/deploy/helm/listener-operator/templates/controller-deployment.yaml
index 32685c1d..d2a23095 100644
--- a/deploy/helm/listener-operator/templates/controller-deployment.yaml
+++ b/deploy/helm/listener-operator/templates/controller-deployment.yaml
@@ -2,7 +2,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ .Release.Name }}-controller-deployment
+  name: {{ include "operator.fullname" . }}-deployment
   labels:
     {{- include "operator.labels" . | nindent 4 }}
 spec:
@@ -24,7 +24,7 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ .Release.Name }}-serviceaccount
+      serviceAccountName: {{ include "operator.fullname" . }}-serviceaccount
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
diff --git a/deploy/helm/listener-operator/templates/node-daemonset.yaml b/deploy/helm/listener-operator/templates/node-daemonset.yaml
index 5883aba8..1dea0218 100644
--- a/deploy/helm/listener-operator/templates/node-daemonset.yaml
+++ b/deploy/helm/listener-operator/templates/node-daemonset.yaml
@@ -2,7 +2,7 @@
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name: {{ .Release.Name }}-node-daemonset
+  name: {{ include "operator.fullname" . }}-node-daemonset
   labels:
     {{- include "operator.labels" . | nindent 4 }}
 spec:
@@ -24,7 +24,7 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ .Release.Name }}-serviceaccount
+      serviceAccountName: {{ include "operator.fullname" . }}-serviceaccount
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
diff --git a/deploy/helm/listener-operator/templates/roles.yaml b/deploy/helm/listener-operator/templates/roles.yaml
index 3c0ec8e7..68b40e05 100644
--- a/deploy/helm/listener-operator/templates/roles.yaml
+++ b/deploy/helm/listener-operator/templates/roles.yaml
@@ -44,7 +44,7 @@ volumes:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ .Release.Name }}-clusterrole
+  name: {{ include "operator.fullname" . }}-clusterrole
 rules:
   - apiGroups:
       - ""