diff --git a/roles/network_plugin/calico/templates/calico-node.yml.j2 b/roles/network_plugin/calico/templates/calico-node.yml.j2
index f6fdb3991..1bbd800f6 100644
--- a/roles/network_plugin/calico/templates/calico-node.yml.j2
+++ b/roles/network_plugin/calico/templates/calico-node.yml.j2
@@ -230,10 +230,14 @@ spec:
             - name: IP
               value: "autodetect"
 {% else %}
-            - name: IP
+            - name: NODEIP
               valueFrom:
                 fieldRef:
                   fieldPath: status.hostIP
+            - name: IP_AUTODETECTION_METHOD
+              value: "can-reach=$(NODEIP)"
+            - name: IP
+              value: "autodetect"
 {% endif %}
 {% if calico_use_default_route_src_ipaddr|default(false) %}
             - name: FELIX_DEVICEROUTESOURCEADDRESS