diff --git a/rust/operator-binary/src/airflow_controller.rs b/rust/operator-binary/src/airflow_controller.rs
index 9f933a35..a4f16cb0 100644
--- a/rust/operator-binary/src/airflow_controller.rs
+++ b/rust/operator-binary/src/airflow_controller.rs
@@ -514,23 +514,20 @@ pub async fn reconcile_airflow(
             )
             .context(LabelBuildSnafu)?;
 
-            // Only apply headless service for something exposing an HTTP port
-            if airflow_role.get_http_port().is_some() {
-                let rg_headless_service = build_rolegroup_headless_service(
-                    airflow,
-                    &rolegroup,
-                    role_group_service_recommended_labels.clone(),
-                    role_group_service_selector.clone().into(),
-                )
-                .context(ServiceConfigurationSnafu)?;
+            let rg_headless_service = build_rolegroup_headless_service(
+                airflow,
+                &rolegroup,
+                role_group_service_recommended_labels.clone(),
+                role_group_service_selector.clone().into(),
+            )
+            .context(ServiceConfigurationSnafu)?;
 
-                cluster_resources
-                    .add(client, rg_headless_service)
-                    .await
-                    .context(ApplyRoleGroupServiceSnafu {
-                        rolegroup: rolegroup.clone(),
-                    })?;
-            }
+            cluster_resources
+                .add(client, rg_headless_service)
+                .await
+                .context(ApplyRoleGroupServiceSnafu {
+                    rolegroup: rolegroup.clone(),
+                })?;
 
             let rg_metrics_service = build_rolegroup_metrics_service(
                 airflow,
@@ -1159,7 +1156,7 @@ fn build_server_rolegroup_statefulset(
             match_labels: Some(statefulset_match_labels.into()),
             ..LabelSelector::default()
         },
-        service_name: stateful_set_service_name(airflow_role, rolegroup_ref),
+        service_name: stateful_set_service_name(rolegroup_ref),
         template: pod_template,
         volume_claim_templates: pvcs,
         ..StatefulSetSpec::default()
diff --git a/rust/operator-binary/src/service.rs b/rust/operator-binary/src/service.rs
index 52ae4d26..c24548ca 100644
--- a/rust/operator-binary/src/service.rs
+++ b/rust/operator-binary/src/service.rs
@@ -8,9 +8,7 @@ use stackable_operator::{
     role_utils::RoleGroupRef,
 };
 
-use crate::crd::{
-    AirflowRole, HTTP_PORT, HTTP_PORT_NAME, METRICS_PORT, METRICS_PORT_NAME, v1alpha1,
-};
+use crate::crd::{HTTP_PORT, HTTP_PORT_NAME, METRICS_PORT, METRICS_PORT_NAME, v1alpha1};
 
 pub const METRICS_SERVICE_SUFFIX: &str = "metrics";
 pub const HEADLESS_SERVICE_SUFFIX: &str = "headless";
@@ -111,15 +109,11 @@ pub fn build_rolegroup_metrics_service(
 }
 
 pub fn stateful_set_service_name(
-    airflow_role: &AirflowRole,
     rolegroup_ref: &RoleGroupRef<v1alpha1::AirflowCluster>,
 ) -> Option<String> {
-    match airflow_role {
-        AirflowRole::Webserver => Some(rolegroup_headless_service_name(
-            &rolegroup_ref.object_name(),
-        )),
-        AirflowRole::Scheduler | AirflowRole::Worker => None,
-    }
+    Some(rolegroup_headless_service_name(
+        &rolegroup_ref.object_name(),
+    ))
 }
 
 /// Returns the metrics rolegroup service name `<cluster>-<role>-<rolegroup>-<METRICS_SERVICE_SUFFIX>`.