diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac1f5eaa3..8434ab6bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - (Documentation) Add ArangoPlatformStorage Docs & Examples
 - (Feature) Enable ML Operator and add required Platform Roles
 - (Feature) Helm Lint
+- (Bugfix) Helm Lint Indent fix
 
 ## [1.3.0](https://github.com/arangodb/kube-arangodb/tree/1.3.0) (2025-08-01)
 - (Feature) (Platform) Storage Debug
diff --git a/chart/kube-arangodb-arm64/templates/deployment.yaml b/chart/kube-arangodb-arm64/templates/deployment.yaml
index 4e6952059..6540982dd 100644
--- a/chart/kube-arangodb-arm64/templates/deployment.yaml
+++ b/chart/kube-arangodb-arm64/templates/deployment.yaml
@@ -15,7 +15,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 {{- if .Values.operator.annotations }}
   annotations:
-{{ toYaml .Values.operator.annotations | indent 8 }}
+{{ toYaml .Values.operator.annotations | indent 4 }}
 {{- end }}
   labels:
     app.kubernetes.io/name: {{ template "kube-arangodb.name" . }}
@@ -30,7 +30,7 @@ spec:
   replicas: {{ .Values.operator.replicaCount }}
 {{- end }}
   strategy:
-{{ toYaml .Values.operator.updateStrategy | indent 8 }}
+{{ toYaml .Values.operator.updateStrategy | indent 4 }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ template "kube-arangodb.name" . }}
@@ -47,12 +47,12 @@ spec:
         release: {{ .Release.Name }}
 {{- if .Values.operator.annotations }}
       annotations:
-{{ toYaml .Values.operator.annotations | indent 16 }}
+{{ toYaml .Values.operator.annotations | indent 8 }}
 {{- end }}
     spec:
 {{- if .Values.operator.nodeSelector }}
       nodeSelector:
-{{ toYaml .Values.operator.nodeSelector | indent 16 }}
+{{ toYaml .Values.operator.nodeSelector | indent 8 }}
 {{- end }}
       serviceAccountName: {{ template "kube-arangodb.operatorName" . }}
       affinity:
@@ -176,7 +176,7 @@ spec:
 {{- end }}
 {{- if .Values.operator.resources }}
           resources:
-{{ toYaml .Values.operator.resources | indent 22 }}
+{{ toYaml .Values.operator.resources | indent 10 }}
 {{- end }}
 {{- if not .Values.operator.debug }}
           livenessProbe:
@@ -236,7 +236,7 @@ spec:
                 - 'ALL'
 {{- if .Values.webhooks.resources }}
           resources:
-{{ toYaml .Values.webhooks.resources | indent 22 }}
+{{ toYaml .Values.webhooks.resources | indent 10 }}
 {{- end }}
 {{- if not .Values.webhooks.debug }}
           livenessProbe:
@@ -265,5 +265,5 @@ spec:
           effect: "NoExecute"
           tolerationSeconds: 5
 {{- if .Values.operator.tolerations }}
-{{ toYaml .Values.operator.tolerations | indent 16 }}
+{{ toYaml .Values.operator.tolerations | indent 8 }}
 {{- end }}
diff --git a/chart/kube-arangodb-arm64/templates/service-webhooks.yaml b/chart/kube-arangodb-arm64/templates/service-webhooks.yaml
index 7d186845c..424040923 100644
--- a/chart/kube-arangodb-arm64/templates/service-webhooks.yaml
+++ b/chart/kube-arangodb-arm64/templates/service-webhooks.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 {{- if .Values.operator.annotations }}
   annotations:
-{{ toYaml .Values.operator.annotations | indent 8 }}
+{{ toYaml .Values.operator.annotations | indent 4 }}
 {{- end }}
   labels:
     app.kubernetes.io/name: {{ template "kube-arangodb.name" . }}
diff --git a/chart/kube-arangodb-arm64/templates/service.yaml b/chart/kube-arangodb-arm64/templates/service.yaml
index ebe1eea92..3a5f398e4 100644
--- a/chart/kube-arangodb-arm64/templates/service.yaml
+++ b/chart/kube-arangodb-arm64/templates/service.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 {{- if .Values.operator.annotations }}
   annotations:
-{{ toYaml .Values.operator.annotations | indent 8 }}
+{{ toYaml .Values.operator.annotations | indent 4 }}
 {{- end }}
   labels:
     app.kubernetes.io/name: {{ template "kube-arangodb.name" . }}
diff --git a/chart/kube-arangodb-enterprise-arm64/templates/deployment.yaml b/chart/kube-arangodb-enterprise-arm64/templates/deployment.yaml
index 4e6952059..6540982dd 100644
--- a/chart/kube-arangodb-enterprise-arm64/templates/deployment.yaml
+++ b/chart/kube-arangodb-enterprise-arm64/templates/deployment.yaml
@@ -15,7 +15,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 {{- if .Values.operator.annotations }}
   annotations:
-{{ toYaml .Values.operator.annotations | indent 8 }}
+{{ toYaml .Values.operator.annotations | indent 4 }}
 {{- end }}
   labels:
     app.kubernetes.io/name: {{ template "kube-arangodb.name" . }}
@@ -30,7 +30,7 @@ spec:
   replicas: {{ .Values.operator.replicaCount }}
 {{- end }}
   strategy:
-{{ toYaml .Values.operator.updateStrategy | indent 8 }}
+{{ toYaml .Values.operator.updateStrategy | indent 4 }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ template "kube-arangodb.name" . }}
@@ -47,12 +47,12 @@ spec:
         release: {{ .Release.Name }}
 {{- if .Values.operator.annotations }}
       annotations:
-{{ toYaml .Values.operator.annotations | indent 16 }}
+{{ toYaml .Values.operator.annotations | indent 8 }}
 {{- end }}
     spec:
 {{- if .Values.operator.nodeSelector }}
       nodeSelector:
-{{ toYaml .Values.operator.nodeSelector | indent 16 }}
+{{ toYaml .Values.operator.nodeSelector | indent 8 }}
 {{- end }}
       serviceAccountName: {{ template "kube-arangodb.operatorName" . }}
       affinity:
@@ -176,7 +176,7 @@ spec:
 {{- end }}
 {{- if .Values.operator.resources }}
           resources:
-{{ toYaml .Values.operator.resources | indent 22 }}
+{{ toYaml .Values.operator.resources | indent 10 }}
 {{- end }}
 {{- if not .Values.operator.debug }}
           livenessProbe:
@@ -236,7 +236,7 @@ spec:
                 - 'ALL'
 {{- if .Values.webhooks.resources }}
           resources:
-{{ toYaml .Values.webhooks.resources | indent 22 }}
+{{ toYaml .Values.webhooks.resources | indent 10 }}
 {{- end }}
 {{- if not .Values.webhooks.debug }}
           livenessProbe:
@@ -265,5 +265,5 @@ spec:
           effect: "NoExecute"
           tolerationSeconds: 5
 {{- if .Values.operator.tolerations }}
-{{ toYaml .Values.operator.tolerations | indent 16 }}
+{{ toYaml .Values.operator.tolerations | indent 8 }}
 {{- end }}
diff --git a/chart/kube-arangodb-enterprise-arm64/templates/service-webhooks.yaml b/chart/kube-arangodb-enterprise-arm64/templates/service-webhooks.yaml
index 7d186845c..424040923 100644
--- a/chart/kube-arangodb-enterprise-arm64/templates/service-webhooks.yaml
+++ b/chart/kube-arangodb-enterprise-arm64/templates/service-webhooks.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 {{- if .Values.operator.annotations }}
   annotations:
-{{ toYaml .Values.operator.annotations | indent 8 }}
+{{ toYaml .Values.operator.annotations | indent 4 }}
 {{- end }}
   labels:
     app.kubernetes.io/name: {{ template "kube-arangodb.name" . }}
diff --git a/chart/kube-arangodb-enterprise-arm64/templates/service.yaml b/chart/kube-arangodb-enterprise-arm64/templates/service.yaml
index ebe1eea92..3a5f398e4 100644
--- a/chart/kube-arangodb-enterprise-arm64/templates/service.yaml
+++ b/chart/kube-arangodb-enterprise-arm64/templates/service.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 {{- if .Values.operator.annotations }}
   annotations:
-{{ toYaml .Values.operator.annotations | indent 8 }}
+{{ toYaml .Values.operator.annotations | indent 4 }}
 {{- end }}
   labels:
     app.kubernetes.io/name: {{ template "kube-arangodb.name" . }}
diff --git a/chart/kube-arangodb-enterprise/templates/deployment.yaml b/chart/kube-arangodb-enterprise/templates/deployment.yaml
index 4e6952059..6540982dd 100644
--- a/chart/kube-arangodb-enterprise/templates/deployment.yaml
+++ b/chart/kube-arangodb-enterprise/templates/deployment.yaml
@@ -15,7 +15,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 {{- if .Values.operator.annotations }}
   annotations:
-{{ toYaml .Values.operator.annotations | indent 8 }}
+{{ toYaml .Values.operator.annotations | indent 4 }}
 {{- end }}
   labels:
     app.kubernetes.io/name: {{ template "kube-arangodb.name" . }}
@@ -30,7 +30,7 @@ spec:
   replicas: {{ .Values.operator.replicaCount }}
 {{- end }}
   strategy:
-{{ toYaml .Values.operator.updateStrategy | indent 8 }}
+{{ toYaml .Values.operator.updateStrategy | indent 4 }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ template "kube-arangodb.name" . }}
@@ -47,12 +47,12 @@ spec:
         release: {{ .Release.Name }}
 {{- if .Values.operator.annotations }}
       annotations:
-{{ toYaml .Values.operator.annotations | indent 16 }}
+{{ toYaml .Values.operator.annotations | indent 8 }}
 {{- end }}
     spec:
 {{- if .Values.operator.nodeSelector }}
       nodeSelector:
-{{ toYaml .Values.operator.nodeSelector | indent 16 }}
+{{ toYaml .Values.operator.nodeSelector | indent 8 }}
 {{- end }}
       serviceAccountName: {{ template "kube-arangodb.operatorName" . }}
       affinity:
@@ -176,7 +176,7 @@ spec:
 {{- end }}
 {{- if .Values.operator.resources }}
           resources:
-{{ toYaml .Values.operator.resources | indent 22 }}
+{{ toYaml .Values.operator.resources | indent 10 }}
 {{- end }}
 {{- if not .Values.operator.debug }}
           livenessProbe:
@@ -236,7 +236,7 @@ spec:
                 - 'ALL'
 {{- if .Values.webhooks.resources }}
           resources:
-{{ toYaml .Values.webhooks.resources | indent 22 }}
+{{ toYaml .Values.webhooks.resources | indent 10 }}
 {{- end }}
 {{- if not .Values.webhooks.debug }}
           livenessProbe:
@@ -265,5 +265,5 @@ spec:
           effect: "NoExecute"
           tolerationSeconds: 5
 {{- if .Values.operator.tolerations }}
-{{ toYaml .Values.operator.tolerations | indent 16 }}
+{{ toYaml .Values.operator.tolerations | indent 8 }}
 {{- end }}
diff --git a/chart/kube-arangodb-enterprise/templates/service-webhooks.yaml b/chart/kube-arangodb-enterprise/templates/service-webhooks.yaml
index 7d186845c..424040923 100644
--- a/chart/kube-arangodb-enterprise/templates/service-webhooks.yaml
+++ b/chart/kube-arangodb-enterprise/templates/service-webhooks.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 {{- if .Values.operator.annotations }}
   annotations:
-{{ toYaml .Values.operator.annotations | indent 8 }}
+{{ toYaml .Values.operator.annotations | indent 4 }}
 {{- end }}
   labels:
     app.kubernetes.io/name: {{ template "kube-arangodb.name" . }}
diff --git a/chart/kube-arangodb-enterprise/templates/service.yaml b/chart/kube-arangodb-enterprise/templates/service.yaml
index ebe1eea92..3a5f398e4 100644
--- a/chart/kube-arangodb-enterprise/templates/service.yaml
+++ b/chart/kube-arangodb-enterprise/templates/service.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 {{- if .Values.operator.annotations }}
   annotations:
-{{ toYaml .Values.operator.annotations | indent 8 }}
+{{ toYaml .Values.operator.annotations | indent 4 }}
 {{- end }}
   labels:
     app.kubernetes.io/name: {{ template "kube-arangodb.name" . }}
diff --git a/chart/kube-arangodb/templates/deployment.yaml b/chart/kube-arangodb/templates/deployment.yaml
index 4e6952059..6540982dd 100644
--- a/chart/kube-arangodb/templates/deployment.yaml
+++ b/chart/kube-arangodb/templates/deployment.yaml
@@ -15,7 +15,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 {{- if .Values.operator.annotations }}
   annotations:
-{{ toYaml .Values.operator.annotations | indent 8 }}
+{{ toYaml .Values.operator.annotations | indent 4 }}
 {{- end }}
   labels:
     app.kubernetes.io/name: {{ template "kube-arangodb.name" . }}
@@ -30,7 +30,7 @@ spec:
   replicas: {{ .Values.operator.replicaCount }}
 {{- end }}
   strategy:
-{{ toYaml .Values.operator.updateStrategy | indent 8 }}
+{{ toYaml .Values.operator.updateStrategy | indent 4 }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ template "kube-arangodb.name" . }}
@@ -47,12 +47,12 @@ spec:
         release: {{ .Release.Name }}
 {{- if .Values.operator.annotations }}
       annotations:
-{{ toYaml .Values.operator.annotations | indent 16 }}
+{{ toYaml .Values.operator.annotations | indent 8 }}
 {{- end }}
     spec:
 {{- if .Values.operator.nodeSelector }}
       nodeSelector:
-{{ toYaml .Values.operator.nodeSelector | indent 16 }}
+{{ toYaml .Values.operator.nodeSelector | indent 8 }}
 {{- end }}
       serviceAccountName: {{ template "kube-arangodb.operatorName" . }}
       affinity:
@@ -176,7 +176,7 @@ spec:
 {{- end }}
 {{- if .Values.operator.resources }}
           resources:
-{{ toYaml .Values.operator.resources | indent 22 }}
+{{ toYaml .Values.operator.resources | indent 10 }}
 {{- end }}
 {{- if not .Values.operator.debug }}
           livenessProbe:
@@ -236,7 +236,7 @@ spec:
                 - 'ALL'
 {{- if .Values.webhooks.resources }}
           resources:
-{{ toYaml .Values.webhooks.resources | indent 22 }}
+{{ toYaml .Values.webhooks.resources | indent 10 }}
 {{- end }}
 {{- if not .Values.webhooks.debug }}
           livenessProbe:
@@ -265,5 +265,5 @@ spec:
           effect: "NoExecute"
           tolerationSeconds: 5
 {{- if .Values.operator.tolerations }}
-{{ toYaml .Values.operator.tolerations | indent 16 }}
+{{ toYaml .Values.operator.tolerations | indent 8 }}
 {{- end }}
diff --git a/chart/kube-arangodb/templates/service-webhooks.yaml b/chart/kube-arangodb/templates/service-webhooks.yaml
index 7d186845c..424040923 100644
--- a/chart/kube-arangodb/templates/service-webhooks.yaml
+++ b/chart/kube-arangodb/templates/service-webhooks.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 {{- if .Values.operator.annotations }}
   annotations:
-{{ toYaml .Values.operator.annotations | indent 8 }}
+{{ toYaml .Values.operator.annotations | indent 4 }}
 {{- end }}
   labels:
     app.kubernetes.io/name: {{ template "kube-arangodb.name" . }}
diff --git a/chart/kube-arangodb/templates/service.yaml b/chart/kube-arangodb/templates/service.yaml
index ebe1eea92..3a5f398e4 100644
--- a/chart/kube-arangodb/templates/service.yaml
+++ b/chart/kube-arangodb/templates/service.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 {{- if .Values.operator.annotations }}
   annotations:
-{{ toYaml .Values.operator.annotations | indent 8 }}
+{{ toYaml .Values.operator.annotations | indent 4 }}
 {{- end }}
   labels:
     app.kubernetes.io/name: {{ template "kube-arangodb.name" . }}