diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 406dbfc7e094e3e581c129fde8149761a6bc25a7..a265062254f92e3f5c6b98cbf6401a76cd703b26 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@
 # Container Scanning customization: https://docs.gitlab.com/ee/user/application_security/container_scanning/#customizing-the-container-scanning-settings
 # Note that environment variables can be set in several places
 # See https://docs.gitlab.com/ee/ci/variables/#cicd-variable-precedence
-image: docker:20.10.21
+image: docker:24
 include:
 - template: Security/Container-Scanning.gitlab-ci.yml
 - template: Security/Secret-Detection.gitlab-ci.yml
@@ -14,10 +14,10 @@ container_scanning:
     DOCKER_IMAGE: "$CI_REGISTRY_IMAGE:$CI_COMMIT_BRANCH"
     DOCKERFILE_PATH: "$CI_COMMIT_BRANCH.Dockerfile"
 docker-build-10.0:
-  image: docker:20.10.21
+  image: docker:24
   stage: build
   services:
-  - docker:20.10.21-dind
+  - docker:24-dind
   before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
@@ -26,10 +26,10 @@ docker-build-10.0:
   only:
   - '10.0'
 docker-build-12.0:
-  image: docker:20.10.21
+  image: docker:24
   stage: build
   services:
-  - docker:20.10.21-dind
+  - docker:24-dind
   before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
@@ -43,10 +43,10 @@ docker-build-12.0:
   only:
   - '12.0'
 docker-build-14.0:
-  image: docker:20.10.21
+  image: docker:24
   stage: build
   services:
-  - docker:20.10.21-dind
+  - docker:24-dind
   before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
@@ -55,10 +55,10 @@ docker-build-14.0:
   only:
   - '14.0'
 docker-build-15.0:
-  image: docker:20.10.21
+  image: docker:24
   stage: build
   services:
-  - docker:20.10.21-dind
+  - docker:24-dind
   before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
@@ -67,10 +67,10 @@ docker-build-15.0:
   only:
   - '15.0'
 docker-build-16.0:
-  image: docker:20.10.21
+  image: docker:24
   stage: build
   services:
-  - docker:20.10.21-dind
+  - docker:24-dind
   before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
@@ -79,10 +79,10 @@ docker-build-16.0:
   only:
   - '16.0'
 docker-build-16.0-scratch:
-  image: docker:20.10.21
+  image: docker:24
   stage: build
   services:
-  - docker:20.10.21-dind
+  - docker:24-dind
   before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script: