diff --git a/tasks/install_server.yml b/tasks/install_server.yml
index db510df..659abe0 100644
--- a/tasks/install_server.yml
+++ b/tasks/install_server.yml
@@ -53,23 +53,23 @@
   when:
     - kubernetes_kubeproxy_mode == "ipvs"
 
-#- name: Ensuring /etc/systemd/system/kubelet.service.d Folder Exists
-#  file:
-#    path: "/etc/systemd/system/kubelet.service.d"
-#    state: "directory"
-#    group: root
-#    owner: root
-#    mode: 0755
-#
-#- name: Configure kubelet service
-#  template:
-#    src: "etc/{{ item }}.j2"
-#    dest: "/etc/{{ item }}"
-#    group: root
-#    owner: root
-#    mode: 0644
-#  with_items:
-#    - "systemd/system/kubelet.service.d/0-containerd.conf"
+- name: Ensuring /etc/systemd/system/kubelet.service.d Folder Exists
+  file:
+    path: "/etc/systemd/system/kubelet.service.d"
+    state: "directory"
+    group: root
+    owner: root
+    mode: 0755
+
+- name: Configure kubelet service
+  template:
+    src: "etc/{{ item }}.j2"
+    dest: "/etc/{{ item }}"
+    group: root
+    owner: root
+    mode: 0644
+  with_items:
+    - "systemd/system/kubelet.service.d/0-kubelet-extra-args.conf"
 #    - "sysconfig/kubelet"
 
 - name: Enable kubelet on boot
diff --git a/templates/etc/systemd/system/kubelet.service.d/0-containerd.conf.j2 b/templates/etc/systemd/system/kubelet.service.d/0-containerd.conf.j2
deleted file mode 100644
index 9cf7b5d..0000000
--- a/templates/etc/systemd/system/kubelet.service.d/0-containerd.conf.j2
+++ /dev/null
@@ -1,2 +0,0 @@
-[Service]
-Environment="KUBELET_EXTRA_ARGS=--cgroup-driver=systemd --container-runtime=remote --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock --node-ip="{{ ansible_eth0.ipv4.address }}"
diff --git a/templates/etc/systemd/system/kubelet.service.d/0-kubelet-extra-args.conf.j2 b/templates/etc/systemd/system/kubelet.service.d/0-kubelet-extra-args.conf.j2
new file mode 100644
index 0000000..6325b64
--- /dev/null
+++ b/templates/etc/systemd/system/kubelet.service.d/0-kubelet-extra-args.conf.j2
@@ -0,0 +1,2 @@
+[Service]
+Environment=KUBELET_EXTRA_ARGS="--cgroup-driver=systemd --container-runtime=remote --runtime-request-timeout=5m --container-runtime-endpoint={% if kubernetes_cri == "containerd" %}unix:///run/containerd/containerd.sock{% elif kubernetes_cri == "cri-o" %}unix:///var/run/crio/crio.sock{% endif %} --node-ip={{ ansible_eth0.ipv4.address }}"