diff --git a/roles/network_plugin/calico/defaults/main.yml b/roles/network_plugin/calico/defaults/main.yml
index f533944898e516df47b0db1dd8689c67ba0d0d3a..49672a58457814464fe532f275f6fc4cae79c089 100644
--- a/roles/network_plugin/calico/defaults/main.yml
+++ b/roles/network_plugin/calico/defaults/main.yml
@@ -61,7 +61,7 @@ calico_healthhost: "localhost"
 # see https://docs.projectcalico.org/v3.0/reference/node/configuration#ip-autodetection-methods
 # calico_ip_auto_method: "interface=eth.*"
 
-calico_baremetal_nodename: "{{ inventory_hostname }}"
+calico_baremetal_nodename: "{{ kube_override_hostname | default(inventory_hostname) }}"
 
 ### do not enable this, this is detected in scope of tasks, this is just a default value
 calico_upgrade_needed: false
diff --git a/roles/network_plugin/calico/tasks/main.yml b/roles/network_plugin/calico/tasks/main.yml
index 07f92dac578ea364034931451b0e076e07b6d474..881c2eb5f3c0b80cb982e66e5f2b94aac11507d0 100644
--- a/roles/network_plugin/calico/tasks/main.yml
+++ b/roles/network_plugin/calico/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
-- include_tasks: check.yml
+- import_tasks: check.yml
 
-- include_tasks: pre.yml
+- import_tasks: pre.yml
 
 - import_tasks: upgrade.yml
   when: