diff --git a/prepare-labs/lib/commands.sh b/prepare-labs/lib/commands.sh
index 60e8288e..2c2bcad9 100644
--- a/prepare-labs/lib/commands.sh
+++ b/prepare-labs/lib/commands.sh
@@ -421,9 +421,22 @@ _cmd_kubebins() {
     need_tag
 
     ##VERSION##
-    ETCD_VERSION=v3.4.13
-    K8SBIN_VERSION=v1.19.11 # Can't go to 1.20 because it requires a serviceaccount signing key.
-    CNI_VERSION=v0.8.7
+    if [ "$KUBEVERSION" = "" ]; then
+        KUBEVERSION="$(curl -fsSL https://cdn.dl.k8s.io/release/stable.txt | sed s/^v//)"
+    fi
+
+    case "$KUBEVERSION" in
+    1.19.*)
+      ETCD_VERSION=v3.4.13
+      CNI_VERSION=v0.8.7
+      ;;
+    *)
+      ETCD_VERSION=v3.5.9
+      CNI_VERSION=v1.3.0
+      ;;
+    esac
+
+    K8SBIN_VERSION="v$KUBEVERSION"
     ARCH=${ARCHITECTURE-amd64}
     pssh --timeout 300 "
     set -e
@@ -447,13 +460,12 @@ _cmd_kubebins() {
     "
 }
 
-_cmd kube "Setup kubernetes clusters with kubeadm (must be run AFTER deploy)"
-_cmd_kube() {
+_cmd kubepkgs "Install Kubernetes packages (kubectl, kubeadm, kubelet)"
+_cmd_kubepkgs() {
     TAG=$1
     need_tag
 
     if [ "$KUBEVERSION" ]; then
-        CLUSTER_CONFIGURATION_KUBERNETESVERSION='kubernetesVersion: "v'$KUBEVERSION'"'
         pssh "
         sudo tee /etc/apt/preferences.d/kubernetes <<EOF
 Package: kubectl kubeadm kubelet
@@ -480,6 +492,18 @@ EOF"
     kubectl completion bash | sudo tee /etc/bash_completion.d/kubectl &&
     echo 'alias k=kubectl' | sudo tee /etc/bash_completion.d/k &&
     echo 'complete -F __start_kubectl k' | sudo tee -a /etc/bash_completion.d/k"
+}
+
+_cmd kubeadm "Setup kubernetes clusters with kubeadm"
+_cmd_kubeadm() {
+    TAG=$1
+    need_tag
+
+    if [ "$KUBEVERSION" ]; then
+        CLUSTER_CONFIGURATION_KUBERNETESVERSION='kubernetesVersion: "v'$KUBEVERSION'"'
+        IGNORE_SYSTEMVERIFICATION="- SystemVerification"
+        IGNORE_SWAP="- Swap"
+    fi
 
     # Install a valid configuration for containerd
     # (first, the CRI interface needs to be re-enabled;
@@ -500,6 +524,8 @@ bootstrapTokens:
 nodeRegistration:
   ignorePreflightErrors:
   - NumCPU
+  $IGNORE_SYSTEMVERIFICATION
+  $IGNORE_SWAP
 ---
 kind: JoinConfiguration
 apiVersion: kubeadm.k8s.io/v1beta3
@@ -511,6 +537,8 @@ discovery:
 nodeRegistration:
   ignorePreflightErrors:
   - NumCPU
+  $IGNORE_SYSTEMVERIFICATION
+  $IGNORE_SWAP
 ---
 kind: KubeletConfiguration
 apiVersion: kubelet.config.k8s.io/v1beta1
diff --git a/prepare-labs/settings/admin-monokube.env b/prepare-labs/settings/admin-monokube.env
new file mode 100644
index 00000000..2fda770a
--- /dev/null
+++ b/prepare-labs/settings/admin-monokube.env
@@ -0,0 +1,26 @@
+CLUSTERSIZE=1
+
+CLUSTERPREFIX=monokube
+
+# We're sticking to this in the first DMUC lab,
+# because it still works with Docker, and doesn't
+# require a ServiceAccount signing key.
+KUBEVERSION=1.19.11
+
+USER_LOGIN=k8s
+USER_PASSWORD=training
+
+STEPS="
+  wait
+  standardize
+  clusterize
+  tools
+  docker
+  disabledocker
+  createuser
+  webssh
+  tailhist
+  kubebins
+  kubetools
+  ips
+"
diff --git a/prepare-labs/settings/admin-oldversion.env b/prepare-labs/settings/admin-oldversion.env
index 1ae39d7b..5d48a56d 100644
--- a/prepare-labs/settings/admin-oldversion.env
+++ b/prepare-labs/settings/admin-oldversion.env
@@ -18,7 +18,8 @@ STEPS="
   createuser
   webssh
   tailhist
-  kube
+  kubepkgs
+  kubeadm
   kubetools
   kubetest
 "
diff --git a/prepare-labs/settings/admin-dmuc.env b/prepare-labs/settings/admin-polykube.env
similarity index 67%
rename from prepare-labs/settings/admin-dmuc.env
rename to prepare-labs/settings/admin-polykube.env
index 35a22d12..8fca0763 100644
--- a/prepare-labs/settings/admin-dmuc.env
+++ b/prepare-labs/settings/admin-polykube.env
@@ -1,6 +1,6 @@
-CLUSTERSIZE=1
+CLUSTERSIZE=3
 
-CLUSTERPREFIX=dmuc
+CLUSTERPREFIX=polykube
 
 USER_LOGIN=k8s
 USER_PASSWORD=training
@@ -10,12 +10,10 @@ STEPS="
   standardize
   clusterize
   tools
-  docker
-  disabledocker
+  kubepkgs
   createuser
   webssh
   tailhist
-  kubebins
   kubetools
   ips
 "
diff --git a/prepare-labs/settings/admin-test.env b/prepare-labs/settings/admin-test.env
index 09861fce..ecf6ff83 100644
--- a/prepare-labs/settings/admin-test.env
+++ b/prepare-labs/settings/admin-test.env
@@ -14,7 +14,8 @@ STEPS="
   createuser
   webssh
   tailhist
-  kube
+  kubepkgs
+  kubeadm
   kubetools
   kubetest
-"
\ No newline at end of file
+"
diff --git a/prepare-labs/settings/kubernetes.env b/prepare-labs/settings/kubernetes.env
index 24c4f553..b5680c82 100644
--- a/prepare-labs/settings/kubernetes.env
+++ b/prepare-labs/settings/kubernetes.env
@@ -14,7 +14,8 @@ STEPS="
   createuser
   webssh
   tailhist
-  kube
+  kubepkgs
+  kubeadm
   kubetools
   kubetest
-"
\ No newline at end of file
+"
diff --git a/prepare-labs/settings/largekube.env b/prepare-labs/settings/largekube.env
index 8bd11598..60c9fd6c 100644
--- a/prepare-labs/settings/largekube.env
+++ b/prepare-labs/settings/largekube.env
@@ -15,7 +15,8 @@ STEPS="
   createuser
   webssh
   tailhist
-  kube
+  kubepkgs
+  kubeadm
   kubetools
   kubetest
 "
diff --git a/prepare-labs/setup-admin-clusters.sh b/prepare-labs/setup-admin-clusters.sh
index 3b74e73c..0f8a5f23 100755
--- a/prepare-labs/setup-admin-clusters.sh
+++ b/prepare-labs/setup-admin-clusters.sh
@@ -7,7 +7,7 @@ STUDENTS=2
 #export TF_VAR_location=eu-north-1
 export TF_VAR_node_size=S
 
-SETTINGS=admin-dmuc
+SETTINGS=admin-monokube
 TAG=$PREFIX-$SETTINGS
 ./labctl create \
 	--tag $TAG \
@@ -15,15 +15,7 @@ TAG=$PREFIX-$SETTINGS
 	--settings settings/$SETTINGS.env \
 	--students $STUDENTS
 
-SETTINGS=admin-kubenet
-TAG=$PREFIX-$SETTINGS
-./labctl create \
-	--tag $TAG \
-	--provider $PROVIDER \
-	--settings settings/$SETTINGS.env \
-	--students $STUDENTS
-
-SETTINGS=admin-kuberouter
+SETTINGS=admin-polykube
 TAG=$PREFIX-$SETTINGS
 ./labctl create \
 	--tag $TAG \