diff --git a/README.md b/README.md
index a52629092..749ec7b50 100644
--- a/README.md
+++ b/README.md
@@ -162,7 +162,7 @@ Note: Upstart/SysV init based OS types are not supported.
 - Core
   - [kubernetes](https://github.com/kubernetes/kubernetes) v1.29.1
   - [etcd](https://github.com/etcd-io/etcd) v3.5.10
-  - [docker](https://www.docker.com/) v20.10 (see note)
+  - [docker](https://www.docker.com/) v24.0 (see [Note](#container-runtime-notes))
   - [containerd](https://containerd.io/) v1.7.13
   - [cri-o](http://cri-o.io/) v1.29.1 (experimental: see [CRI-O Note](docs/cri-o.md). Only on fedora, ubuntu and centos based OS)
 - Network Plugin
@@ -196,7 +196,7 @@ Note: Upstart/SysV init based OS types are not supported.
 
 ## Container Runtime Notes
 
-- Supported Docker versions are 18.09, 19.03, 20.10, 23.0 and 24.0. The *recommended* Docker version is 20.10 (except on Debian bookworm which without supporting for 20.10 and below any more). `Kubelet` might break on docker's non-standard version numbering (it no longer uses semantic versioning). To ensure auto-updates don't break your cluster look into e.g. the YUM  ``versionlock`` plugin or ``apt pin``).
+- Supported Docker versions are 18.09, 19.03, 20.10, 23.0 and 24.0. The *recommended* Docker version is 24.0. `Kubelet` might break on docker's non-standard version numbering (it no longer uses semantic versioning). To ensure auto-updates don't break your cluster look into e.g. the YUM  ``versionlock`` plugin or ``apt pin``).
 - The cri-o version should be aligned with the respective kubernetes version (i.e. kube_version=1.20.x, crio_version=1.20)
 
 ## Requirements
diff --git a/roles/container-engine/docker/defaults/main.yml b/roles/container-engine/docker/defaults/main.yml
index e537558c3..f7562086a 100644
--- a/roles/container-engine/docker/defaults/main.yml
+++ b/roles/container-engine/docker/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-docker_version: '20.10'
+docker_version: '24.0'
 docker_cli_version: "{{ docker_version }}"
 
 docker_package_info:
diff --git a/roles/container-engine/docker/vars/debian-bookworm.yml b/roles/container-engine/docker/vars/debian-bookworm.yml
deleted file mode 100644
index 74a66ccb3..000000000
--- a/roles/container-engine/docker/vars/debian-bookworm.yml
+++ /dev/null
@@ -1,48 +0,0 @@
----
-docker_version: 24.0
-docker_cli_version: 24.0
-docker_containerd_version: 1.6.21
-
-# containerd package info is only relevant for docker
-containerd_versioned_pkg:
-  'latest': "{{ containerd_package }}"
-  '1.6.16': "{{ containerd_package }}=1.6.16-1"
-  '1.6.18': "{{ containerd_package }}=1.6.18-1"
-  '1.6.19': "{{ containerd_package }}=1.6.19-1"
-  '1.6.20': "{{ containerd_package }}=1.6.20-1"
-  '1.6.21': "{{ containerd_package }}=1.6.21-1"
-  'stable': "{{ containerd_package }}=1.6.21-1"
-  'edge': "{{ containerd_package }}=1.6.21-1"
-
-# https://download.docker.com/linux/debian/
-docker_versioned_pkg:
-  'latest': docker-ce
-  '23.0': docker-ce=5:23.0.6-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
-  '24.0': docker-ce=5:24.0.2-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
-  'stable': docker-ce=5:24.0.2-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
-  'edge': docker-ce=5:24.0.2-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
-
-docker_cli_versioned_pkg:
-  'latest': docker-ce-cli
-  '23.0': docker-ce=5:23.0.6-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
-  '24.0': docker-ce=5:24.0.2-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
-  'stable': docker-ce=5:24.0.2-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
-  'edge': docker-ce=5:24.0.2-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
-
-docker_package_info:
-  pkgs:
-    - "{{ containerd_versioned_pkg[docker_containerd_version | string] }}"
-    - "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
-    - "{{ docker_versioned_pkg[docker_version | string] }}"
-
-docker_repo_key_info:
-  url: '{{ docker_debian_repo_gpgkey }}'
-  repo_keys:
-    - '{{ docker_debian_repo_repokey }}'
-
-docker_repo_info:
-  repos:
-    - >
-      deb {{ docker_debian_repo_base_url }}
-      {{ ansible_distribution_release | lower }}
-      stable
diff --git a/roles/container-engine/docker/vars/debian.yml b/roles/container-engine/docker/vars/debian.yml
index 9f06004c5..02289fa45 100644
--- a/roles/container-engine/docker/vars/debian.yml
+++ b/roles/container-engine/docker/vars/debian.yml
@@ -22,8 +22,9 @@ containerd_versioned_pkg:
   '1.6.15': "{{ containerd_package }}=1.6.15-1"
   '1.6.16': "{{ containerd_package }}=1.6.16-1"
   '1.6.18': "{{ containerd_package }}=1.6.18-1"
-  'stable': "{{ containerd_package }}=1.6.18-1"
-  'edge': "{{ containerd_package }}=1.6.18-1"
+  '1.6.28': "{{ containerd_package }}=1.6.28-1"
+  'stable': "{{ containerd_package }}=1.6.28-1"
+  'edge': "{{ containerd_package }}=1.6.28-1"
 
 # https://download.docker.com/linux/debian/
 docker_versioned_pkg:
@@ -31,16 +32,20 @@ docker_versioned_pkg:
   '18.09': docker-ce=5:18.09.9~3-0~debian-{{ ansible_distribution_release | lower }}
   '19.03': docker-ce=5:19.03.15~3-0~debian-{{ ansible_distribution_release | lower }}
   '20.10': docker-ce=5:20.10.20~3-0~debian-{{ ansible_distribution_release | lower }}
-  'stable': docker-ce=5:20.10.20~3-0~debian-{{ ansible_distribution_release | lower }}
-  'edge': docker-ce=5:20.10.20~3-0~debian-{{ ansible_distribution_release | lower }}
+  '23.0': docker-ce=5:23.0.6-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
+  '24.0': docker-ce=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
+  'stable': docker-ce=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
+  'edge': docker-ce=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
 
 docker_cli_versioned_pkg:
   'latest': docker-ce-cli
   '18.09': docker-ce-cli=5:18.09.9~3-0~debian-{{ ansible_distribution_release | lower }}
   '19.03': docker-ce-cli=5:19.03.15~3-0~debian-{{ ansible_distribution_release | lower }}
   '20.10': docker-ce-cli=5:20.10.20~3-0~debian-{{ ansible_distribution_release | lower }}
-  'stable': docker-ce-cli=5:20.10.20~3-0~debian-{{ ansible_distribution_release | lower }}
-  'edge': docker-ce-cli=5:20.10.20~3-0~debian-{{ ansible_distribution_release | lower }}
+  '23.0': docker-ce-cli=5:23.0.6-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
+  '24.0': docker-ce-cli=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
+  'stable': docker-ce-cli=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
+  'edge': docker-ce-cli=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
 
 docker_package_info:
   pkgs:
diff --git a/roles/container-engine/docker/vars/fedora.yml b/roles/container-engine/docker/vars/fedora.yml
index f0b78620a..39dfbafe5 100644
--- a/roles/container-engine/docker/vars/fedora.yml
+++ b/roles/container-engine/docker/vars/fedora.yml
@@ -22,8 +22,9 @@ containerd_versioned_pkg:
   '1.6.15': "{{ containerd_package }}-1.6.15-3.1.fc{{ ansible_distribution_major_version }}"
   '1.6.16': "{{ containerd_package }}-1.6.16-3.1.fc{{ ansible_distribution_major_version }}"
   '1.6.18': "{{ containerd_package }}-1.6.18-3.1.fc{{ ansible_distribution_major_version }}"
-  'stable': "{{ containerd_package }}-1.6.18-3.1.fc{{ ansible_distribution_major_version }}"
-  'edge': "{{ containerd_package }}-1.6.18-3.1.fc{{ ansible_distribution_major_version }}"
+  '1.6.28': "{{ containerd_package }}-1.6.28-3.1.fc{{ ansible_distribution_major_version }}"
+  'stable': "{{ containerd_package }}-1.6.28-3.1.fc{{ ansible_distribution_major_version }}"
+  'edge': "{{ containerd_package }}-1.6.28-3.1.fc{{ ansible_distribution_major_version }}"
 
 # https://docs.docker.com/install/linux/docker-ce/fedora/
 # https://download.docker.com/linux/fedora/<fedora-version>/x86_64/stable/Packages/
@@ -31,15 +32,19 @@ docker_versioned_pkg:
   'latest': docker-ce
   '19.03': docker-ce-19.03.15-3.fc{{ ansible_distribution_major_version }}
   '20.10': docker-ce-20.10.20-3.fc{{ ansible_distribution_major_version }}
-  'stable': docker-ce-20.10.20-3.fc{{ ansible_distribution_major_version }}
-  'edge': docker-ce-20.10.20-3.fc{{ ansible_distribution_major_version }}
+  '23.0': docker-ce-3:23.0.6-1.fc{{ ansible_distribution_major_version }}
+  '24.0': docker-ce-3:24.0.9-1.fc{{ ansible_distribution_major_version }}
+  'stable': docker-ce-3:24.0.9-1.fc{{ ansible_distribution_major_version }}
+  'edge': docker-ce-3:24.0.9-1.fc{{ ansible_distribution_major_version }}
 
 docker_cli_versioned_pkg:
   'latest': docker-ce-cli
   '19.03': docker-ce-cli-19.03.15-3.fc{{ ansible_distribution_major_version }}
   '20.10': docker-ce-cli-20.10.20-3.fc{{ ansible_distribution_major_version }}
-  'stable': docker-ce-cli-20.10.20-3.fc{{ ansible_distribution_major_version }}
-  'edge': docker-ce-cli-20.10.20-3.fc{{ ansible_distribution_major_version }}
+  '23.0': docker-ce-cli-1:23.0.6-1.fc{{ ansible_distribution_major_version }}
+  '24.0': docker-ce-cli-1:24.0.9-1.fc{{ ansible_distribution_major_version }}
+  'stable': docker-ce-cli-1:24.0.9-1.fc{{ ansible_distribution_major_version }}
+  'edge': docker-ce-cli-1:24.0.9-1.fc{{ ansible_distribution_major_version }}
 
 docker_package_info:
   enablerepo: "docker-ce"
diff --git a/roles/container-engine/docker/vars/kylin.yml b/roles/container-engine/docker/vars/kylin.yml
index b933f151f..2b8cdf7e6 100644
--- a/roles/container-engine/docker/vars/kylin.yml
+++ b/roles/container-engine/docker/vars/kylin.yml
@@ -22,8 +22,9 @@ containerd_versioned_pkg:
   '1.6.15': "{{ containerd_package }}-1.6.15-3.1.el{{ ansible_distribution_major_version }}"
   '1.6.16': "{{ containerd_package }}-1.6.16-3.1.el{{ ansible_distribution_major_version }}"
   '1.6.18': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
-  'stable': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
-  'edge': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
+  '1.6.28': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}"
+  'stable': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}"
+  'edge': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}"
 
 docker_version: 19.03
 docker_cli_version: 19.03
@@ -33,17 +34,21 @@ docker_cli_version: 19.03
 # or do 'yum --showduplicates list docker-engine'
 docker_versioned_pkg:
   'latest': docker-ce
-  '18.09': docker-ce-3:18.09.9-3.el7
+  '18.09': docker-ce-3:18.09.9-3.el{{ ansible_distribution_major_version }}
   '19.03': docker-ce-3:19.03.15-3.el{{ ansible_distribution_major_version }}
-  'stable': docker-ce-3:19.03.15-3.el{{ ansible_distribution_major_version }}
-  'edge': docker-ce-3:19.03.15-3.el{{ ansible_distribution_major_version }}
+  '23.0': docker-ce-3:23.0.6-1.el{{ ansible_distribution_major_version }}
+  '24.0': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'stable': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'edge': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }}
 
 docker_cli_versioned_pkg:
   'latest': docker-ce-cli
-  '18.09': docker-ce-cli-1:18.09.9-3.el7
+  '18.09': docker-ce-cli-1:18.09.9-3.el{{ ansible_distribution_major_version }}
   '19.03': docker-ce-cli-1:19.03.15-3.el{{ ansible_distribution_major_version }}
-  'stable': docker-ce-cli-1:19.03.15-3.el{{ ansible_distribution_major_version }}
-  'edge': docker-ce-cli-1:19.03.15-3.el{{ ansible_distribution_major_version }}
+  '23.0': docker-ce-cli-1:23.0.6-1.el{{ ansible_distribution_major_version }}
+  '24.0': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'stable': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'edge': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }}
 
 docker_package_info:
   enablerepo: "docker-ce"
diff --git a/roles/container-engine/docker/vars/redhat-7.yml b/roles/container-engine/docker/vars/redhat-7.yml
index f50d99d75..c10e881d9 100644
--- a/roles/container-engine/docker/vars/redhat-7.yml
+++ b/roles/container-engine/docker/vars/redhat-7.yml
@@ -22,7 +22,8 @@ containerd_versioned_pkg:
   '1.6.15': "{{ containerd_package }}-1.6.15-3.1.el7"
   '1.6.16': "{{ containerd_package }}-1.6.16-3.1.el7"
   '1.6.18': "{{ containerd_package }}-1.6.18-3.1.el7"
-  'stable': "{{ containerd_package }}-1.6.18-3.1.el7"
+  '1.6.28': "{{ containerd_package }}-1.6.28-3.1.el7"
+  'stable': "{{ containerd_package }}-1.6.28-3.1.el7"
   'edge': "{{ containerd_package }}-1.6.18-3.1.el7"
 
 # https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package
@@ -33,16 +34,20 @@ docker_versioned_pkg:
   '18.09': docker-ce-18.09.9-3.el7
   '19.03': docker-ce-19.03.15-3.el7
   '20.10': docker-ce-20.10.20-3.el7
-  'stable': docker-ce-20.10.20-3.el7
-  'edge': docker-ce-20.10.20-3.el7
+  '23.0': docker-ce-23.0.6-1.el7
+  '24.0': docker-ce-24.0.9-1.el7
+  'stable': docker-ce-24.0.9-1.el7
+  'edge': docker-ce-24.0.9-1.el7
 
 docker_cli_versioned_pkg:
   'latest': docker-ce-cli
   '18.09': docker-ce-cli-18.09.9-3.el7
   '19.03': docker-ce-cli-19.03.15-3.el7
   '20.10': docker-ce-cli-20.10.20-3.el7
-  'stable': docker-ce-cli-20.10.20-3.el7
-  'edge': docker-ce-cli-20.10.20-3.el7
+  '23.0': docker-ce-cli-23.0.6-1.el7
+  '24.0': docker-ce-cli-24.0.9-1.el7
+  'stable': docker-ce-cli-24.0.9-1.el7
+  'edge': docker-ce-cli-24.0.9-1.el7
 
 docker_package_info:
   enablerepo: "docker-ce"
diff --git a/roles/container-engine/docker/vars/redhat.yml b/roles/container-engine/docker/vars/redhat.yml
index 1de2cbe94..453f7f9fa 100644
--- a/roles/container-engine/docker/vars/redhat.yml
+++ b/roles/container-engine/docker/vars/redhat.yml
@@ -22,8 +22,9 @@ containerd_versioned_pkg:
   '1.6.15': "{{ containerd_package }}-1.6.15-3.1.el{{ ansible_distribution_major_version }}"
   '1.6.16': "{{ containerd_package }}-1.6.16-3.1.el{{ ansible_distribution_major_version }}"
   '1.6.18': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
-  'stable': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
-  'edge': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
+  '1.6.28': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}"
+  'stable': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}"
+  'edge': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}"
 
 # https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package
 # https://download.docker.com/linux/centos/<centos_version>>/x86_64/stable/Packages/
@@ -33,16 +34,20 @@ docker_versioned_pkg:
   '18.09': docker-ce-3:18.09.9-3.el7
   '19.03': docker-ce-3:19.03.15-3.el{{ ansible_distribution_major_version }}
   '20.10': docker-ce-3:20.10.20-3.el{{ ansible_distribution_major_version }}
-  'stable': docker-ce-3:20.10.20-3.el{{ ansible_distribution_major_version }}
-  'edge': docker-ce-3:20.10.20-3.el{{ ansible_distribution_major_version }}
+  '23.0': docker-ce-3:23.0.6-1.el{{ ansible_distribution_major_version }}
+  '24.0': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'stable': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'edge': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }}
 
 docker_cli_versioned_pkg:
   'latest': docker-ce-cli
   '18.09': docker-ce-cli-1:18.09.9-3.el7
   '19.03': docker-ce-cli-1:19.03.15-3.el{{ ansible_distribution_major_version }}
   '20.10': docker-ce-cli-1:20.10.20-3.el{{ ansible_distribution_major_version }}
-  'stable': docker-ce-cli-1:20.10.20-3.el{{ ansible_distribution_major_version }}
-  'edge': docker-ce-cli-1:20.10.20-3.el{{ ansible_distribution_major_version }}
+  '23.0': docker-ce-cli-1:23.0.6-1.el{{ ansible_distribution_major_version }}
+  '24.0': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'stable': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'edge': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }}
 
 docker_package_info:
   enablerepo: "docker-ce"
diff --git a/roles/container-engine/docker/vars/ubuntu.yml b/roles/container-engine/docker/vars/ubuntu.yml
index 313849eeb..b4c1d289c 100644
--- a/roles/container-engine/docker/vars/ubuntu.yml
+++ b/roles/container-engine/docker/vars/ubuntu.yml
@@ -22,8 +22,9 @@ containerd_versioned_pkg:
   '1.6.15': "{{ containerd_package }}=1.6.15-1"
   '1.6.16': "{{ containerd_package }}=1.6.16-1"
   '1.6.18': "{{ containerd_package }}=1.6.18-1"
-  'stable': "{{ containerd_package }}=1.6.18-1"
-  'edge': "{{ containerd_package }}=1.6.18-1"
+  '1.6.28': "{{ containerd_package }}=1.6.28-1"
+  'stable': "{{ containerd_package }}=1.6.28-1"
+  'edge': "{{ containerd_package }}=1.6.28-1"
 
 # https://download.docker.com/linux/ubuntu/
 docker_versioned_pkg:
@@ -31,16 +32,20 @@ docker_versioned_pkg:
   '18.09': docker-ce=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release | lower }}
   '19.03': docker-ce=5:19.03.15~3-0~ubuntu-{{ ansible_distribution_release | lower }}
   '20.10': docker-ce=5:20.10.20~3-0~ubuntu-{{ ansible_distribution_release | lower }}
-  'stable': docker-ce=5:20.10.20~3-0~ubuntu-{{ ansible_distribution_release | lower }}
-  'edge': docker-ce=5:20.10.20~3-0~ubuntu-{{ ansible_distribution_release | lower }}
+  '23.0': docker-ce=5:23.0.6-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }}
+  '24.0': docker-ce=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }}
+  'stable': docker-ce=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }}
+  'edge': docker-ce=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }}
 
 docker_cli_versioned_pkg:
   'latest': docker-ce-cli
   '18.09': docker-ce-cli=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release | lower }}
   '19.03': docker-ce-cli=5:19.03.15~3-0~ubuntu-{{ ansible_distribution_release | lower }}
   '20.10': docker-ce-cli=5:20.10.20~3-0~ubuntu-{{ ansible_distribution_release | lower }}
-  'stable': docker-ce-cli=5:20.10.20~3-0~ubuntu-{{ ansible_distribution_release | lower }}
-  'edge': docker-ce-cli=5:20.10.20~3-0~ubuntu-{{ ansible_distribution_release | lower }}
+  '23.0': docker-ce-cli=5:23.0.6-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }}
+  '24.0': docker-ce-cli=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }}
+  'stable': docker-ce-cli=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }}
+  'edge': docker-ce-cli=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }}
 
 docker_package_info:
   pkgs:
diff --git a/roles/container-engine/docker/vars/uniontech.yml b/roles/container-engine/docker/vars/uniontech.yml
index d41cb3bd6..0749726d1 100644
--- a/roles/container-engine/docker/vars/uniontech.yml
+++ b/roles/container-engine/docker/vars/uniontech.yml
@@ -20,8 +20,9 @@ containerd_versioned_pkg:
   '1.6.15': "{{ containerd_package }}-1.6.15-3.1.el{{ ansible_distribution_major_version }}"
   '1.6.16': "{{ containerd_package }}-1.6.16-3.1.el{{ ansible_distribution_major_version }}"
   '1.6.18': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
-  'stable': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
-  'edge': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
+  '1.6.28': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}"
+  'stable': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}"
+  'edge': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}"
 
 docker_version: 19.03
 docker_cli_version: 19.03
@@ -34,16 +35,20 @@ docker_versioned_pkg:
   '18.09': docker-ce-3:18.09.9-3.el7
   '19.03': docker-ce-3:19.03.15-3.el{{ ansible_distribution_major_version }}
   '20.10': docker-ce-3:20.10.17-3.el{{ ansible_distribution_major_version }}
-  'stable': docker-ce-3:20.10.17-3.el{{ ansible_distribution_major_version }}
-  'edge': docker-ce-3:20.10.17-3.el{{ ansible_distribution_major_version }}
+  '23.0': docker-ce-3:23.0.6-1.el{{ ansible_distribution_major_version }}
+  '24.0': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'stable': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'edge': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }}
 
 docker_cli_versioned_pkg:
   'latest': docker-ce-cli
   '18.09': docker-ce-cli-1:18.09.9-3.el7
   '19.03': docker-ce-cli-1:19.03.15-3.el{{ ansible_distribution_major_version }}
   '20.10': docker-ce-cli-1:20.10.17-3.el{{ ansible_distribution_major_version }}
-  'stable': docker-ce-cli-1:20.10.17-3.el{{ ansible_distribution_major_version }}
-  'edge': docker-ce-cli-1:20.10.17-3.el{{ ansible_distribution_major_version }}
+  '23.0': docker-ce-cli-1:23.0.6-1.el{{ ansible_distribution_major_version }}
+  '24.0': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'stable': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'edge': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }}
 
 docker_package_info:
   enablerepo: "docker-ce"
diff --git a/roles/kubespray-defaults/defaults/main/checksums.yml b/roles/kubespray-defaults/defaults/main/checksums.yml
index 8f26d06a5..d8ed64c43 100644
--- a/roles/kubespray-defaults/defaults/main/checksums.yml
+++ b/roles/kubespray-defaults/defaults/main/checksums.yml
@@ -657,6 +657,8 @@ helm_archive_checksums:
     v3.10.3: 93cdf398abc68e388d1b46d49d8e1197544930ecd3e81cc58d0a87a4579d60ed
 cri_dockerd_archive_checksums:
   arm:
+    0.3.9: 0
+    0.3.8: 0
     0.3.7: 0
     0.3.6: 0
     0.3.5: 0
@@ -668,6 +670,8 @@ cri_dockerd_archive_checksums:
     0.2.6: 0
     0.2.5: 0
   arm64:
+    0.3.9: f5051002b4f95b0e8fe7fbd5f8de4493350e010834d2a8b647f2b26c45c6c203
+    0.3.8: 64286af171785f0facb72cf364867600b4db19f43a01db49b8b364f5d04aadae
     0.3.7: 8da54563ee7ddee36b1adf1f96b3b7b97ec2bc0ec23559b89d9af8eae5e62d9e
     0.3.6: 793b8f57cecf734c47bface10387a8e90994c570b516cb755900f21ebd0a663b
     0.3.5: c20014dc5a71e6991a3bd7e1667c744e3807b5675b1724b26bb7c70093582cfe
@@ -679,6 +683,8 @@ cri_dockerd_archive_checksums:
     0.2.6: 90122641e45e8ff81dbdd4d84c06fd9744b807b87bff5d0db7f826ded326a9fd
     0.2.5: 067242bf5e4b39fece10500a239612c7b0723ce9766ba309dbd22acaf1a2def2
   amd64:
+    0.3.9: a6d9b4b796e9eff830311a2349d259507302cb3955dd07b78296b91e40e8b433
+    0.3.8: e12ea6df8228b7d0794c930d32117c4e5a3dcf25a56c3facdf7006289ec6383c
     0.3.7: 518c5d5345085f36d311f274208705d7fdb79337a80c256871ce941d5a7d47a1
     0.3.6: cf271d65abee88c0c0a6d9dacb151913bf37d25d45913a7e04b09efe408eae18
     0.3.5: 30d47bd89998526d51a8518f9e8ef10baed408ab273879ee0e30350702092938
@@ -690,6 +696,8 @@ cri_dockerd_archive_checksums:
     0.2.6: 5d57b160d5a1f75333149823bec3e291a1a0960383ddc9ddd6e4ff177382c755
     0.2.5: 1660052586390fd2668421d16265dfcc2bbdba79d923c7ede268cf91935657c1
   ppc64le:
+    0.3.9: 0
+    0.3.8: 0
     0.3.7: 0
     0.3.6: 0
     0.3.5: 0
diff --git a/roles/kubespray-defaults/defaults/main/download.yml b/roles/kubespray-defaults/defaults/main/download.yml
index ee54f9667..2080f43aa 100644
--- a/roles/kubespray-defaults/defaults/main/download.yml
+++ b/roles/kubespray-defaults/defaults/main/download.yml
@@ -81,10 +81,10 @@ kata_containers_version: 3.1.3
 youki_version: 0.1.0
 gvisor_version: 20230807
 containerd_version: 1.7.13
-cri_dockerd_version: 0.3.4
+cri_dockerd_version: 0.3.9
 
 # this is relevant when container_manager == 'docker'
-docker_containerd_version: 1.6.16
+docker_containerd_version: 1.6.28
 
 # gcr and kubernetes image repo define
 gcr_image_repo: "gcr.io"