diff --git a/tasks/install_server.yml b/tasks/install_server.yml
index 89553b9..4ade838 100644
--- a/tasks/install_server.yml
+++ b/tasks/install_server.yml
@@ -13,6 +13,10 @@
 #  when:
 #    - kubernetes_cri_changed is changed
 
+- name: Disable SWAP since kubernetes can't work with swap enabled (1/2)
+  shell: |
+    swapoff -a
+
 - name: Remove swapfile from /etc/fstab
   mount:
     name: swap
diff --git a/templates/etc/firewalld/services/kubernetes.xml.j2 b/templates/etc/firewalld/services/kubernetes.xml.j2
index 3bd7c12..da9fe95 100644
--- a/templates/etc/firewalld/services/kubernetes.xml.j2
+++ b/templates/etc/firewalld/services/kubernetes.xml.j2
@@ -7,12 +7,18 @@
   <port protocol="tcp" port="443"/>
 {% endif %}
 {% if kubernetes_master == true %}
+# Kubernetes API server, used by all
   <port protocol="tcp" port="6443"/>
+# etcd server client API, used by kube-apiserver and etcd
   <port protocol="tcp" port="2379"/>
   <port protocol="tcp" port="2380"/>
+# Kubelet API, used by self and control plane
   <port protocol="tcp" port="10250"/>
+# kube-scheduler, used by self
   <port protocol="tcp" port="10251"/>
+# kube-controler-manager, used by self
   <port protocol="tcp" port="10252"/>
+# ???
   <port protocol="tcp" port="10255"/>
 {% else %}
   <port protocol="tcp" port="10250"/>