diff --git a/charts/qdrant/templates/serviceaccount.yaml b/charts/qdrant/templates/serviceaccount.yaml
index b3b5ddf..549d70a 100644
--- a/charts/qdrant/templates/serviceaccount.yaml
+++ b/charts/qdrant/templates/serviceaccount.yaml
@@ -1,7 +1,8 @@
+{{- if .Values.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "qdrant.fullname" . }}
+  name: {{ include "qdrant.serviceAccountName" . }}
 {{- if or .Values.serviceAccount.annotations .Values.additionalAnnotations }}
   annotations:
 {{- with .Values.additionalAnnotations }}
@@ -13,4 +14,5 @@ metadata:
 {{- end }}
   labels:
     {{- include "qdrant.labels" . | nindent 4 }}
-    {{- include "qdrant.additionalLabels" . | nindent 4 }}
\ No newline at end of file
+    {{- include "qdrant.additionalLabels" . | nindent 4 }}
+{{- end }}
diff --git a/charts/qdrant/templates/statefulset.yaml b/charts/qdrant/templates/statefulset.yaml
index 979ad12..5782f62 100644
--- a/charts/qdrant/templates/statefulset.yaml
+++ b/charts/qdrant/templates/statefulset.yaml
@@ -238,7 +238,7 @@ spec:
       topologySpreadConstraints:
         {{- tpl (toYaml .) $ | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "qdrant.fullname" . }}
+      serviceAccountName: {{ include "qdrant.serviceAccountName" . }}
       volumes:
         - name: qdrant-config
           configMap:
diff --git a/charts/qdrant/values.yaml b/charts/qdrant/values.yaml
index 56e855d..e3308be 100644
--- a/charts/qdrant/values.yaml
+++ b/charts/qdrant/values.yaml
@@ -232,6 +232,8 @@ metrics:
     #     key: api-key
 
 serviceAccount:
+  create: true
+  name: ""
   annotations: {}
 
 priorityClassName: ""