diff --git a/keda/templates/40-cert-manager-self-issuer.yaml b/keda/templates/40-cert-manager-self-issuer.yaml
index 708bedcc5..6e970bb3f 100644
--- a/keda/templates/40-cert-manager-self-issuer.yaml
+++ b/keda/templates/40-cert-manager-self-issuer.yaml
@@ -2,8 +2,10 @@
 apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
+  {{- with $.Values.additionalAnnotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   name: {{ .Values.operator.name }}-selfsigned-issuer
   namespace: {{ .Release.Namespace }}
 spec:
diff --git a/keda/templates/42-cert-manager-keda-issuer.yaml b/keda/templates/42-cert-manager-keda-issuer.yaml
index 54bb1d809..da4ffdb52 100644
--- a/keda/templates/42-cert-manager-keda-issuer.yaml
+++ b/keda/templates/42-cert-manager-keda-issuer.yaml
@@ -2,8 +2,10 @@
 apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
+  {{- with $.Values.additionalAnnotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   name: {{ .Values.operator.name }}-issuer
   namespace: {{ .Release.Namespace }}
 spec:
diff --git a/keda/templates/_helpers.tpl b/keda/templates/_helpers.tpl
index 1fb210c78..d38e92e6a 100644
--- a/keda/templates/_helpers.tpl
+++ b/keda/templates/_helpers.tpl
@@ -10,7 +10,7 @@ Create chart name and version as used by the chart label.
 {{/*
 Generate basic labels
 */}}
-{{- define "keda.labels" }}
+{{- define "keda.labels" -}}
 helm.sh/chart: {{ include "keda.chart" . }}
 app.kubernetes.io/component: operator
 app.kubernetes.io/managed-by: {{ .Release.Service }}
@@ -22,4 +22,4 @@ app.kubernetes.io/version: {{ .Chart.AppVersion }}
 {{- if .Values.additionalLabels }}
 {{ toYaml .Values.additionalLabels }}
 {{- end }}
-{{- end }}
+{{- end -}}
diff --git a/keda/templates/crds/crd-clustertriggerauthentications.yaml b/keda/templates/crds/crd-clustertriggerauthentications.yaml
index fb34fdd19..30b19ab5a 100644
--- a/keda/templates/crds/crd-clustertriggerauthentications.yaml
+++ b/keda/templates/crds/crd-clustertriggerauthentications.yaml
@@ -9,7 +9,7 @@ metadata:
     {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
   name: clustertriggerauthentications.keda.sh
 spec:
   group: keda.sh
diff --git a/keda/templates/crds/crd-scaledjobs.yaml b/keda/templates/crds/crd-scaledjobs.yaml
index 223cd72b0..c24ca4f41 100644
--- a/keda/templates/crds/crd-scaledjobs.yaml
+++ b/keda/templates/crds/crd-scaledjobs.yaml
@@ -9,7 +9,7 @@ metadata:
     {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
   name: scaledjobs.keda.sh
 spec:
   group: keda.sh
diff --git a/keda/templates/crds/crd-scaledobjects.yaml b/keda/templates/crds/crd-scaledobjects.yaml
index bfe2284bd..e79395218 100644
--- a/keda/templates/crds/crd-scaledobjects.yaml
+++ b/keda/templates/crds/crd-scaledobjects.yaml
@@ -9,7 +9,7 @@ metadata:
     {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
   name: scaledobjects.keda.sh
 spec:
   group: keda.sh
diff --git a/keda/templates/crds/crd-triggerauthentications.yaml b/keda/templates/crds/crd-triggerauthentications.yaml
index cb7558a1a..9c5f7ffd4 100644
--- a/keda/templates/crds/crd-triggerauthentications.yaml
+++ b/keda/templates/crds/crd-triggerauthentications.yaml
@@ -9,7 +9,7 @@ metadata:
     {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
   name: triggerauthentications.keda.sh
 spec:
   group: keda.sh
diff --git a/keda/templates/manager/clusterrole.yaml b/keda/templates/manager/clusterrole.yaml
index 8005f26bb..f30c37450 100644
--- a/keda/templates/manager/clusterrole.yaml
+++ b/keda/templates/manager/clusterrole.yaml
@@ -2,11 +2,13 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
+  {{- with $.Values.additionalAnnotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
   creationTimestamp: null
   name: {{ .Values.operator.name }}
 rules:
diff --git a/keda/templates/manager/clusterrolebinding.yaml b/keda/templates/manager/clusterrolebinding.yaml
index 39ad8ee3b..6025e3e34 100644
--- a/keda/templates/manager/clusterrolebinding.yaml
+++ b/keda/templates/manager/clusterrolebinding.yaml
@@ -2,11 +2,13 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
+  {{- with $.Values.additionalAnnotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
   name: {{ .Values.operator.name }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
diff --git a/keda/templates/manager/deployment.yaml b/keda/templates/manager/deployment.yaml
index eafb88153..39f67d509 100644
--- a/keda/templates/manager/deployment.yaml
+++ b/keda/templates/manager/deployment.yaml
@@ -3,13 +3,15 @@ kind: Deployment
 metadata:
   name: {{ .Values.operator.name }}
   namespace: {{ .Release.Namespace }}
+  {{- with $.Values.additionalAnnotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app: {{ .Values.operator.name }}
     name: {{ .Values.operator.name }}
     app.kubernetes.io/name: {{ .Values.operator.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.operator.replicaCount}}
   {{- with .Values.upgradeStrategy.operator }}
@@ -25,7 +27,7 @@ spec:
         app: {{ .Values.operator.name }}
         name: {{ .Values.operator.name }}
         app.kubernetes.io/name: {{ .Values.operator.name }}
-        {{- include "keda.labels" . | indent 8 }}
+        {{- include "keda.labels" . | nindent 8 }}
         {{- if .Values.podIdentity.activeDirectory.identity }}
         aadpodidbinding: {{ .Values.podIdentity.activeDirectory.identity }}
         {{- end }}
@@ -35,6 +37,7 @@ spec:
         {{- if .Values.podIdentity.azureWorkload.enabled }}
         azure.workload.identity/use: "true"
         {{- end }}
+      {{- if or .Values.podAnnotations.keda .Values.additionalAnnotations }}
       annotations:
         {{- if .Values.podAnnotations.keda }}
         {{- toYaml .Values.podAnnotations.keda | nindent 8 }}
@@ -42,6 +45,7 @@ spec:
         {{- if .Values.additionalAnnotations }}
         {{- toYaml .Values.additionalAnnotations | nindent 8 }}
         {{- end }}
+      {{- end }}
     spec:
       {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName | quote }}
@@ -75,7 +79,7 @@ spec:
           - "--zap-encoder={{ .Values.logging.operator.format }}"
           - "--zap-time-encoding={{ .Values.logging.operator.timeEncoding }}"
           - "--cert-dir={{ .Values.certificates.mountPath }}"
-          - "--enable-cert-rotation={{ and .Values.certificates.autoGenerated ( not .Values.certificates.certManager.enabled ) }}"          
+          - "--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"
@@ -129,7 +133,7 @@ spec:
             {{- if .Values.env }}
             {{- toYaml .Values.env | nindent 12 -}}
             {{- end }}
-          volumeMounts:         
+          volumeMounts:
           - mountPath: {{ .Values.certificates.mountPath }}
             name: certificates
             readOnly: true
diff --git a/keda/templates/manager/poddisruptionbudget.yaml b/keda/templates/manager/poddisruptionbudget.yaml
index ccbe1777f..920db93a8 100644
--- a/keda/templates/manager/poddisruptionbudget.yaml
+++ b/keda/templates/manager/poddisruptionbudget.yaml
@@ -4,11 +4,13 @@ kind: PodDisruptionBudget
 metadata:
   namespace: {{ .Release.Namespace }}
   name: {{ .Values.operator.name }}
+  {{- with $.Values.additionalAnnotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.serviceAccount.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
 spec:
   {{- if .Values.podDisruptionBudget.minAvailable }}
   minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}
diff --git a/keda/templates/manager/podmonitor.yaml b/keda/templates/manager/podmonitor.yaml
index 30986ae63..94cc1aa94 100644
--- a/keda/templates/manager/podmonitor.yaml
+++ b/keda/templates/manager/podmonitor.yaml
@@ -3,11 +3,13 @@ apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
   name: {{ .Values.operator.name }}
+  {{- with $.Values.additionalAnnotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
     {{- range $key, $value := .Values.prometheus.operator.podMonitor.additionalLabels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
@@ -27,7 +29,7 @@ spec:
     {{- end }}
     {{- with .Values.prometheus.operator.podMonitor.relabelings }}
     relabelings:
-{{ toYaml . | indent 4 }}
+      {{- toYaml . | nindent 6 }}
     {{- end }}
   namespaceSelector:
     matchNames:
diff --git a/keda/templates/manager/prometheusrules.yaml b/keda/templates/manager/prometheusrules.yaml
index 880b91dd6..c42fadd1e 100644
--- a/keda/templates/manager/prometheusrules.yaml
+++ b/keda/templates/manager/prometheusrules.yaml
@@ -3,11 +3,13 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ .Values.operator.name }}
+  {{- with $.Values.additionalAnnotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
     {{- range $key, $value := .Values.prometheus.operator.prometheusRules.additionalLabels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
@@ -18,5 +20,5 @@ spec:
   groups:
   - name: {{ .Values.operator.name }}
     rules:
-{{ toYaml .Values.prometheus.operator.prometheusRules.alerts | indent 6 }}
+      {{- toYaml .Values.prometheus.operator.prometheusRules.alerts | nindent 6 }}
 {{- end }}
diff --git a/keda/templates/manager/role.yaml b/keda/templates/manager/role.yaml
index f4d177ed7..6b46d486f 100644
--- a/keda/templates/manager/role.yaml
+++ b/keda/templates/manager/role.yaml
@@ -2,11 +2,13 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
+  {{- with $.Values.additionalAnnotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
   creationTimestamp: null
   name: {{ .Values.operator.name }}
   namespace: {{ .Release.Namespace }}
diff --git a/keda/templates/manager/rolebinding.yaml b/keda/templates/manager/rolebinding.yaml
index 0567b523b..e13a34c6c 100644
--- a/keda/templates/manager/rolebinding.yaml
+++ b/keda/templates/manager/rolebinding.yaml
@@ -2,11 +2,13 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
+  {{- with $.Values.additionalAnnotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
   name: {{ .Values.operator.name }}
   namespace: {{ .Release.Namespace }}
 roleRef:
diff --git a/keda/templates/manager/service.yaml b/keda/templates/manager/service.yaml
index 0d9a33046..43037302a 100644
--- a/keda/templates/manager/service.yaml
+++ b/keda/templates/manager/service.yaml
@@ -1,15 +1,15 @@
 apiVersion: v1
 kind: Service
 metadata:
+  {{- if and .Values.prometheus.operator.enabled ( not (or .Values.prometheus.operator.podMonitor.enabled .Values.prometheus.operator.serviceMonitor.enabled )) }}
   annotations:
-    {{- if and .Values.prometheus.operator.enabled ( not (or .Values.prometheus.operator.podMonitor.enabled .Values.prometheus.operator.serviceMonitor.enabled )) }}
     prometheus.io/scrape: "true"
     prometheus.io/port: {{ .Values.prometheus.operator.port | quote }}
     prometheus.io/path: "/metrics"
-    {{- end }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
   name: {{ .Values.operator.name }}
   namespace: {{ .Release.Namespace }}
 spec:
diff --git a/keda/templates/manager/servicemonitor.yaml b/keda/templates/manager/servicemonitor.yaml
index f093a506e..1c01ec814 100644
--- a/keda/templates/manager/servicemonitor.yaml
+++ b/keda/templates/manager/servicemonitor.yaml
@@ -3,11 +3,13 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ .Values.operator.name }}
+  {{- with $.Values.additionalAnnotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
     {{- range $key, $value := .Values.prometheus.operator.serviceMonitor.additionalLabels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
@@ -20,11 +22,11 @@ spec:
   {{- end }}
   {{- with .Values.prometheus.operator.serviceMonitor.targetLabels }}
   targetLabels:
-  {{ toYaml . | indent 4 }}
+  {{- toYaml . | nindent 4 }}
   {{- end }}
   {{- with .Values.prometheus.operator.serviceMonitor.podTargetLabels }}
   podTargetLabels:
-  {{ toYaml . | indent 4 }}
+  {{- toYaml . | nindent 4 }}
   {{- end }}
   endpoints:
   - port: {{ .Values.prometheus.operator.serviceMonitor.port }}
@@ -41,7 +43,7 @@ spec:
     {{- end }}
     {{- with .Values.prometheus.operator.serviceMonitor.relabellings }}
     relabelings:
-    {{ toYaml . | indent 6 }}
+    {{- toYaml . | nindent 6 }}
     {{- end }}
   namespaceSelector:
     matchNames:
diff --git a/keda/templates/metrics-server/apiservice.yaml b/keda/templates/metrics-server/apiservice.yaml
index 1d5b03c8b..0d0420b68 100644
--- a/keda/templates/metrics-server/apiservice.yaml
+++ b/keda/templates/metrics-server/apiservice.yaml
@@ -1,6 +1,7 @@
 apiVersion: apiregistration.k8s.io/v1
 kind: APIService
 metadata:
+  {{- if or .Values.certificates.certManager.enabled .Values.additionalAnnotations }}
   annotations:
     {{- if .Values.certificates.certManager.enabled }}
     {{- if .Values.certificates.certManager.generateCA }}
@@ -9,12 +10,13 @@ metadata:
     cert-manager.io/inject-ca-from-secret: {{ .Release.Namespace }}/{{ .Values.certificates.certManager.caSecretName }}
     {{- end }}
     {{- end }}
-    {{- if .Values.additionalAnnotations }}
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- with .Values.additionalAnnotations }}
+    {{- toYaml . | nindent 4 }}
     {{- end }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: v1beta1.external.metrics.k8s.io
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
   name: v1beta1.external.metrics.k8s.io
 spec:
   service:
diff --git a/keda/templates/metrics-server/clusterrole.yaml b/keda/templates/metrics-server/clusterrole.yaml
index 3063fe180..65671886e 100644
--- a/keda/templates/metrics-server/clusterrole.yaml
+++ b/keda/templates/metrics-server/clusterrole.yaml
@@ -2,11 +2,13 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
+  {{- with $.Values.additionalAnnotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}-external-metrics-reader
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
   creationTimestamp: null
   name: {{ .Values.operator.name }}-external-metrics-reader
 rules:
diff --git a/keda/templates/metrics-server/clusterrolebinding.yaml b/keda/templates/metrics-server/clusterrolebinding.yaml
index d7292e3a6..36f61ecfa 100644
--- a/keda/templates/metrics-server/clusterrolebinding.yaml
+++ b/keda/templates/metrics-server/clusterrolebinding.yaml
@@ -2,11 +2,13 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
+  {{- with $.Values.additionalAnnotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}-system-auth-delegator
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
   name: {{ .Values.operator.name }}-system-auth-delegator
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -20,11 +22,13 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
+  {{- with $.Values.additionalAnnotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}-auth-reader
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
   name: {{ .Values.operator.name }}-auth-reader
   namespace: kube-system
 roleRef:
@@ -39,11 +43,13 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
+  {{- with $.Values.additionalAnnotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}-hpa-controller-external-metrics
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
   name: {{ .Values.operator.name }}-hpa-controller-external-metrics
 roleRef:
   apiGroup: rbac.authorization.k8s.io
diff --git a/keda/templates/metrics-server/deployment.yaml b/keda/templates/metrics-server/deployment.yaml
index 30a6554d3..3ff6bb28a 100644
--- a/keda/templates/metrics-server/deployment.yaml
+++ b/keda/templates/metrics-server/deployment.yaml
@@ -3,12 +3,14 @@ kind: Deployment
 metadata:
   name: {{ .Values.operator.name }}-metrics-apiserver
   namespace: {{ .Release.Namespace }}
+  {{- with $.Values.additionalAnnotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app: {{ .Values.operator.name }}-metrics-apiserver
     app.kubernetes.io/name: {{ .Values.operator.name }}-metrics-apiserver
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.metricsServer.replicaCount }}
   {{- with .Values.upgradeStrategy.metricsApiServer }}
@@ -23,7 +25,7 @@ spec:
       labels:
         app: {{ .Values.operator.name }}-metrics-apiserver
         app.kubernetes.io/name: {{ .Values.operator.name }}-metrics-apiserver
-        {{- include "keda.labels" . | indent 8 }}
+        {{- include "keda.labels" . | nindent 8 }}
         {{- if .Values.podIdentity.activeDirectory.identity }}
         aadpodidbinding: {{ .Values.podIdentity.activeDirectory.identity }}
         {{- end }}
@@ -33,18 +35,20 @@ spec:
         {{- if .Values.podIdentity.azureWorkload.enabled }}
         azure.workload.identity/use: "true"
         {{- end }}
+      {{- if or .Values.additionalAnnotations .Values.podAnnotations.metricsAdapter (and .Values.prometheus.metricServer.enabled ( not (or .Values.prometheus.metricServer.podMonitor.enabled .Values.prometheus.metricServer.serviceMonitor.enabled ))) }}
       annotations:
-        {{- if .Values.additionalAnnotations }}
-        {{- toYaml .Values.additionalAnnotations | nindent 8 }}
+        {{- with .Values.additionalAnnotations }}
+        {{- toYaml . | nindent 8 }}
         {{- end }}
         {{- if and .Values.prometheus.metricServer.enabled ( not (or .Values.prometheus.metricServer.podMonitor.enabled .Values.prometheus.metricServer.serviceMonitor.enabled )) }}
         prometheus.io/scrape: "true"
         prometheus.io/port: {{ .Values.prometheus.metricServer.port | quote }}
         prometheus.io/path: {{ .Values.prometheus.metricServer.path }}
         {{- end }}
-        {{- if .Values.podAnnotations.metricsAdapter }}
-        {{- toYaml .Values.podAnnotations.metricsAdapter | nindent 8}}
+        {{- with .Values.podAnnotations.metricsAdapter }}
+        {{- toYaml . | nindent 8}}
         {{- end }}
+      {{- end }}
     spec:
       {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName | quote }}
diff --git a/keda/templates/metrics-server/poddisruptionbudget.yaml b/keda/templates/metrics-server/poddisruptionbudget.yaml
index 97f12ba40..009c5c803 100644
--- a/keda/templates/metrics-server/poddisruptionbudget.yaml
+++ b/keda/templates/metrics-server/poddisruptionbudget.yaml
@@ -4,11 +4,13 @@ kind: PodDisruptionBudget
 metadata:
   namespace: {{ .Release.Namespace }}
   name: {{ .Values.operator.name }}-metrics-apiserver
+  {{- with $.Values.additionalAnnotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}-metrics-apiserver
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
 spec:
   {{- if .Values.podDisruptionBudget.minAvailable }}
   minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}
diff --git a/keda/templates/metrics-server/podmonitor.yaml b/keda/templates/metrics-server/podmonitor.yaml
index bfcbfb06f..c380b9f74 100644
--- a/keda/templates/metrics-server/podmonitor.yaml
+++ b/keda/templates/metrics-server/podmonitor.yaml
@@ -3,11 +3,13 @@ apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
   name: {{ .Values.operator.name }}-metrics-apiserver
+  {{- with $.Values.additionalAnnotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
     {{- range $key, $value := .Values.prometheus.metricServer.podMonitor.additionalLabels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
@@ -27,7 +29,7 @@ spec:
     {{- end }}
     {{- with .Values.prometheus.metricServer.podMonitor.relabelings }}
     relabelings:
-{{ toYaml . | indent 4 }}
+      {{- toYaml . | nindent 6 }}
     {{- end }}
   namespaceSelector:
     matchNames:
diff --git a/keda/templates/metrics-server/service.yaml b/keda/templates/metrics-server/service.yaml
index 5b64b9526..25f2c068a 100644
--- a/keda/templates/metrics-server/service.yaml
+++ b/keda/templates/metrics-server/service.yaml
@@ -4,13 +4,17 @@ metadata:
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}-metrics-apiserver
     app: {{ .Values.operator.name }}-metrics-apiserver
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
   name: {{ .Values.operator.name }}-metrics-apiserver
   namespace: {{ .Release.Namespace }}
+  {{- if or .Values.additionalAnnotations .Values.service.annotations }}
   annotations:
-  {{- toYaml .Values.additionalAnnotations | nindent 4 }}
-  {{- range $key, $value := .Values.service.annotations }}
-    {{ $key }}: {{ $value | quote }}
+    {{- with $.Values.additionalAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+    {{- with .Values.service.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- end }}
 spec:
   ports:
diff --git a/keda/templates/metrics-server/servicemonitor.yaml b/keda/templates/metrics-server/servicemonitor.yaml
index 8eff6b604..7ce6373d7 100644
--- a/keda/templates/metrics-server/servicemonitor.yaml
+++ b/keda/templates/metrics-server/servicemonitor.yaml
@@ -3,11 +3,13 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ .Values.operator.name }}-metrics-apiserver
+  {{- with $.Values.additionalAnnotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.operator.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
     {{- range $key, $value := .Values.prometheus.metricServer.serviceMonitor.additionalLabels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
@@ -20,11 +22,11 @@ spec:
   {{- end }}
   {{- with .Values.prometheus.metricServer.serviceMonitor.targetLabels }}
   targetLabels:
-  {{ toYaml . | indent 4 }}
+  {{- toYaml . | nindent 4 }}
   {{- end }}
   {{- with .Values.prometheus.metricServer.serviceMonitor.podTargetLabels }}
   podTargetLabels:
-  {{ toYaml . | indent 4 }}
+  {{- toYaml . | nindent 4 }}
   {{- end }}
   endpoints:
   - port: {{ .Values.prometheus.metricServer.portName }}
@@ -41,7 +43,7 @@ spec:
     {{- end }}
     {{- with .Values.prometheus.metricServer.serviceMonitor.relabellings }}
     relabelings:
-    {{ toYaml . | indent 6 }}
+    {{- toYaml . | nindent 6 }}
     {{- end }}
   namespaceSelector:
     matchNames:
diff --git a/keda/templates/serviceaccount.yaml b/keda/templates/serviceaccount.yaml
index 6610f3c9b..d93d1b7e5 100644
--- a/keda/templates/serviceaccount.yaml
+++ b/keda/templates/serviceaccount.yaml
@@ -7,11 +7,11 @@ metadata:
     {{- if .Values.podIdentity.azureWorkload.enabled }}
     azure.workload.identity/use: "true"
     {{- end }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
   {{- if or .Values.podIdentity.azureWorkload.enabled .Values.podIdentity.aws.irsa.enabled .Values.serviceAccount.annotations .Values.podIdentity.gcp.enabled }}
   annotations:
     {{- if .Values.additionalAnnotations }}
-    {{- toYaml .Values.additionalAnnotations | indent 4 }}
+    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
     {{- end }}
     {{- if .Values.podIdentity.azureWorkload.enabled }}
     {{- if .Values.podIdentity.azureWorkload.clientId }}
diff --git a/keda/templates/webhooks/deployment.yaml b/keda/templates/webhooks/deployment.yaml
index 6a621a001..562770477 100644
--- a/keda/templates/webhooks/deployment.yaml
+++ b/keda/templates/webhooks/deployment.yaml
@@ -4,13 +4,15 @@ kind: Deployment
 metadata:
   name: {{ .Values.webhooks.name }}
   namespace: {{ .Release.Namespace }}
+  {{- with $.Values.additionalAnnotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app: {{ .Values.webhooks.name }}
     name: {{ .Values.webhooks.name }}
     app.kubernetes.io/name: {{ .Values.webhooks.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.webhooks.replicaCount}}
   {{- with .Values.upgradeStrategy.webhooks }}
@@ -26,17 +28,19 @@ spec:
         app: {{ .Values.webhooks.name }}
         name: {{ .Values.webhooks.name }}
         app.kubernetes.io/name: {{ .Values.webhooks.name }}
-        {{- include "keda.labels" . | indent 8 }}       
-        {{- if .Values.podLabels.webhooks }}
-        {{- toYaml .Values.podLabels.webhooks | nindent 8 }}
+        {{- include "keda.labels" . | nindent 8 }}
+        {{- with .Values.podLabels.webhooks }}
+        {{- toYaml . | nindent 8 }}
         {{- end }}
+      {{- if or .Values.podAnnotations.webhooks .Values.additionalAnnotations }}
       annotations:
-        {{- if .Values.podAnnotations.webhooks }}
-        {{- toYaml .Values.podAnnotations.webhooks | nindent 8 }}
+        {{- with .Values.podAnnotations.webhooks }}
+        {{- toYaml . | nindent 8 }}
         {{- end }}
-        {{- if .Values.additionalAnnotations }}
-        {{- toYaml .Values.additionalAnnotations | nindent 8 }}
+        {{- with .Values.additionalAnnotations }}
+        {{- toYaml . | nindent 8 }}
         {{- end }}
+      {{- end }}
     spec:
       {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName | quote }}
diff --git a/keda/templates/webhooks/poddisruptionbudget.yaml b/keda/templates/webhooks/poddisruptionbudget.yaml
index 477becb54..606ea3b2b 100644
--- a/keda/templates/webhooks/poddisruptionbudget.yaml
+++ b/keda/templates/webhooks/poddisruptionbudget.yaml
@@ -5,11 +5,13 @@ kind: PodDisruptionBudget
 metadata:
   namespace: {{ .Release.Namespace }}
   name: {{ .Values.webhooks.name }}
+  {{- with $.Values.additionalAnnotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.serviceAccount.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
 spec:
   {{- if .Values.podDisruptionBudget.minAvailable }}
   minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}
diff --git a/keda/templates/webhooks/prometheusrules.yaml b/keda/templates/webhooks/prometheusrules.yaml
index 5fcfbb564..68dedd898 100644
--- a/keda/templates/webhooks/prometheusrules.yaml
+++ b/keda/templates/webhooks/prometheusrules.yaml
@@ -4,11 +4,13 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ .Values.webhooks.name }}
+  {{- with $.Values.additionalAnnotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.webhooks.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
     {{- range $key, $value := .Values.prometheus.webhooks.prometheusRules.additionalLabels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
@@ -19,6 +21,6 @@ spec:
   groups:
   - name: {{ .Values.webhooks.name }}
     rules:
-{{ toYaml .Values.prometheus.webhooks.prometheusRules.alerts | indent 6 }}
+{{- toYaml .Values.prometheus.webhooks.prometheusRules.alerts | nindent 6 }}
 {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/keda/templates/webhooks/service.yaml b/keda/templates/webhooks/service.yaml
index 6bbbcbe3e..849b6c47e 100644
--- a/keda/templates/webhooks/service.yaml
+++ b/keda/templates/webhooks/service.yaml
@@ -2,15 +2,15 @@
 apiVersion: v1
 kind: Service
 metadata:
+  {{- if and .Values.prometheus.webhooks.enabled ( not .Values.prometheus.webhooks.serviceMonitor.enabled ) }}
   annotations:
-    {{- if and .Values.prometheus.webhooks.enabled ( not .Values.prometheus.webhooks.serviceMonitor.enabled ) }}
     prometheus.io/scrape: "true"
     prometheus.io/port: {{ .Values.prometheus.webhooks.port | quote }}
     prometheus.io/path: "/metrics"
-    {{- end }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.webhooks.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
   name: {{ .Values.webhooks.name }}
   namespace: {{ .Release.Namespace }}
 spec:
diff --git a/keda/templates/webhooks/servicemonitor.yaml b/keda/templates/webhooks/servicemonitor.yaml
index b0fcb126b..3e1552e8f 100644
--- a/keda/templates/webhooks/servicemonitor.yaml
+++ b/keda/templates/webhooks/servicemonitor.yaml
@@ -4,11 +4,13 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ .Values.webhooks.name }}
+  {{- with $.Values.additionalAnnotations }}
   annotations:
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.webhooks.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
     {{- range $key, $value := .Values.prometheus.webhooks.serviceMonitor.additionalLabels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
@@ -21,11 +23,11 @@ spec:
   {{- end }}
   {{- with .Values.prometheus.webhooks.serviceMonitor.targetLabels }}
   targetLabels:
-  {{ toYaml . | indent 4 }}
+  {{- toYaml . | nindent 4 }}
   {{- end }}
   {{- with .Values.prometheus.webhooks.serviceMonitor.podTargetLabels }}
   podTargetLabels:
-  {{ toYaml . | indent 4 }}
+  {{- toYaml . | nindent 4 }}
   {{- end }}
   endpoints:
   - port: {{ .Values.prometheus.webhooks.serviceMonitor.port }}
@@ -41,7 +43,7 @@ spec:
     {{- end }}
     {{- with .Values.prometheus.webhooks.serviceMonitor.relabellings }}
     relabelings:
-    {{ toYaml . | indent 6 }}
+    {{- toYaml . | nindent 6 }}
     {{- end }}
   namespaceSelector:
     matchNames:
diff --git a/keda/templates/webhooks/validatingconfiguration.yaml b/keda/templates/webhooks/validatingconfiguration.yaml
index 752744957..61f1f93cb 100644
--- a/keda/templates/webhooks/validatingconfiguration.yaml
+++ b/keda/templates/webhooks/validatingconfiguration.yaml
@@ -2,6 +2,7 @@
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
+  {{- if or .Values.certificates.certManager.enabled .Values.additionalAnnotations }}
   annotations:
     {{- if .Values.certificates.certManager.enabled }}
     {{- if .Values.certificates.certManager.generateCA }}
@@ -10,12 +11,13 @@ metadata:
     cert-manager.io/inject-ca-from-secret: {{ .Release.Namespace }}/{{ .Values.certificates.certManager.caSecretName }}
     {{- end }}
     {{- end }}
-    {{- if .Values.additionalAnnotations }}
-    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- with .Values.additionalAnnotations }}
+    {{- toYaml . | nindent 4 }}
     {{- end }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ .Values.webhooks.name }}
-    {{- include "keda.labels" . | indent 4 }}
+    {{- include "keda.labels" . | nindent 4 }}
   name: keda-admission
   namespace: {{ .Release.Namespace }}
 webhooks:
diff --git a/keda/values.yaml b/keda/values.yaml
index 4e96febb0..49a60617f 100644
--- a/keda/values.yaml
+++ b/keda/values.yaml
@@ -105,14 +105,12 @@ podDisruptionBudget: {}
   #   maxUnavailable: 1
 
 # -- Custom labels to add into metadata
-additionalLabels:
-  {}
-  # foo: bar
+# additionalLabels:
+#   foo: bar
 
 # -- Custom annotations to add into metadata
-additionalAnnotations:
-  {}
-  # foo: bar
+# additionalAnnotations:
+#   foo: bar
 
 podAnnotations:
   keda: {}
@@ -135,7 +133,8 @@ serviceAccount:
   # Specifies whether a service account should automount API-Credentials
   automountServiceAccountToken: true
   # Annotations to add to the service account
-  annotations: {}
+  # annotations:
+  #   foo: bar
 
 podIdentity:
   activeDirectory:
@@ -174,12 +173,12 @@ podIdentity:
       tokenExpiration: 86400
   gcp:
     # Set to true to enable GCP Workload Identity.
-    # See https://keda.sh/docs/2.10/authentication-providers/gcp-workload-identity/ 
+    # See https://keda.sh/docs/2.10/authentication-providers/gcp-workload-identity/
     # This will be set as a annotation on the KEDA service account.
     enabled: false
     # GCP IAM Service Account Email which you would like to use for workload identity.
-    gcpIAMServiceAccount: ""      
-  
+    gcpIAMServiceAccount: ""
+
 # Set this if you are using an external scaler and want to communicate
 # over TLS (recommended). This variable holds the name of the secret that
 # will be mounted to the /grpccerts path on the Pod
@@ -271,8 +270,8 @@ service:
   portHttpTarget: 8080
   portHttps: 443
   portHttpsTarget: 6443
-
-  annotations: {}
+  # annotations:
+  #   foo: bar
 
 # We provides the default values that we describe in our docs:
 # https://keda.sh/docs/latest/operate/cluster/
@@ -376,7 +375,7 @@ prometheus:
       targetPort:
       interval:
       scrapeTimeout:
-      relabellings: []
+      relabelings: []
       additionalLabels: {}
     podMonitor:
       # Enables PodMonitor creation for the Prometheus Operator
@@ -399,7 +398,7 @@ prometheus:
       targetPort:
       interval:
       scrapeTimeout:
-      relabellings: []
+      relabelings: []
       additionalLabels: {}
     podMonitor:
       # Enables PodMonitor creation for the Prometheus Operator