diff --git a/templates/etc/firewalld/services/kubernetes.xml.j2 b/templates/etc/firewalld/services/kubernetes.xml.j2
index cc3c44b..3bd7c12 100644
--- a/templates/etc/firewalld/services/kubernetes.xml.j2
+++ b/templates/etc/firewalld/services/kubernetes.xml.j2
@@ -2,6 +2,10 @@
 <service>
   <short>Kubernetes</short>
   <description>Open needed Kubernetes ports.</description>
+{% if kubernetes_master == false or kubernetes_master_taint == true %}
+  <port protocol="tcp" port="80"/>
+  <port protocol="tcp" port="443"/>
+{% endif %}
 {% if kubernetes_master == true %}
   <port protocol="tcp" port="6443"/>
   <port protocol="tcp" port="2379"/>
@@ -10,13 +14,7 @@
   <port protocol="tcp" port="10251"/>
   <port protocol="tcp" port="10252"/>
   <port protocol="tcp" port="10255"/>
-{% if kubernetes_master_taint == true %}
-  <port protocol="tcp" port="80"/>
-  <port protocol="tcp" port="443"/>
-{% endif %}
 {% else %}
   <port protocol="tcp" port="10250"/>
-  <port protocol="tcp" port="80"/>
-  <port protocol="tcp" port="443"/>
 {% endif %}
 </service>