diff --git a/chart/templates/statefulset.yaml b/chart/templates/statefulset.yaml
index 230ba93b8eae47317e3cbdb57f1da260842aa960..c8066fbf86222b7fa7854b19fd09d9e672e8f5b4 100644
--- a/chart/templates/statefulset.yaml
+++ b/chart/templates/statefulset.yaml
@@ -43,8 +43,8 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - -config=/aptly/config/aptly.conf
-            {{- if .Values.extraArgs }}
-            {{- toYaml .Values.extraArgs | nindent 12 }}
+            {{- if .Values.api.extraArgs }}
+            {{- toYaml .Values.api.extraArgs | nindent 12 }}
             {{- end }}
           ports:
             - name: api
diff --git a/chart/values.yaml b/chart/values.yaml
index 1980a0a331e059c42b23f74113d555429fa109c1..5ed215ddb02f6aa7afc32783e1f84fd8160a87e1 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -20,6 +20,9 @@ api:
   # - https://pkg.go.dev/runtime#hdr-Environment_Variables
   # - https://go.dev/doc/gc-guide
   extraEnvVars: []
+  # Add extra arguments
+  extraArgs: []
+  #  - -no-lock
 
 publish:
   config:
@@ -50,9 +53,6 @@ fullnameOverride: ""
 config:
   rootDir: /aptly/data
 
-# Add extra argument to the aptly-api container
-extraArgs: []
-#  - -no-lock
 
 persistence:
   accessModes: [ReadWriteOnce]