diff --git a/keda/templates/_kedify-helpers.tpl b/keda/templates/_kedify-helpers.tpl
new file mode 100644
index 000000000..42ff02000
--- /dev/null
+++ b/keda/templates/_kedify-helpers.tpl
@@ -0,0 +1,46 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/*
+Kedify-specific template helpers. Kept in a separate file from the upstream
+_helpers.tpl so rebases against kedacore/charts do not conflict here.
+*/}}
+
+{{/*
+Effective KEDA operator name: the configured operator.name, suffixed with the Helm
+release name in multitenant "tenant" mode so multiple tenants sharing a namespace get
+unique, non-colliding resource names. Unchanged in default / non-multitenant mode.
+*/}}
+{{- define "keda.operator.name" -}}
+{{- if eq (default "" (.Values.kedify.multitenant).mode) "tenant" -}}
+{{- printf "%s-%s" .Values.operator.name .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- .Values.operator.name -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Effective KEDA operator ServiceAccount name: the configured serviceAccount.operator.name
+(falling back to serviceAccount.name), suffixed with the Helm release name in multitenant
+"tenant" mode the same way as the operator name so the ServiceAccount stays unique per tenant.
+*/}}
+{{- define "keda.operator.serviceAccountName" -}}
+{{- $base := (.Values.serviceAccount.operator).name | default .Values.serviceAccount.name -}}
+{{- if eq (default "" (.Values.kedify.multitenant).mode) "tenant" -}}
+{{- printf "%s-%s" $base .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $base -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Effective name of the Secret holding the operator's TLS certificates: the configured
+certificates.secretName, suffixed with the Helm release name in multitenant "tenant" mode
+so tenants sharing a namespace do not overwrite each other's certificates.
+*/}}
+{{- define "keda.certificates.secretName" -}}
+{{- if eq (default "" (.Values.kedify.multitenant).mode) "tenant" -}}
+{{- printf "%s-%s" .Values.certificates.secretName .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- .Values.certificates.secretName -}}
+{{- end -}}
+{{- end -}}
diff --git a/keda/templates/cert-manager/keda-issuer.yaml b/keda/templates/cert-manager/keda-issuer.yaml
index 01d92e082..1d4abd0e8 100644
--- a/keda/templates/cert-manager/keda-issuer.yaml
+++ b/keda/templates/cert-manager/keda-issuer.yaml
@@ -6,7 +6,7 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  name: {{ .Values.operator.name }}-issuer
+  name: {{ (include "keda.operator.name" .) }}-issuer
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "keda.labels" . | indent 4 }}
diff --git a/keda/templates/cert-manager/keda-tls-certificate.yaml b/keda/templates/cert-manager/keda-tls-certificate.yaml
index cf6b6b983..293074daa 100644
--- a/keda/templates/cert-manager/keda-tls-certificate.yaml
+++ b/keda/templates/cert-manager/keda-tls-certificate.yaml
@@ -2,23 +2,23 @@
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
-  name: {{ .Values.operator.name }}-tls-certificates
+  name: {{ (include "keda.operator.name" .) }}-tls-certificates
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "keda.labels" . | indent 4 }}
 spec:
-  commonName: {{ .Values.operator.name }}
+  commonName: {{ (include "keda.operator.name" .) }}
   dnsNames:
-  - {{ .Values.operator.name }}.{{ .Release.Namespace }}
-  - {{ .Values.operator.name }}.{{ .Release.Namespace }}.svc
-  - {{ .Values.operator.name }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
-  - {{ .Values.operator.name }}-metrics-apiserver.{{ .Release.Namespace }}
-  - {{ .Values.operator.name }}-metrics-apiserver.{{ .Release.Namespace }}.svc
-  - {{ .Values.operator.name }}-metrics-apiserver.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
+  - {{ (include "keda.operator.name" .) }}.{{ .Release.Namespace }}
+  - {{ (include "keda.operator.name" .) }}.{{ .Release.Namespace }}.svc
+  - {{ (include "keda.operator.name" .) }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
+  - {{ (include "keda.operator.name" .) }}-metrics-apiserver.{{ .Release.Namespace }}
+  - {{ (include "keda.operator.name" .) }}-metrics-apiserver.{{ .Release.Namespace }}.svc
+  - {{ (include "keda.operator.name" .) }}-metrics-apiserver.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
   - {{ .Values.webhooks.name }}.{{ .Release.Namespace }}
   - {{ .Values.webhooks.name }}.{{ .Release.Namespace }}.svc
   - {{ .Values.webhooks.name }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
-  secretName: {{ .Values.certificates.secretName }}
+  secretName: {{ (include "keda.certificates.secretName" .) }}
   secretTemplate:
     {{- toYaml .Values.certificates.certManager.secretTemplate | nindent 4 }}
   usages:
@@ -31,7 +31,7 @@ spec:
   renewBefore: {{ .Values.certificates.certManager.renewBefore }}
   issuerRef:
     {{- if .Values.certificates.certManager.issuer.generate }}
-    name: {{ .Values.operator.name }}-issuer
+    name: {{ (include "keda.operator.name" .) }}-issuer
     kind: Issuer
     group: cert-manager.io
     {{- else }}
diff --git a/keda/templates/cert-manager/self-ca.yaml b/keda/templates/cert-manager/self-ca.yaml
index 70c428817..343c204ad 100644
--- a/keda/templates/cert-manager/self-ca.yaml
+++ b/keda/templates/cert-manager/self-ca.yaml
@@ -2,13 +2,13 @@
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
-  name: {{ .Values.operator.name }}-ca
+  name: {{ (include "keda.operator.name" .) }}-ca
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "keda.labels" . | indent 4 }}
 spec:
   isCA: true
-  commonName: {{ .Values.operator.name }}
+  commonName: {{ (include "keda.operator.name" .) }}
   secretName: {{ .Values.certificates.certManager.caSecretName }}
   secretTemplate:
     {{- toYaml .Values.certificates.certManager.secretTemplate | nindent 4 }}
@@ -18,7 +18,7 @@ spec:
   duration: 43800h0m0s     # 5 years
   renewBefore: 14600h0m0s  # 1.6 year, 1/3rd of the duration
   issuerRef:
-    name: {{ .Values.operator.name }}-selfsigned-issuer
+    name: {{ (include "keda.operator.name" .) }}-selfsigned-issuer
     kind: Issuer
     group: cert-manager.io
 {{- end }}
diff --git a/keda/templates/cert-manager/self-issuer.yaml b/keda/templates/cert-manager/self-issuer.yaml
index c7330da4a..70e2e9fad 100644
--- a/keda/templates/cert-manager/self-issuer.yaml
+++ b/keda/templates/cert-manager/self-issuer.yaml
@@ -6,7 +6,7 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  name: {{ .Values.operator.name }}-selfsigned-issuer
+  name: {{ (include "keda.operator.name" .) }}-selfsigned-issuer
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "keda.labels" . | indent 4 }}
diff --git a/keda/templates/crds/crd-cloudeventsources.yaml b/keda/templates/crds/crd-cloudeventsources.yaml
index 9e7d6e6fc..b28a2d279 100644
--- a/keda/templates/crds/crd-cloudeventsources.yaml
+++ b/keda/templates/crds/crd-cloudeventsources.yaml
@@ -8,7 +8,7 @@ metadata:
     {{- toYaml (merge .Values.crds.additionalAnnotations .Values.additionalAnnotations) | nindent 4 }}
     {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}
     {{- include "keda.crd-labels" . | indent 4 }}
   name: cloudeventsources.eventing.keda.sh
 spec:
diff --git a/keda/templates/crds/crd-clustercloudeventsources.yaml b/keda/templates/crds/crd-clustercloudeventsources.yaml
index 24bb36d37..d6c1db7bb 100644
--- a/keda/templates/crds/crd-clustercloudeventsources.yaml
+++ b/keda/templates/crds/crd-clustercloudeventsources.yaml
@@ -8,7 +8,7 @@ metadata:
     {{- toYaml (merge .Values.crds.additionalAnnotations .Values.additionalAnnotations) | nindent 4 }}
     {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}
     {{- include "keda.crd-labels" . | indent 4 }}
   name: clustercloudeventsources.eventing.keda.sh
 spec:
diff --git a/keda/templates/crds/crd-clustertriggerauthentications.yaml b/keda/templates/crds/crd-clustertriggerauthentications.yaml
index 4e8aa819f..51371337b 100644
--- a/keda/templates/crds/crd-clustertriggerauthentications.yaml
+++ b/keda/templates/crds/crd-clustertriggerauthentications.yaml
@@ -8,7 +8,7 @@ metadata:
     {{- toYaml (merge .Values.crds.additionalAnnotations .Values.additionalAnnotations) | nindent 4 }}
     {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}
     {{- include "keda.crd-labels" . | indent 4 }}
   name: clustertriggerauthentications.keda.sh
 spec:
diff --git a/keda/templates/crds/crd-scaledjobs.yaml b/keda/templates/crds/crd-scaledjobs.yaml
index e3e855096..df1cf1a50 100644
--- a/keda/templates/crds/crd-scaledjobs.yaml
+++ b/keda/templates/crds/crd-scaledjobs.yaml
@@ -8,7 +8,7 @@ metadata:
     {{- toYaml (merge .Values.crds.additionalAnnotations .Values.additionalAnnotations) | nindent 4 }}
     {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}
     {{- include "keda.crd-labels" . | indent 4 }}
   name: scaledjobs.keda.sh
 spec:
diff --git a/keda/templates/crds/crd-scaledobjects.yaml b/keda/templates/crds/crd-scaledobjects.yaml
index 3f06fdb2b..5275234bc 100644
--- a/keda/templates/crds/crd-scaledobjects.yaml
+++ b/keda/templates/crds/crd-scaledobjects.yaml
@@ -8,7 +8,7 @@ metadata:
     {{- toYaml (merge .Values.crds.additionalAnnotations .Values.additionalAnnotations) | nindent 4 }}
     {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}
     {{- include "keda.crd-labels" . | indent 4 }}
   name: scaledobjects.keda.sh
 spec:
diff --git a/keda/templates/crds/crd-scalinggroups.yaml b/keda/templates/crds/crd-scalinggroups.yaml
index d274bc1c3..5defab4c1 100644
--- a/keda/templates/crds/crd-scalinggroups.yaml
+++ b/keda/templates/crds/crd-scalinggroups.yaml
@@ -8,7 +8,7 @@ metadata:
     {{- toYaml (merge .Values.crds.additionalAnnotations .Values.additionalAnnotations) | nindent 4 }}
     {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}
     {{- include "keda.crd-labels" . | indent 4 }}
   name: scalinggroups.keda.kedify.io
 spec:
diff --git a/keda/templates/crds/crd-triggerauthentications.yaml b/keda/templates/crds/crd-triggerauthentications.yaml
index c3cfad6a1..ee416b8ac 100644
--- a/keda/templates/crds/crd-triggerauthentications.yaml
+++ b/keda/templates/crds/crd-triggerauthentications.yaml
@@ -8,7 +8,7 @@ metadata:
     {{- toYaml (merge .Values.crds.additionalAnnotations .Values.additionalAnnotations) | nindent 4 }}
     {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}
     {{- include "keda.crd-labels" . | indent 4 }}
   name: triggerauthentications.keda.sh
 spec:
diff --git a/keda/templates/kedify-agent-secret-rbac.yaml b/keda/templates/kedify-agent-secret-rbac.yaml
index ac6466e16..4fab7595a 100644
--- a/keda/templates/kedify-agent-secret-rbac.yaml
+++ b/keda/templates/kedify-agent-secret-rbac.yaml
@@ -18,7 +18,7 @@ rules:
   resources: ["secrets"]
   verbs: ["get"]
   resourceNames:
-  - {{ .Values.certificates.secretName | quote }}
+  - {{ (include "keda.certificates.secretName" .) | quote }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
diff --git a/keda/templates/kedify-tenant-registration-configmap.yaml b/keda/templates/kedify-tenant-registration-configmap.yaml
index f24f42a20..fe6b4cacf 100644
--- a/keda/templates/kedify-tenant-registration-configmap.yaml
+++ b/keda/templates/kedify-tenant-registration-configmap.yaml
@@ -15,11 +15,11 @@ data:
   name: {{ printf "%s/%s" .Release.Namespace .Release.Name | quote }}
   namespace: {{ .Release.Namespace | quote }}
   watchNamespace: {{ .Values.watchNamespace | default .Release.Namespace | quote }}
-  address: {{ .Values.kedify.multitenant.address | default (printf "%s.%s.svc.%s:9666" .Values.operator.name .Release.Namespace .Values.clusterDomain) | quote }}
+  address: {{ .Values.kedify.multitenant.address | default (printf "%s.%s.svc.%s:9666" (include "keda.operator.name" .) .Release.Namespace .Values.clusterDomain) | quote }}
   {{- if .Values.kedify.multitenant.authority }}
   authority: {{ .Values.kedify.multitenant.authority | quote }}
   {{- end }}
-  tlsSecretRef: {{ .Values.certificates.secretName | quote }}
+  tlsSecretRef: {{ (include "keda.certificates.secretName" .) | quote }}
   isDefaultTenant: {{ eq .Values.kedify.multitenant.mode "default" | quote }}
-  operatorDeploymentName: {{ .Values.operator.name | quote }}
+  operatorDeploymentName: {{ (include "keda.operator.name" .) | quote }}
 {{- end }}
diff --git a/keda/templates/manager/ciliumnetworkpolicy.yaml b/keda/templates/manager/ciliumnetworkpolicy.yaml
index 05483873f..0e54bee1f 100644
--- a/keda/templates/manager/ciliumnetworkpolicy.yaml
+++ b/keda/templates/manager/ciliumnetworkpolicy.yaml
@@ -2,21 +2,21 @@
 apiVersion: "cilium.io/v2"
 kind: CiliumNetworkPolicy
 metadata:
-  name: {{ .Values.operator.name }}
+  name: {{ (include "keda.operator.name" .) }}
   namespace: {{ .Release.Namespace }}
   {{- with .Values.additionalAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app: {{ .Values.operator.name }}
-    name: {{ .Values.operator.name }}
-    app.kubernetes.io/name: {{ .Values.operator.name }}
+    app: {{ (include "keda.operator.name" .) }}
+    name: {{ (include "keda.operator.name" .) }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}
     {{- include "keda.labels" . | indent 4 }}
 spec:
   endpointSelector:
     matchLabels:
-      app: {{ .Values.operator.name }}
+      app: {{ (include "keda.operator.name" .) }}
   egress:
     - toEntities:
         - kube-apiserver
diff --git a/keda/templates/manager/clusterrole.yaml b/keda/templates/manager/clusterrole.yaml
index d649dcdda..f66766186 100644
--- a/keda/templates/manager/clusterrole.yaml
+++ b/keda/templates/manager/clusterrole.yaml
@@ -7,9 +7,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}
     {{- include "keda.labels" . | indent 4 }}
-  name: {{ .Values.operator.name }}
+  name: {{ (include "keda.operator.name" .) }}
 rules:
 - apiGroups:
   - ""
@@ -169,7 +169,7 @@ metadata:
   labels:
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
-    app.kubernetes.io/name: {{ .Values.operator.name }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}
     {{- include "keda.labels" . | indent 4 }}
 rules:
 - apiGroups:
@@ -203,7 +203,7 @@ metadata:
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
     rbac.authorization.k8s.io/aggregate-to-view: "true"
-    app.kubernetes.io/name: {{ .Values.operator.name }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}
     {{- include "keda.labels" . | indent 4 }}
 rules:
 - apiGroups:
@@ -238,9 +238,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ $.Values.operator.name }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" $) }}
     {{- include "keda.labels" $ | indent 4 }}
-  name: {{ $.Values.operator.name }}-token-creator-{{ $r.name }}
+  name: {{ (include "keda.operator.name" $) }}-token-creator-{{ $r.name }}
   namespace: {{ $r.namespace }}
 rules:
 - apiGroups:
@@ -260,17 +260,17 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ $.Values.operator.name }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" $) }}
     {{- include "keda.labels" $ | indent 4 }}
-  name: {{ $.Values.operator.name }}-token-creator-{{ $r.name }}
+  name: {{ (include "keda.operator.name" $) }}-token-creator-{{ $r.name }}
   namespace: {{ $r.namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ $.Values.operator.name }}-token-creator-{{ $r.name }}
+  name: {{ (include "keda.operator.name" $) }}-token-creator-{{ $r.name }}
 subjects:
 - kind: ServiceAccount
-  name: {{ $.Values.operator.name }}
+  name: {{ (include "keda.operator.name" $) }}
   namespace: {{ $.Release.Namespace }}
 {{- end }}
 {{- end }}
diff --git a/keda/templates/manager/clusterrolebindings.yaml b/keda/templates/manager/clusterrolebindings.yaml
index bd78e58a6..863fe99a2 100644
--- a/keda/templates/manager/clusterrolebindings.yaml
+++ b/keda/templates/manager/clusterrolebindings.yaml
@@ -8,16 +8,16 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}
     {{- include "keda.labels" . | indent 4 }}
-  name: {{ .Values.operator.name }}
+  name: {{ (include "keda.operator.name" .) }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ .Values.operator.name }}
+  name: {{ (include "keda.operator.name" .) }}
 subjects:
 - kind: ServiceAccount
-  name: {{ (.Values.serviceAccount.operator).name | default .Values.serviceAccount.name }}
+  name: {{ include "keda.operator.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
 {{- else }}
   {{- $namespaces := uniq (append (splitList "," .Values.watchNamespace) .Release.Namespace) -}}
@@ -32,17 +32,17 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ $.Values.operator.name }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" $) }}
     {{- include "keda.labels" $ | indent 4 }}
-  name: {{ $.Values.operator.name }}
+  name: {{ (include "keda.operator.name" $) }}
   namespace: {{ . | trim }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ $.Values.operator.name }}
+  name: {{ (include "keda.operator.name" $) }}
 subjects:
 - kind: ServiceAccount
-  name: {{ ($.Values.serviceAccount.operator).name | default $.Values.serviceAccount.name }}
+  name: {{ include "keda.operator.serviceAccountName" $ }}
   namespace: {{ $.Release.Namespace }}
 ---
   {{- end }}
diff --git a/keda/templates/manager/deployment.yaml b/keda/templates/manager/deployment.yaml
index ac845f3d5..e80907f7e 100644
--- a/keda/templates/manager/deployment.yaml
+++ b/keda/templates/manager/deployment.yaml
@@ -1,16 +1,16 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ .Values.operator.name }}
+  name: {{ (include "keda.operator.name" .) }}
   namespace: {{ .Release.Namespace }}
   {{- with .Values.additionalAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app: {{ .Values.operator.name }}
-    name: {{ .Values.operator.name }}
-    app.kubernetes.io/name: {{ .Values.operator.name }}
+    app: {{ (include "keda.operator.name" .) }}
+    name: {{ (include "keda.operator.name" .) }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}
     {{- include "keda.labels" . | indent 4 }}
 spec:
   revisionHistoryLimit: {{ .Values.operator.revisionHistoryLimit}}
@@ -21,13 +21,13 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app: {{ .Values.operator.name }}
+      app: {{ (include "keda.operator.name" .) }}
   template:
     metadata:
       labels:
-        app: {{ .Values.operator.name }}
-        name: {{ .Values.operator.name }}
-        app.kubernetes.io/name: {{ .Values.operator.name }}
+        app: {{ (include "keda.operator.name" .) }}
+        name: {{ (include "keda.operator.name" .) }}
+        app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}
         {{- include "keda.labels" . | indent 8 }}
         {{- if .Values.podLabels.keda }}
         {{- toYaml .Values.podLabels.keda | nindent 8 }}
@@ -53,7 +53,7 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ (.Values.serviceAccount.operator).name | default .Values.serviceAccount.name }}
+      serviceAccountName: {{ include "keda.operator.serviceAccountName" . }}
       automountServiceAccountToken: {{ kindIs "invalid" (.Values.serviceAccount.operator).automountServiceAccountToken | ternary .Values.serviceAccount.automountServiceAccountToken (.Values.serviceAccount.operator).automountServiceAccountToken }}
       securityContext:
         {{- if .Values.podSecurityContext.operator }}
@@ -62,7 +62,7 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
         {{- end }}
       containers:
-        - name: {{ .Values.operator.name }}
+        - name: {{ (include "keda.operator.name" .) }}
           securityContext:
             {{- if .Values.securityContext.operator }}
             {{- toYaml .Values.securityContext.operator | nindent 12 }}
@@ -84,7 +84,7 @@ spec:
           {{- else if eq .Values.kedify.multitenant.mode "tenant" }}
           {{- /* tenant operators may share a namespace with the default install or other tenants;
                  derive a unique leader-election lock from the (unique) operator name */}}
-          - "--leader-election-id={{ .Values.operator.name }}.keda.sh"
+          - "--leader-election-id={{ (include "keda.operator.name" .) }}.keda.sh"
           {{- end }}
           - "--disable-compression={{ .Values.operator.disableCompression}}"
           - "--zap-log-level={{ .Values.logging.operator.level }}"
@@ -99,9 +99,9 @@ spec:
           {{- end }}
           - "--cert-dir={{ .Values.certificates.mountPath }}"
           - "--enable-cert-rotation={{ and .Values.certificates.autoGenerated ( not .Values.certificates.certManager.enabled ) }}"
-          - "--cert-secret-name={{ .Values.certificates.secretName }}"
-          - "--operator-service-name={{ .Values.operator.name }}"
-          - "--metrics-server-service-name={{ .Values.operator.name }}-metrics-apiserver"
+          - "--cert-secret-name={{ (include "keda.certificates.secretName" .) }}"
+          - "--operator-service-name={{ (include "keda.operator.name" .) }}"
+          - "--metrics-server-service-name={{ (include "keda.operator.name" .) }}-metrics-apiserver"
           - "--webhooks-service-name={{ .Values.webhooks.name }}"
           - "--k8s-cluster-name={{ tpl .Values.clusterName . }}"
           - "--k8s-cluster-domain={{ .Values.clusterDomain }}"
@@ -163,7 +163,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: OPERATOR_NAME
-              value: {{ .Values.operator.name }}
+              value: {{ (include "keda.operator.name" .) }}
             - name: KEDA_HTTP_DEFAULT_TIMEOUT
               value: {{ .Values.http.timeout | quote }}
             - name: KEDA_HTTP_MIN_TLS_VERSION
@@ -225,7 +225,7 @@ spec:
       - name: certificates
         secret:
           defaultMode: 420
-          secretName: {{ .Values.certificates.secretName }}
+          secretName: {{ (include "keda.certificates.secretName" .) }}
           optional: {{ and .Values.certificates.autoGenerated ( not .Values.certificates.certManager.enabled ) }}
       {{- if .Values.grpcTLSCertsSecret }}
       - name: grpc-certs
diff --git a/keda/templates/manager/kedify-rbac.yaml b/keda/templates/manager/kedify-rbac.yaml
index 85700bc4d..78c21a80e 100644
--- a/keda/templates/manager/kedify-rbac.yaml
+++ b/keda/templates/manager/kedify-rbac.yaml
@@ -7,9 +7,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: "kedify-{{ .Values.operator.name }}-scalinggroups-admin"
+    app.kubernetes.io/name: "kedify-{{ (include "keda.operator.name" .) }}-scalinggroups-admin"
     {{- include "keda.labels" . | indent 4 }}
-  name: kedify-{{ .Values.operator.name }}-scalinggroups-admin
+  name: kedify-{{ (include "keda.operator.name" .) }}-scalinggroups-admin
 rules:
 - apiGroups: ["keda.kedify.io"]
   resources: ["scalinggroups", "scalinggroups/status"]
@@ -23,9 +23,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: "kedify-{{ .Values.operator.name }}-http-admin"
+    app.kubernetes.io/name: "kedify-{{ (include "keda.operator.name" .) }}-http-admin"
     {{- include "keda.labels" . | indent 4 }}
-  name: kedify-{{ .Values.operator.name }}-http-admin
+  name: kedify-{{ (include "keda.operator.name" .) }}-http-admin
 rules:
 - apiGroups: ["http.keda.sh"]
   resources: ["httpscaledobjects"]
@@ -40,16 +40,16 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: kedify-{{ .Values.operator.name }}-scalinggroups-admin
+    app.kubernetes.io/name: kedify-{{ (include "keda.operator.name" .) }}-scalinggroups-admin
     {{- include "keda.labels" . | indent 4 }}
-  name: "kedify-{{ .Values.operator.name }}-scalinggroups-admin"
+  name: "kedify-{{ (include "keda.operator.name" .) }}-scalinggroups-admin"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: "kedify-{{ .Values.operator.name }}-scalinggroups-admin"
+  name: "kedify-{{ (include "keda.operator.name" .) }}-scalinggroups-admin"
 subjects:
 - kind: ServiceAccount
-  name: {{ (.Values.serviceAccount.operator).name | default .Values.serviceAccount.name }}
+  name: {{ include "keda.operator.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -60,16 +60,16 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: kedify-{{ .Values.operator.name }}-http-admin
+    app.kubernetes.io/name: kedify-{{ (include "keda.operator.name" .) }}-http-admin
     {{- include "keda.labels" . | indent 4 }}
-  name: "kedify-{{ .Values.operator.name }}-http-admin"
+  name: "kedify-{{ (include "keda.operator.name" .) }}-http-admin"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: "kedify-{{ .Values.operator.name }}-http-admin"
+  name: "kedify-{{ (include "keda.operator.name" .) }}-http-admin"
 subjects:
 - kind: ServiceAccount
-  name: {{ (.Values.serviceAccount.operator).name | default .Values.serviceAccount.name }}
+  name: {{ include "keda.operator.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
 {{- else }}
   {{- range ( split "," .Values.watchNamespace ) }}
@@ -82,17 +82,17 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: "kedify-{{ $.Values.operator.name }}-scalinggroups-admin"
+    app.kubernetes.io/name: "kedify-{{ (include "keda.operator.name" $) }}-scalinggroups-admin"
     {{- include "keda.labels" $ | indent 4 }}
-  name: "kedify-{{ $.Values.operator.name }}-scalinggroups-admin"
+  name: "kedify-{{ (include "keda.operator.name" $) }}-scalinggroups-admin"
   namespace: {{ . | trim }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: "kedify-{{ $.Values.operator.name }}-scalinggroups-admin"
+  name: "kedify-{{ (include "keda.operator.name" $) }}-scalinggroups-admin"
 subjects:
 - kind: ServiceAccount
-  name: {{ ($.Values.serviceAccount.operator).name | default $.Values.serviceAccount.name }}
+  name: {{ include "keda.operator.serviceAccountName" $ }}
   namespace: {{ $.Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -103,17 +103,17 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: "kedify-{{ $.Values.operator.name }}-http-admin"
+    app.kubernetes.io/name: "kedify-{{ (include "keda.operator.name" $) }}-http-admin"
     {{- include "keda.labels" $ | indent 4 }}
-  name: "kedify-{{ $.Values.operator.name }}-http-admin"
+  name: "kedify-{{ (include "keda.operator.name" $) }}-http-admin"
   namespace: {{ . | trim }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: "kedify-{{ $.Values.operator.name }}-http-admin"
+  name: "kedify-{{ (include "keda.operator.name" $) }}-http-admin"
 subjects:
 - kind: ServiceAccount
-  name: {{ ($.Values.serviceAccount.operator).name | default $.Values.serviceAccount.name }}
+  name: {{ include "keda.operator.serviceAccountName" $ }}
   namespace: {{ $.Release.Namespace }}
 ---
   {{- end }}
diff --git a/keda/templates/manager/minimal-rbac.yaml b/keda/templates/manager/minimal-rbac.yaml
index 3f0e1e2c7..974db1ea8 100644
--- a/keda/templates/manager/minimal-rbac.yaml
+++ b/keda/templates/manager/minimal-rbac.yaml
@@ -7,9 +7,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}-certs
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}-certs
     {{- include "keda.labels" . | indent 4 }}
-  name: {{ .Values.operator.name }}-certs
+  name: {{ (include "keda.operator.name" .) }}-certs
   namespace: {{ .Release.Namespace }}
 rules:
 - apiGroups:
@@ -32,7 +32,7 @@ rules:
   verbs:
   - get
   resourceNames:
-  - {{ .Values.certificates.secretName | quote }}
+  - {{ (include "keda.certificates.secretName" .) | quote }}
 {{- if .Values.permissions.operator.restrict.secret }}
 - apiGroups:
   - ""
@@ -50,7 +50,7 @@ rules:
   verbs:
   - get
   resourceNames:
-  - {{ .Values.certificates.secretName | quote }}
+  - {{ (include "keda.certificates.secretName" .) | quote }}
 - apiGroups:
   - ""
   resources:
@@ -73,17 +73,17 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}-certs
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}-certs
     {{- include "keda.labels" . | indent 4 }}
-  name: {{ .Values.operator.name }}-certs
+  name: {{ (include "keda.operator.name" .) }}-certs
   namespace: {{ .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ .Values.operator.name }}-certs
+  name: {{ (include "keda.operator.name" .) }}-certs
 subjects:
 - kind: ServiceAccount
-  name: {{ (.Values.serviceAccount.operator).name | default .Values.serviceAccount.name }}
+  name: {{ include "keda.operator.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -94,9 +94,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}-minimal-cluster-role
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}-minimal-cluster-role
     {{- include "keda.labels" . | indent 4 }}
-  name: {{ .Values.operator.name }}-minimal-cluster-role
+  name: {{ (include "keda.operator.name" .) }}-minimal-cluster-role
 rules:
 - apiGroups:
   - keda.sh
@@ -153,15 +153,15 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}-minimal
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}-minimal
     {{- include "keda.labels" . | indent 4 }}
-  name: {{ .Values.operator.name }}-minimal
+  name: {{ (include "keda.operator.name" .) }}-minimal
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ .Values.operator.name }}-minimal-cluster-role
+  name: {{ (include "keda.operator.name" .) }}-minimal-cluster-role
 subjects:
 - kind: ServiceAccount
-  name: {{ (.Values.serviceAccount.operator).name | default .Values.serviceAccount.name }}
+  name: {{ include "keda.operator.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
 {{- end }}
diff --git a/keda/templates/manager/networkpolicy.yaml b/keda/templates/manager/networkpolicy.yaml
index 070026bbb..d294391f5 100644
--- a/keda/templates/manager/networkpolicy.yaml
+++ b/keda/templates/manager/networkpolicy.yaml
@@ -2,21 +2,21 @@
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: {{ .Values.operator.name }}
+  name: {{ (include "keda.operator.name" .) }}
   namespace: {{ .Release.Namespace }}
   {{- with .Values.additionalAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app: {{ .Values.operator.name }}
-    name: {{ .Values.operator.name }}
-    app.kubernetes.io/name: {{ .Values.operator.name }}
+    app: {{ (include "keda.operator.name" .) }}
+    name: {{ (include "keda.operator.name" .) }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}
     {{- include "keda.labels" . | indent 4 }}
 spec:
   podSelector:
     matchLabels:
-      app: {{ .Values.operator.name }}
+      app: {{ (include "keda.operator.name" .) }}
   policyTypes:
     - Ingress
     - Egress
diff --git a/keda/templates/manager/poddisruptionbudget.yaml b/keda/templates/manager/poddisruptionbudget.yaml
index dc423b8ba..5769557ba 100644
--- a/keda/templates/manager/poddisruptionbudget.yaml
+++ b/keda/templates/manager/poddisruptionbudget.yaml
@@ -3,13 +3,13 @@ apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   namespace: {{ .Release.Namespace }}
-  name: {{ .Values.operator.name }}
+  name: {{ (include "keda.operator.name" .) }}
   {{- with .Values.additionalAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}
     {{- include "keda.labels" . | indent 4 }}
 spec:
   {{- if .Values.podDisruptionBudget.minAvailable }}
@@ -28,5 +28,5 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app: {{ .Values.operator.name }}
+      app: {{ (include "keda.operator.name" .) }}
 {{- end }}
diff --git a/keda/templates/manager/podmonitor.yaml b/keda/templates/manager/podmonitor.yaml
index 39f37864a..88d031d68 100644
--- a/keda/templates/manager/podmonitor.yaml
+++ b/keda/templates/manager/podmonitor.yaml
@@ -2,13 +2,13 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
-  name: {{ .Values.operator.name }}
+  name: {{ (include "keda.operator.name" .) }}
   {{- with .Values.additionalAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}
     {{- include "keda.labels" . | indent 4 }}
     {{- range $key, $value := .Values.prometheus.operator.podMonitor.additionalLabels }}
     {{ $key }}: {{ $value | quote }}
@@ -39,5 +39,5 @@ spec:
     - {{ .Release.Namespace }}
   selector:
     matchLabels:
-      app: {{ .Values.operator.name }}
+      app: {{ (include "keda.operator.name" .) }}
 {{- end }}
diff --git a/keda/templates/manager/prometheusrules.yaml b/keda/templates/manager/prometheusrules.yaml
index d117ca139..f6f66cad9 100644
--- a/keda/templates/manager/prometheusrules.yaml
+++ b/keda/templates/manager/prometheusrules.yaml
@@ -2,13 +2,13 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  name: {{ .Values.operator.name }}
+  name: {{ (include "keda.operator.name" .) }}
   {{- with .Values.additionalAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}
     {{- include "keda.labels" . | indent 4 }}
     {{- range $key, $value := .Values.prometheus.operator.prometheusRules.additionalLabels }}
     {{ $key }}: {{ $value | quote }}
@@ -18,7 +18,7 @@ metadata:
   {{- end }}
 spec:
   groups:
-  - name: {{ .Values.operator.name }}
+  - name: {{ (include "keda.operator.name" .) }}
     rules:
 {{ toYaml .Values.prometheus.operator.prometheusRules.alerts | indent 6 }}
 {{- end }}
diff --git a/keda/templates/manager/service.yaml b/keda/templates/manager/service.yaml
index 3d111af00..6362cda5f 100644
--- a/keda/templates/manager/service.yaml
+++ b/keda/templates/manager/service.yaml
@@ -20,9 +20,9 @@ metadata:
     {{- end }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}
     {{- include "keda.labels" . | indent 4 }}
-  name: {{ .Values.operator.name }}
+  name: {{ (include "keda.operator.name" .) }}
   namespace: {{ .Release.Namespace }}
 spec:
   ports:
@@ -43,4 +43,4 @@ spec:
     targetPort: {{ .Values.profiling.operator.port }}
   {{- end }}
   selector:
-    app: {{ .Values.operator.name }}
+    app: {{ (include "keda.operator.name" .) }}
diff --git a/keda/templates/manager/serviceaccount.yaml b/keda/templates/manager/serviceaccount.yaml
index 6449adaf2..aadea4aeb 100644
--- a/keda/templates/manager/serviceaccount.yaml
+++ b/keda/templates/manager/serviceaccount.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    app.kubernetes.io/name: {{ (.Values.serviceAccount.operator).name | default .Values.serviceAccount.name }}
+    app.kubernetes.io/name: {{ include "keda.operator.serviceAccountName" . }}
     {{- if .Values.podIdentity.azureWorkload.enabled }}
     azure.workload.identity/use: "true"
     {{- end }}
@@ -43,7 +43,7 @@ metadata:
     {{- toYaml ((.Values.serviceAccount.operator).annotations | default .Values.serviceAccount.annotations) | nindent 4}}
     {{- end }}
   {{- end }}
-  name: {{ (.Values.serviceAccount.operator).name | default .Values.serviceAccount.name }}
+  name: {{ include "keda.operator.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
 automountServiceAccountToken: {{ kindIs "invalid" (.Values.serviceAccount.operator).automountServiceAccountToken | ternary .Values.serviceAccount.automountServiceAccountToken (.Values.serviceAccount.operator).automountServiceAccountToken }}
 {{- end -}}
diff --git a/keda/templates/manager/servicemonitor.yaml b/keda/templates/manager/servicemonitor.yaml
index 730a7c8b6..cb23945f2 100644
--- a/keda/templates/manager/servicemonitor.yaml
+++ b/keda/templates/manager/servicemonitor.yaml
@@ -2,13 +2,13 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ .Values.operator.name }}
+  name: {{ (include "keda.operator.name" .) }}
   {{- with .Values.additionalAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}
     {{- include "keda.labels" . | indent 4 }}
     {{- range $key, $value := .Values.prometheus.operator.serviceMonitor.additionalLabels }}
     {{ $key }}: {{ $value | quote }}
@@ -65,5 +65,5 @@ spec:
     - {{ .Release.Namespace }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ .Values.operator.name }}
+      app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}
 {{- end }}
diff --git a/keda/templates/metrics-server/apiservice.yaml b/keda/templates/metrics-server/apiservice.yaml
index 3f8af864b..85f04e792 100644
--- a/keda/templates/metrics-server/apiservice.yaml
+++ b/keda/templates/metrics-server/apiservice.yaml
@@ -8,7 +8,7 @@ metadata:
     {{- if and (not .Values.certificates.certManager.generateCA) .Values.certificates.certManager.issuer.generate }}
     cert-manager.io/inject-ca-from-secret: {{ .Release.Namespace }}/{{ .Values.certificates.certManager.caSecretName }}
     {{- else }}
-    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ .Values.operator.name }}-tls-certificates
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ (include "keda.operator.name" .) }}-tls-certificates
     {{- end }}
     {{- end }}
     {{- if .Values.additionalAnnotations }}
@@ -21,7 +21,7 @@ metadata:
   name: v1beta1.external.metrics.k8s.io
 spec:
   service:
-    name: {{ .Values.operator.name }}-metrics-apiserver
+    name: {{ (include "keda.operator.name" .) }}-metrics-apiserver
     namespace: {{ .Release.Namespace }}
     port: {{ .Values.service.portHttps }}
   group: external.metrics.k8s.io
diff --git a/keda/templates/metrics-server/ciliumnetworkpolicy.yaml b/keda/templates/metrics-server/ciliumnetworkpolicy.yaml
index 35f3a8c27..c284d957d 100644
--- a/keda/templates/metrics-server/ciliumnetworkpolicy.yaml
+++ b/keda/templates/metrics-server/ciliumnetworkpolicy.yaml
@@ -2,20 +2,20 @@
 apiVersion: "cilium.io/v2"
 kind: CiliumNetworkPolicy
 metadata:
-  name: {{ .Values.operator.name }}-metrics-apiserver
+  name: {{ (include "keda.operator.name" .) }}-metrics-apiserver
   namespace: {{ .Release.Namespace }}
   {{- with .Values.additionalAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app: {{ .Values.operator.name }}-metrics-apiserver
-    app.kubernetes.io/name: {{ .Values.operator.name }}-metrics-apiserver
+    app: {{ (include "keda.operator.name" .) }}-metrics-apiserver
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}-metrics-apiserver
     {{- include "keda.labels" . | indent 4 }}
 spec:
   endpointSelector:
     matchLabels:
-      app: {{ .Values.operator.name }}-metrics-apiserver
+      app: {{ (include "keda.operator.name" .) }}-metrics-apiserver
   egress:
     - toEntities:
         - kube-apiserver
diff --git a/keda/templates/metrics-server/clusterrole.yaml b/keda/templates/metrics-server/clusterrole.yaml
index e859d78cd..03c666336 100644
--- a/keda/templates/metrics-server/clusterrole.yaml
+++ b/keda/templates/metrics-server/clusterrole.yaml
@@ -7,9 +7,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}-external-metrics-reader
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}-external-metrics-reader
     {{- include "keda.labels" . | indent 4 }}
-  name: {{ .Values.operator.name }}-external-metrics-reader
+  name: {{ (include "keda.operator.name" .) }}-external-metrics-reader
 rules:
 - apiGroups:
   - external.metrics.k8s.io
diff --git a/keda/templates/metrics-server/clusterrolebinding.yaml b/keda/templates/metrics-server/clusterrolebinding.yaml
index 7f8119592..282b1e1aa 100644
--- a/keda/templates/metrics-server/clusterrolebinding.yaml
+++ b/keda/templates/metrics-server/clusterrolebinding.yaml
@@ -7,9 +7,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}-system-auth-delegator
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}-system-auth-delegator
     {{- include "keda.labels" . | indent 4 }}
-  name: {{ .Values.operator.name }}-system-auth-delegator
+  name: {{ (include "keda.operator.name" .) }}-system-auth-delegator
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -28,9 +28,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}-auth-reader
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}-auth-reader
     {{- include "keda.labels" . | indent 4 }}
-  name: {{ .Values.operator.name }}-auth-reader
+  name: {{ (include "keda.operator.name" .) }}-auth-reader
   namespace: {{ .Values.rbac.controlPlaneServiceAccountsNamespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -49,13 +49,13 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}-hpa-controller-external-metrics
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}-hpa-controller-external-metrics
     {{- include "keda.labels" . | indent 4 }}
-  name: {{ .Values.operator.name }}-hpa-controller-external-metrics
+  name: {{ (include "keda.operator.name" .) }}-hpa-controller-external-metrics
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ .Values.operator.name }}-external-metrics-reader
+  name: {{ (include "keda.operator.name" .) }}-external-metrics-reader
 subjects:
 - kind: ServiceAccount
   name: horizontal-pod-autoscaler
diff --git a/keda/templates/metrics-server/deployment.yaml b/keda/templates/metrics-server/deployment.yaml
index 40666a541..869c56e3a 100644
--- a/keda/templates/metrics-server/deployment.yaml
+++ b/keda/templates/metrics-server/deployment.yaml
@@ -2,15 +2,15 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ .Values.operator.name }}-metrics-apiserver
+  name: {{ (include "keda.operator.name" .) }}-metrics-apiserver
   namespace: {{ .Release.Namespace }}
   {{- with .Values.additionalAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app: {{ .Values.operator.name }}-metrics-apiserver
-    app.kubernetes.io/name: {{ .Values.operator.name }}-metrics-apiserver
+    app: {{ (include "keda.operator.name" .) }}-metrics-apiserver
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}-metrics-apiserver
     {{- include "keda.labels" . | indent 4 }}
 spec:
   revisionHistoryLimit: {{ .Values.metricsServer.revisionHistoryLimit}}
@@ -21,12 +21,12 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app: {{ .Values.operator.name }}-metrics-apiserver
+      app: {{ (include "keda.operator.name" .) }}-metrics-apiserver
   template:
     metadata:
       labels:
-        app: {{ .Values.operator.name }}-metrics-apiserver
-        app.kubernetes.io/name: {{ .Values.operator.name }}-metrics-apiserver
+        app: {{ (include "keda.operator.name" .) }}-metrics-apiserver
+        app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}-metrics-apiserver
         {{- include "keda.labels" . | indent 8 }}
         {{- if .Values.podLabels.metricsAdapter }}
         {{- toYaml .Values.podLabels.metricsAdapter | nindent 8}}
@@ -62,7 +62,7 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
         {{- end }}
       containers:
-        - name: {{ .Values.operator.name }}-metrics-apiserver
+        - name: {{ (include "keda.operator.name" .) }}-metrics-apiserver
           securityContext:
             {{- if .Values.securityContext.metricServer }}
             {{- toYaml .Values.securityContext.metricServer | nindent 12 }}
@@ -136,7 +136,7 @@ spec:
           - --logtostderr=true
           - --stderrthreshold={{ .Values.logging.metricServer.stderrthreshold }}
           - --disable-compression={{ .Values.metricsServer.disableCompression}}
-          - --metrics-service-address={{ .Values.operator.name }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:9666
+          - --metrics-service-address={{ (include "keda.operator.name" .) }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:9666
           - --client-ca-file={{ .Values.certificates.mountPath }}/ca.crt
           - --tls-cert-file={{ .Values.certificates.mountPath }}/tls.crt
           - --tls-private-key-file={{ .Values.certificates.mountPath }}/tls.key
@@ -190,7 +190,7 @@ spec:
       - name: certificates
         secret:
           defaultMode: 420
-          secretName: {{ .Values.certificates.secretName }}
+          secretName: {{ (include "keda.certificates.secretName" .) }}
       {{- if .Values.grpcTLSCertsSecret }}
       - name: grpc-certs
         secret:
diff --git a/keda/templates/metrics-server/kedify-role.yaml b/keda/templates/metrics-server/kedify-role.yaml
index 860470f19..d60f1f978 100644
--- a/keda/templates/metrics-server/kedify-role.yaml
+++ b/keda/templates/metrics-server/kedify-role.yaml
@@ -7,9 +7,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}-metrics-server-kedify
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}-metrics-server-kedify
     {{- include "keda.labels" . | indent 4 }}
-  name: {{ .Values.operator.name }}-metrics-server-kedify
+  name: {{ (include "keda.operator.name" .) }}-metrics-server-kedify
   namespace: {{ .Release.Namespace }}
 rules:
 - apiGroups:
@@ -28,14 +28,14 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}-metrics-server-kedify
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}-metrics-server-kedify
     {{- include "keda.labels" . | indent 4 }}
-  name: {{ .Values.operator.name }}-metrics-server-kedify
+  name: {{ (include "keda.operator.name" .) }}-metrics-server-kedify
   namespace: {{ .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ .Values.operator.name }}-metrics-server-kedify
+  name: {{ (include "keda.operator.name" .) }}-metrics-server-kedify
 subjects:
 - kind: ServiceAccount
   name: {{ (.Values.serviceAccount.metricServer).name | default .Values.serviceAccount.name }}
diff --git a/keda/templates/metrics-server/networkpolicy.yaml b/keda/templates/metrics-server/networkpolicy.yaml
index 647f5c43c..47e6917b2 100644
--- a/keda/templates/metrics-server/networkpolicy.yaml
+++ b/keda/templates/metrics-server/networkpolicy.yaml
@@ -2,20 +2,20 @@
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: {{ .Values.operator.name }}-metrics-apiserver
+  name: {{ (include "keda.operator.name" .) }}-metrics-apiserver
   namespace: {{ .Release.Namespace }}
   {{- with .Values.additionalAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app: {{ .Values.operator.name }}-metrics-apiserver
-    app.kubernetes.io/name: {{ .Values.operator.name }}-metrics-apiserver
+    app: {{ (include "keda.operator.name" .) }}-metrics-apiserver
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}-metrics-apiserver
     {{- include "keda.labels" . | indent 4 }}
 spec:
   podSelector:
     matchLabels:
-      app: {{ .Values.operator.name }}-metrics-apiserver
+      app: {{ (include "keda.operator.name" .) }}-metrics-apiserver
   policyTypes:
     - Ingress
     - Egress
@@ -66,7 +66,7 @@ spec:
     - to:
         - podSelector:
             matchLabels:
-              app: {{ .Values.operator.name }}
+              app: {{ (include "keda.operator.name" .) }}
       ports:
         - protocol: TCP
           port: 9666
diff --git a/keda/templates/metrics-server/poddisruptionbudget.yaml b/keda/templates/metrics-server/poddisruptionbudget.yaml
index 2df8ededb..0a404c0f1 100644
--- a/keda/templates/metrics-server/poddisruptionbudget.yaml
+++ b/keda/templates/metrics-server/poddisruptionbudget.yaml
@@ -3,13 +3,13 @@ apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   namespace: {{ .Release.Namespace }}
-  name: {{ .Values.operator.name }}-metrics-apiserver
+  name: {{ (include "keda.operator.name" .) }}-metrics-apiserver
   {{- with .Values.additionalAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}-metrics-apiserver
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}-metrics-apiserver
     {{- include "keda.labels" . | indent 4 }}
 spec:
   {{- if .Values.podDisruptionBudget.minAvailable }}
@@ -28,6 +28,6 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app: {{ .Values.operator.name }}-metrics-apiserver
+      app: {{ (include "keda.operator.name" .) }}-metrics-apiserver
 {{- end }}
 
diff --git a/keda/templates/metrics-server/podmonitor.yaml b/keda/templates/metrics-server/podmonitor.yaml
index df0cb1dc1..ab8e337bf 100644
--- a/keda/templates/metrics-server/podmonitor.yaml
+++ b/keda/templates/metrics-server/podmonitor.yaml
@@ -2,13 +2,13 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
-  name: {{ .Values.operator.name }}-metrics-apiserver
+  name: {{ (include "keda.operator.name" .) }}-metrics-apiserver
   {{- with .Values.additionalAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}
     {{- include "keda.labels" . | indent 4 }}
     {{- range $key, $value := .Values.prometheus.metricServer.podMonitor.additionalLabels }}
     {{ $key }}: {{ $value | quote }}
@@ -39,5 +39,5 @@ spec:
     - {{ .Release.Namespace }}
   selector:
     matchLabels:
-      app: {{ .Values.operator.name }}-metrics-apiserver
+      app: {{ (include "keda.operator.name" .) }}-metrics-apiserver
 {{- end }}
diff --git a/keda/templates/metrics-server/service.yaml b/keda/templates/metrics-server/service.yaml
index d18a31f92..a982818ba 100644
--- a/keda/templates/metrics-server/service.yaml
+++ b/keda/templates/metrics-server/service.yaml
@@ -3,10 +3,10 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}-metrics-apiserver
-    app: {{ .Values.operator.name }}-metrics-apiserver
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}-metrics-apiserver
+    app: {{ (include "keda.operator.name" .) }}-metrics-apiserver
     {{- include "keda.labels" . | indent 4 }}
-  name: {{ .Values.operator.name }}-metrics-apiserver
+  name: {{ (include "keda.operator.name" .) }}-metrics-apiserver
   namespace: {{ .Release.Namespace }}
   {{- if or .Values.additionalAnnotations .Values.service.annotations (and .Values.prometheus.metricServer.enabled ( not (or .Values.prometheus.metricServer.podMonitor.enabled .Values.prometheus.metricServer.serviceMonitor.enabled )))}}
   annotations:
@@ -48,5 +48,5 @@ spec:
     protocol: TCP
   {{- end }}
   selector:
-    app: {{ .Values.operator.name }}-metrics-apiserver
+    app: {{ (include "keda.operator.name" .) }}-metrics-apiserver
 {{- end }}
diff --git a/keda/templates/metrics-server/servicemonitor.yaml b/keda/templates/metrics-server/servicemonitor.yaml
index fd34b27f3..c3f40d181 100644
--- a/keda/templates/metrics-server/servicemonitor.yaml
+++ b/keda/templates/metrics-server/servicemonitor.yaml
@@ -2,13 +2,13 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ .Values.operator.name }}-metrics-apiserver
+  name: {{ (include "keda.operator.name" .) }}-metrics-apiserver
   {{- with .Values.additionalAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}
     {{- include "keda.labels" . | indent 4 }}
     {{- range $key, $value := .Values.prometheus.metricServer.serviceMonitor.additionalLabels }}
     {{ $key }}: {{ $value | quote }}
@@ -65,5 +65,5 @@ spec:
     - {{ .Release.Namespace }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ .Values.operator.name }}-metrics-apiserver
+      app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}-metrics-apiserver
 {{- end }}
diff --git a/keda/templates/webhooks/clusterrole.yaml b/keda/templates/webhooks/clusterrole.yaml
index d34eadd2a..d0b898332 100644
--- a/keda/templates/webhooks/clusterrole.yaml
+++ b/keda/templates/webhooks/clusterrole.yaml
@@ -7,9 +7,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}-webhook
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}-webhook
     {{- include "keda.labels" . | indent 4 }}
-  name: {{ .Values.operator.name }}-webhook
+  name: {{ (include "keda.operator.name" .) }}-webhook
 rules:
 - apiGroups:
   - autoscaling
diff --git a/keda/templates/webhooks/clusterrolebindings.yaml b/keda/templates/webhooks/clusterrolebindings.yaml
index dcfa9f7bc..e0cce518c 100644
--- a/keda/templates/webhooks/clusterrolebindings.yaml
+++ b/keda/templates/webhooks/clusterrolebindings.yaml
@@ -7,13 +7,13 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ .Values.operator.name }}-webhook
+    app.kubernetes.io/name: {{ (include "keda.operator.name" .) }}-webhook
     {{- include "keda.labels" . | indent 4 }}
-  name: {{ .Values.operator.name }}-webhook
+  name: {{ (include "keda.operator.name" .) }}-webhook
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ .Values.operator.name }}-webhook
+  name: {{ (include "keda.operator.name" .) }}-webhook
 subjects:
 - kind: ServiceAccount
   name: {{ (.Values.serviceAccount.webhooks).name | default .Values.serviceAccount.name }}
diff --git a/keda/templates/webhooks/deployment.yaml b/keda/templates/webhooks/deployment.yaml
index 992ac69b4..08a29c97c 100644
--- a/keda/templates/webhooks/deployment.yaml
+++ b/keda/templates/webhooks/deployment.yaml
@@ -150,7 +150,7 @@ spec:
       - name: certificates
         secret:
           defaultMode: 420
-          secretName: {{ .Values.certificates.secretName }}
+          secretName: {{ (include "keda.certificates.secretName" .) }}
       {{- if .Values.volumes.webhooks.extraVolumes }}
       {{- toYaml .Values.volumes.webhooks.extraVolumes | nindent 6 }}
       {{- end }}
diff --git a/keda/templates/webhooks/validatingconfiguration.yaml b/keda/templates/webhooks/validatingconfiguration.yaml
index 7a7284e66..35e443dc3 100644
--- a/keda/templates/webhooks/validatingconfiguration.yaml
+++ b/keda/templates/webhooks/validatingconfiguration.yaml
@@ -8,7 +8,7 @@ metadata:
     {{- if and (not .Values.certificates.certManager.generateCA) .Values.certificates.certManager.issuer.generate }}
     cert-manager.io/inject-ca-from-secret: {{ .Release.Namespace }}/{{ .Values.certificates.certManager.caSecretName }}
     {{- else }}
-    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ .Values.operator.name }}-tls-certificates
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ (include "keda.operator.name" .) }}-tls-certificates
     {{- end }}
     {{- end }}
     {{- if .Values.additionalAnnotations }}