diff --git a/roles/kubernetes/node/defaults/main.yml b/roles/kubernetes/node/defaults/main.yml
index 90840dbffef0ffd69a6f0113acc479ea499623b6..91a6f6f500c6fc56b1f0aa0f501288010ac4f2e7 100644
--- a/roles/kubernetes/node/defaults/main.yml
+++ b/roles/kubernetes/node/defaults/main.yml
@@ -79,11 +79,11 @@ kube_hyperkube_image_repo: ""
 
 # If non-empty, will use this string as identification instead of the actual hostname
 kube_override_hostname: >-
-  {% if cloud_provider is defined %}
+  {%- if cloud_provider is defined -%}
   false
-  {% else %}
+  {%- else -%}
   {{ ansible_hostname }}
-  {% endif %}
+  {%- endif -%}
 
 # cAdvisor port
 kube_cadvisor_port: 0
diff --git a/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 b/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2
index b97b3e949d05db3d932a4e9357de96981fa003b5..e48e08bd923cbf24005e497cb8565f72976b6fb9 100644
--- a/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2
+++ b/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2
@@ -9,7 +9,7 @@ KUBELET_ADDRESS="--address={{ kubelet_bind_address }} --node-ip={{ kubelet_addre
 # The port for the info server to serve on
 # KUBELET_PORT="--port=10250"
 # You may leave this blank to use the actual hostname
-{% if kube_override_hostname %}
+{% if kube_override_hostname|bool %}
 KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
 {% endif %}
 {# Base kubelet args #}
diff --git a/roles/kubernetes/node/templates/kubelet.standard.env.j2 b/roles/kubernetes/node/templates/kubelet.standard.env.j2
index c21a796cdc7ea96c49bd18d629d4c06440f659b4..b360757b5cdc8cc9a942edd4612eb1dc8b48432b 100644
--- a/roles/kubernetes/node/templates/kubelet.standard.env.j2
+++ b/roles/kubernetes/node/templates/kubelet.standard.env.j2
@@ -6,7 +6,7 @@ KUBELET_ADDRESS="--address={{ kubelet_bind_address }} --node-ip={{ kubelet_addre
 # The port for the info server to serve on
 # KUBELET_PORT="--port=10250"
 # You may leave this blank to use the actual hostname
-{% if kube_override_hostname %}
+{% if kube_override_hostname|bool %}
 KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
 {% endif %}
 {# Base kubelet args #}