diff --git a/charts/nitro/Chart.yaml b/charts/nitro/Chart.yaml
index fe5fbdf..ccca64b 100644
--- a/charts/nitro/Chart.yaml
+++ b/charts/nitro/Chart.yaml
@@ -7,6 +7,6 @@ maintainers:
 
 type: application
 
-version: 0.6.20
+version: 0.6.21
 
 appVersion: "v3.2.1-d81324d"
diff --git a/charts/nitro/README.md b/charts/nitro/README.md
index 28bc357..705343f 100644
--- a/charts/nitro/README.md
+++ b/charts/nitro/README.md
@@ -112,12 +112,13 @@ helm install xai offchainlabs/nitro -f values.yaml
 | `serviceMonitor.relabelings`                               | Add relabelings for the metrics being scraped                                   | `[]`                                                                |
 | `perReplicaService.enabled`                                | Enable a service for each sts replica                                           | `false`                                                             |
 | `perReplicaService.publishNotReadyAddresses`               | Publish not ready addresses                                                     | `true`                                                              |
-| `perReplicaService.annotations`                            | Annotations for the service                                                     | `{}`                                                                |
+| `perReplicaService.annotations`                            | Annotations for the per replica service                                         | `{}`                                                                |
 | `perReplicaHeadlessService.enabled`                        | Enable a headless service for each sts replica                                  | `false`                                                             |
 | `perReplicaHeadlessService.publishNotReadyAddresses`       | Publish not ready addresses                                                     | `true`                                                              |
-| `perReplicaHeadlessService.annotations`                    | Annotations for the headless service                                            | `{}`                                                                |
+| `perReplicaHeadlessService.annotations`                    | Annotations for the per replica headless service                                | `{}`                                                                |
 | `headlessservice.enabled`                                  | Enable headless service                                                         | `true`                                                              |
 | `headlessservice.publishNotReadyAddresses`                 | Publish not ready addresses                                                     | `true`                                                              |
+| `headlessservice.annotations`                              | Annotations for the headless service                                            | `{}`                                                                |
 | `jwtSecret.enabled`                                        | Enable a jwt secret for use with the stateless validator                        | `false`                                                             |
 | `jwtSecret.value`                                          | Value of the jwt secret for use with the stateless validator                    | `""`                                                                |
 | `auth.enabled`                                             | Enable auth for the stateless validator                                         | `false`                                                             |
diff --git a/charts/nitro/templates/headlessservice.yaml b/charts/nitro/templates/headlessservice.yaml
index 1451fcb..d5dc1ad 100644
--- a/charts/nitro/templates/headlessservice.yaml
+++ b/charts/nitro/templates/headlessservice.yaml
@@ -5,6 +5,10 @@ metadata:
   name: {{ include "nitro.fullname" . }}-headless
   labels:
     {{- include "nitro.labels" . | nindent 4 }}
+  annotations:
+    {{- if $.Values.headlessservice.annotations }}
+    {{- toYaml $.Values.headlessservice.annotations | nindent 4 }}
+    {{- end }}
 spec:
   type: ClusterIP
   clusterIP: None
diff --git a/charts/nitro/templates/statefulset.yaml b/charts/nitro/templates/statefulset.yaml
index 4d8d27c..01f322a 100644
--- a/charts/nitro/templates/statefulset.yaml
+++ b/charts/nitro/templates/statefulset.yaml
@@ -7,7 +7,7 @@ metadata:
   annotations:
     nitro.arbitrum.io/desiredReplicas: {{ $.Values.replicaCount | quote }}
 spec:
-  serviceName: "{{ include "nitro.fullname" . }}"
+  serviceName: {{ include "nitro.fullname" . }}-headless
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
@@ -15,7 +15,7 @@ spec:
   podManagementPolicy: Parallel
   {{- if .Values.updateStrategy }}
   {{- with .Values.updateStrategy }}
-  updateStrategy: 
+  updateStrategy:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   {{- end }}
@@ -276,7 +276,7 @@ spec:
           app: {{ template "nitro.name" . }}
           release: {{ .Release.Name }}
           heritage: {{ .Release.Service }}
-      spec: 
+      spec:
         accessModes:
         {{- toYaml .Values.blobPersistence.accessModes | nindent 8 }}
         {{- if .Values.blobPersistence.storageClassName }}
diff --git a/charts/nitro/values.yaml b/charts/nitro/values.yaml
index dcbc13b..55b7120 100644
--- a/charts/nitro/values.yaml
+++ b/charts/nitro/values.yaml
@@ -100,7 +100,7 @@ serviceMonitor:
 
 ## @param perReplicaService.enabled Enable a service for each sts replica
 ## @param perReplicaService.publishNotReadyAddresses Publish not ready addresses
-## @param perReplicaService.annotations Annotations for the service
+## @param perReplicaService.annotations Annotations for the per replica service
 perReplicaService:
   enabled: false
   publishNotReadyAddresses: true
@@ -108,7 +108,7 @@ perReplicaService:
 
 ## @param perReplicaHeadlessService.enabled Enable a headless service for each sts replica
 ## @param perReplicaHeadlessService.publishNotReadyAddresses Publish not ready addresses
-## @param perReplicaHeadlessService.annotations Annotations for the headless service
+## @param perReplicaHeadlessService.annotations Annotations for the per replica headless service
 perReplicaHeadlessService:
   enabled: false
   publishNotReadyAddresses: true
@@ -116,9 +116,11 @@ perReplicaHeadlessService:
 
 ## @param headlessservice.enabled Enable headless service
 ## @param headlessservice.publishNotReadyAddresses Publish not ready addresses
+## @param headlessservice.annotations Annotations for the headless service
 headlessservice:
   enabled: true
   publishNotReadyAddresses: true
+  annotations: {}
 
 ## @param jwtSecret.enabled Enable a jwt secret for use with the stateless validator
 ## @param jwtSecret.value Value of the jwt secret for use with the stateless validator