diff --git a/releasenotes/notes/kubernetes-set-containerd-as-containter-runtime-eef9ac26d7a2d165.yaml b/releasenotes/notes/kubernetes-set-containerd-as-containter-runtime-eef9ac26d7a2d165.yaml
new file mode 100644
index 0000000..efe5eb9
--- /dev/null
+++ b/releasenotes/notes/kubernetes-set-containerd-as-containter-runtime-eef9ac26d7a2d165.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Set containerd as container runtime
diff --git a/roles/kubernetes/templates/kubeadm.yaml.j2 b/roles/kubernetes/templates/kubeadm.yaml.j2
index 9cf80f5..5ef4829 100644
--- a/roles/kubernetes/templates/kubeadm.yaml.j2
+++ b/roles/kubernetes/templates/kubeadm.yaml.j2
@@ -8,6 +8,8 @@
     cgroups-per-qos: "false"
     enforce-node-allocatable: ""
     node-ip: "{{ ansible_default_ipv4.address }}"
+    container-runtime: "remote"
+    container-runtime-endpoint: "/run/containerd/containerd.sock"
 ---
 apiVersion: kubeadm.k8s.io/v1beta2
 kind: JoinConfiguration
@@ -16,6 +18,8 @@
     cgroups-per-qos: "false"
     enforce-node-allocatable: ""
     node-ip: "{{ ansible_default_ipv4.address }}"
+    container-runtime: "remote"
+    container-runtime-endpoint: "/run/containerd/containerd.sock"
 {% if (_kubernetes_bootstrap_node is not defined) or (_kubernetes_bootstrap_node is defined and inventory_hostname != _kubernetes_bootstrap_node) %}
 discovery:
   bootstrapToken: