diff --git a/airflow/airflow-values.gomplate.yaml b/airflow/airflow-values.gomplate.yaml
index c7a7534..1613aa7 100644
--- a/airflow/airflow-values.gomplate.yaml
+++ b/airflow/airflow-values.gomplate.yaml
@@ -80,6 +80,13 @@ workers:
   env:
     - name: PYTHONPATH
       value: "/opt/airflow/site-packages:$PYTHONPATH"
+  # Override args to fix Celery worker hostname issue
+  # The HOSTNAME will be set automatically by Kubernetes for StatefulSet pods
+  args:
+    - bash
+    - -c
+    - |
+      exec airflow celery worker --celery-hostname=${HOSTNAME}
 
 scheduler:
   extraInitContainers: