diff --git a/roles/container-engine/containerd/defaults/main.yml b/roles/container-engine/containerd/defaults/main.yml
index f01f85f38..7ab50b347 100644
--- a/roles/container-engine/containerd/defaults/main.yml
+++ b/roles/container-engine/containerd/defaults/main.yml
@@ -13,7 +13,7 @@ containerd_runc_runtime:
   engine: ""
   root: ""
   options:
-    systemCgroup: "true"
+    systemdCgroup: "{{ containerd_use_systemd_cgroup | ternary('true', 'false') }}"
 
 containerd_additional_runtimes: []
 # Example for Kata Containers as additional runtime:
diff --git a/roles/container-engine/containerd/tasks/facts.yml b/roles/container-engine/containerd/tasks/facts.yml
deleted file mode 100644
index 987b78458..000000000
--- a/roles/container-engine/containerd/tasks/facts.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-- name: set kubelet_config_extra_args options when cgroupfs is used
-  set_fact:
-    containerd_runc_runtime: "{{ containerd_runc_runtime | combine({'options':{'systemCgroup':'false'}}) }}"
-  when: not containerd_use_systemd_cgroup
diff --git a/roles/container-engine/containerd/tasks/main.yml b/roles/container-engine/containerd/tasks/main.yml
index 39779e78c..7088f340d 100644
--- a/roles/container-engine/containerd/tasks/main.yml
+++ b/roles/container-engine/containerd/tasks/main.yml
@@ -1,8 +1,4 @@
 ---
-- import_tasks: facts.yml
-  tags:
-    - facts
-
 - name: Fail containerd setup if distribution is not supported
   fail:
     msg: "{{ ansible_distribution }} is not supported by containerd."