diff --git a/Dockerfile.docker-builder b/Dockerfile.docker-builder
index 396be229d07a9574022529c02e03f37c69867680..22c5296fcc06c47f649550f45f480e2f25ebc3dd 100644
--- a/Dockerfile.docker-builder
+++ b/Dockerfile.docker-builder
@@ -1,6 +1,6 @@
-FROM docker:20.10.21 AS docker-builder
+FROM docker:24.0.1-cli AS docker-builder
 
 RUN apk add --no-cache bash git ca-certificates curl
 RUN adduser -D hived
 USER hived
-WORKDIR /home/hived
\ No newline at end of file
+WORKDIR /home/hived
diff --git a/Dockerfile.docker-dind b/Dockerfile.docker-dind
index 979f9ad7394363fe693f7d9bfdc1c1843846567d..1f7e9f6817e94e5b8dd3eb88c1b825c0b876ac50 100644
--- a/Dockerfile.docker-dind
+++ b/Dockerfile.docker-dind
@@ -1,7 +1,7 @@
 # To workaround a gitlab healthcheck bug, expose just single port. 
 # See https://gitlab.com/gitlab-org/gitlab-runner/-/issues/29130#note_1028331564 and
 # https://gitlab.com/search?search=Service+docker+dind+probably+didn%27t+start+properly&nav_source=navbar&project_id=250833&group_id=9970&scope=issues&sort=updated_desc
-FROM docker:20.10.21-dind as upstream
+FROM docker:24.0.1-dind as upstream
 
 FROM scratch