diff --git a/charts/miroir/templates/_helpers.tpl b/charts/miroir/templates/_helpers.tpl
index 484d812..c1ee151 100644
--- a/charts/miroir/templates/_helpers.tpl
+++ b/charts/miroir/templates/_helpers.tpl
@@ -178,7 +178,7 @@ resharding:
   retain_old_index_hours: {{ .Values.miroir.resharding.retain_old_index_hours | default 48 }}
   allowed_windows: {{ .Values.miroir.resharding.allowed_windows | default list | toJson }}
 peer_discovery:
-  service_name: {{ .Values.miroir.peer_discovery.service_name | default .Release.Name }}-headless
+  service_name: {{ .Values.miroir.peer_discovery.service_name | default (printf "%s-headless" (include "miroir.fullname" .)) }}
   refresh_interval_s: {{ .Values.miroir.peer_discovery.refresh_interval_s | default 15 }}
 leader_election:
   enabled: {{ .Values.miroir.leader_election.enabled | default true }}
diff --git a/charts/miroir/templates/miroir-deployment.yaml b/charts/miroir/templates/miroir-deployment.yaml
index 4e97c8f..9aeb95a 100644
--- a/charts/miroir/templates/miroir-deployment.yaml
+++ b/charts/miroir/templates/miroir-deployment.yaml
@@ -67,6 +67,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: POD_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
             - name: MIROIR_CONFIG_PATH
               value: /config/miroir.yaml
             - name: MIROIR_MASTER_KEY
diff --git a/charts/miroir/values.yaml b/charts/miroir/values.yaml
index 55b1244..45ebf38 100644
--- a/charts/miroir/values.yaml
+++ b/charts/miroir/values.yaml
@@ -112,7 +112,7 @@ miroir:
     retain_old_index_hours: 48
     allowed_windows: []                # e.g., ["22:00-04:00 UTC"]
   peer_discovery:
-    service_name: miroir-headless
+    service_name: ""  # default: "<fullname>-headless" (auto-derived from release name)
     refresh_interval_s: 15
   leader_election:
     enabled: true                      # auto-true when replicas > 1
diff --git a/tests/verify_p6_2_peer_discovery.sh b/tests/verify_p6_2_peer_discovery.sh
index 6c0862c..2837921 100755
--- a/tests/verify_p6_2_peer_discovery.sh
+++ b/tests/verify_p6_2_peer_discovery.sh
@@ -62,7 +62,16 @@ else
 fi
 
 echo ""
-echo "6. Checking peer_discovery configuration..."
+echo "6. Verifying POD_IP env var is set (if running in K8s)..."
+POD_IP="${POD_IP:-unknown}"
+if [ "$POD_IP" != "unknown" ]; then
+    echo "   ✓ POD_IP=$POD_IP"
+else
+    echo "   ⚠ POD_IP not set (not running in Kubernetes)"
+fi
+
+echo ""
+echo "7. Checking peer_discovery configuration..."
 # The peer_discovery config is internal, but we can check the log for the refresh loop starting
 # For local dev, peer discovery may be disabled if POD_NAME=unknown
 if [ "$POD_NAME" = "unknown" ]; then