diff --git a/.github/workflows/on-demand_ci.yml b/.github/workflows/on-demand_ci.yml
index bdb7c32a..aa0ca643 100644
--- a/.github/workflows/on-demand_ci.yml
+++ b/.github/workflows/on-demand_ci.yml
@@ -38,7 +38,7 @@ jobs:
             kata_containers_enabled: false
           - runtime: containerd
             gvisor_enabled: true
-            kata_containers_enabled: false # TODO: Enable this once this PR is included(https://github.com/kubernetes-sigs/kubespray/pull/8797)
+            kata_containers_enabled: true
           - enable_tests: true
             krew_plugins_list: "virt"
             metallb_enabled: true
diff --git a/defaults.env b/defaults.env
index 5e07c966..5301dfa9 100755
--- a/defaults.env
+++ b/defaults.env
@@ -58,7 +58,6 @@ export KRD_KNATIVE_SERVING_NET=${KRD_KNATIVE_SERVING_NET:-kourier}
 export KRD_KNATIVE_SERVING_ENABLED=${KRD_KNATIVE_SERVING_ENABLED:-true}
 export KRD_KNATIVE_SERVING_CERT_MANAGER_ENABLED=${KRD_KNATIVE_SERVING_CERT_MANAGER_ENABLED:-false}
 export KRD_KNATIVE_EVENTING_ENABLED=${KRD_KNATIVE_EVENTING_ENABLED:-false}
-# TODO: Remove KRD_CERT_MANAGER_VERSION variable once the update is available in upstream (https://github.com/kubernetes-sigs/kubespray/pull/8377)
 export KRD_CERT_MANAGER_VERSION=${KRD_CERT_MANAGER_VERSION:-v1.16.2}
 export KRD_YOUKI_ENABLED=${KRD_YOUKI_ENABLED:-false}
 export KRD_CALICO_IPIP_MODE=${KRD_CALICO_IPIP_MODE:-Never}
diff --git a/k8s-cluster.tpl b/k8s-cluster.tpl
index bdbb836d..9a7582e4 100644
--- a/k8s-cluster.tpl
+++ b/k8s-cluster.tpl
@@ -199,6 +199,3 @@ calico_vxlan_mode: $KRD_CALICO_VXLAN_MODE
 
 # Calico network backend: "bird", "vxlan" or "none"
 calico_network_backend: $KRD_CALICO_NETWORK_BACKEND
-
-# TODO: Remove this workaround until fix is published (https://github.com/kubernetes-sigs/kubespray/pull/9845)
-crun_bin_dir: /usr/local/bin/