diff --git a/deploy/helm/kubefarm/templates/ltsp-configmap.yaml b/deploy/helm/kubefarm/templates/ltsp-configmap.yaml
index 129492e..3611049 100644
--- a/deploy/helm/kubefarm/templates/ltsp-configmap.yaml
+++ b/deploy/helm/kubefarm/templates/ltsp-configmap.yaml
@@ -96,9 +96,10 @@ data:
     mkdir -p /etc/systemd/system/kubelet.service.d
     ( LABELS=$(echo_values "KUBERNETES_LABELS_[[:alnum:]_]*" | paste -s -d,)
       TAINTS=$(echo_values "KUBERNETES_TAINTS_[[:alnum:]_]*" | paste -s -d,)
-      printf "[Service]\nEnvironment=\"KUBELET_EXTRA_ARGS=%s %s\"\n" \
-        "${LABELS:+--node-labels=$LABELS}" "${TAINTS:+--register-with-taints=$TAINTS}"
-    ) > /etc/systemd/system/kubelet.service.d/20-labels-taints.conf
+      EXTRA_ARGS=$(echo_values "KUBELET_EXTRA_ARGS_[[:alnum:]_]*" | paste -s -d" ")
+      printf "[Service]\nEnvironment=\"KUBELET_EXTRA_ARGS=%s %s %s\"\n" \
+        "${LABELS:+--node-labels=$LABELS}" "${TAINTS:+--register-with-taints=$TAINTS}" "$EXTRA_ARGS"
+    ) > /etc/systemd/system/kubelet.service.d/99-extra-args.conf
 
     {{- with index .Values.ltsp.config.sections "init/" }}
     {{- . | nindent 4 }}
diff --git a/deploy/helm/kubefarm/values.yaml b/deploy/helm/kubefarm/values.yaml
index 100f137..df9abc4 100644
--- a/deploy/helm/kubefarm/values.yaml
+++ b/deploy/helm/kubefarm/values.yaml
@@ -185,6 +185,7 @@ tags:
     all:
       FSTAB_KUBELET: "tmpfs /var/lib/kubelet tmpfs x-systemd.wanted-by=kubelet.service 0 0"
       FSTAB_DOCKER: "tmpfs /var/lib/docker tmpfs x-systemd.wanted-by=docker.service 0 0"
+      KUBELET_EXTRA_ARGS_CGROUP: "--cgroup-driver=systemd"
     debug:
       DEBUG_SHELL: "1"
 
@@ -200,4 +201,3 @@ tags:
     #  - effect: NoSchedule
     #    key: foo
     #    value: bar
-