diff --git a/CHANGELOG.md b/CHANGELOG.md
index 673e69c5..b844e1a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
 
 - Use `json` file extension for log files ([#607]).
 - Fix a bug where changes to ConfigMaps that are referenced in the AirflowCluster spec didn't trigger a reconciliation ([#600]).
+- Use headless service for StatefulSets ([#626]).
 
 [#600]: https://github.com/stackabletech/airflow-operator/pull/600
 [#601]: https://github.com/stackabletech/airflow-operator/pull/601
@@ -41,6 +42,7 @@
 [#623]: https://github.com/stackabletech/airflow-operator/pull/623
 [#624]: https://github.com/stackabletech/airflow-operator/pull/624
 [#625]: https://github.com/stackabletech/airflow-operator/pull/625
+[#626]: https://github.com/stackabletech/airflow-operator/pull/626
 
 ## [25.3.0] - 2025-03-21
 
diff --git a/rust/operator-binary/src/airflow_controller.rs b/rust/operator-binary/src/airflow_controller.rs
index 569995cb..b407d9a4 100644
--- a/rust/operator-binary/src/airflow_controller.rs
+++ b/rust/operator-binary/src/airflow_controller.rs
@@ -1170,7 +1170,7 @@ fn build_server_rolegroup_statefulset(
             match_labels: Some(statefulset_match_labels.into()),
             ..LabelSelector::default()
         },
-        service_name: Some(rolegroup_ref.object_name()),
+        service_name: Some(format!("{name}-metrics", name = rolegroup_ref.object_name())),
         template: pod_template,
         volume_claim_templates: pvcs,
         ..StatefulSetSpec::default()