diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e5462af..52a63772 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,7 +35,7 @@ workflow:
   - { if: $CI_COMMIT_TAG =~ /^chart-.*/, when: never }
   - when: always
 
-image: docker:19.03.8
+image: docker:29.1.2
 
 prepare:
   stage: prepare
diff --git a/.image-gitlab-ci.yml b/.image-gitlab-ci.yml
index 24d32e83..66b3efd9 100644
--- a/.image-gitlab-ci.yml
+++ b/.image-gitlab-ci.yml
@@ -13,7 +13,7 @@ stages:
   - Security Scan
   - Promote Image
 
-image: docker:24.0.5
+image: docker:29.1.2
 
 .registry_template: &registry_login
   before_script:
diff --git a/lib/build/Makefile.docker_image b/lib/build/Makefile.docker_image
index 832c79f4..ea514430 100644
--- a/lib/build/Makefile.docker_image
+++ b/lib/build/Makefile.docker_image
@@ -1,7 +1,7 @@
 # Standard Makefile for Docker image
 #   created by richb@instantlinux.net 20-Apr-2017
 
-BUILDX      = https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.linux-amd64
+BUILDX      = https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-amd64
 PLATFORMS  ?= linux/amd64
 PUSH       ?= --push
 USER_LOGIN ?= instantlinux