diff --git a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta2.yaml.j2 b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta2.yaml.j2
index 325e13345bdc381445d2dacca6268c63bc79449f..37f2debbdcf31f5c8e9aefd6fcacee1b54aa2375 100644
--- a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta2.yaml.j2
+++ b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta2.yaml.j2
@@ -92,8 +92,8 @@ networking:
   podSubnet: "{{ kube_pods_subnet }}{{ ',' + kube_pods_subnet_ipv6 if enable_dual_stack_networks }}"
 {% if kube_feature_gates %}
 featureGates:
-{%   for kube_feature_gate in kube_feature_gates %}
-  {{ kube_feature_gate.split("=")[0] }}: {{ kube_feature_gate.split("=")[1] }}
+{%   for feature in kube_feature_gates %}
+  {{ feature|replace("=", ": ") }}
 {%   endfor %}
 {% endif %}
 kubernetesVersion: {{ kube_version }}
@@ -371,12 +371,6 @@ conntrack:
   tcpCloseWaitTimeout: {{ kube_proxy_conntrack_tcp_close_wait_timeout }}
   tcpEstablishedTimeout: {{ kube_proxy_conntrack_tcp_established_timeout }}
 enableProfiling: {{ kube_proxy_enable_profiling }}
-{% if kube_feature_gates %}
-featureGates:
-{%   for kube_feature_gate in kube_feature_gates %}
-  {{ kube_feature_gate.split("=")[0] }}: {{ kube_feature_gate.split("=")[1] }}
-{%   endfor %}
-{% endif %}
 healthzBindAddress: {{ kube_proxy_healthz_bind_address }}
 hostnameOverride: {{ kube_override_hostname }}
 iptables:
@@ -401,9 +395,9 @@ portRange: {{ kube_proxy_port_range }}
 udpIdleTimeout: {{ kube_proxy_udp_idle_timeout }}
 {% if kube_feature_gates %}
 featureGates:
-{% for feature in kube_feature_gates %}
+{%   for feature in kube_feature_gates %}
   {{ feature|replace("=", ": ") }}
-{% endfor %}
+{%   endfor %}
 {% endif %}
 {# DNS settings for kubelet #}
 {% if enable_nodelocaldns %}
@@ -426,7 +420,7 @@ clusterDNS:
 {% endfor %}
 {% if kube_feature_gates %}
 featureGates:
-{%   for kube_feature_gate in kube_feature_gates %}
-  {{ kube_feature_gate.split("=")[0] }}: {{ kube_feature_gate.split("=")[1] }}
+{%   for feature in kube_feature_gates %}
+  {{ feature|replace("=", ": ") }}
 {%   endfor %}
 {% endif %}