diff --git a/nixos/kubeadm/bootstrap/controller.py b/nixos/kubeadm/bootstrap/controller.py
index e9a4c6b..f758d42 100755
--- a/nixos/kubeadm/bootstrap/controller.py
+++ b/nixos/kubeadm/bootstrap/controller.py
@@ -212,6 +212,7 @@ class Controller:
         self.remote(ip, "sudo systemctl disable kubelet >/dev/null 2>&1 || true")
         self.remote(ip, "sudo systemctl mask kubelet >/dev/null 2>&1 || true")
         self.remote(ip, "sudo systemctl reset-failed kubelet >/dev/null 2>&1 || true")
+        self.remote(ip, "sudo rm -f /var/lib/kubelet/config.yaml /var/lib/kubelet/kubeadm-flags.env || true")
 
     def prepare_remote_space(self, ip):
         self.remote(ip, "sudo nix-collect-garbage -d || true")
diff --git a/nixos/kubeadm/modules/k8s-common.nix b/nixos/kubeadm/modules/k8s-common.nix
index 35797e9..6456531 100644
--- a/nixos/kubeadm/modules/k8s-common.nix
+++ b/nixos/kubeadm/modules/k8s-common.nix
@@ -138,6 +138,7 @@ in
 
       systemctl daemon-reload
       systemctl unmask kubelet || true
+      systemctl enable kubelet || true
 
       echo "==> Ensuring containerd is running"
       systemctl start containerd || true
@@ -340,7 +341,6 @@ in
 
   systemd.services.kubelet = {
     description = "Kubernetes Kubelet";
-    wantedBy = lib.mkForce [];
     wants = [ "network-online.target" ];
     after = [ "containerd.service" "network-online.target" ];
     serviceConfig = {