diff --git a/.gitlab/ci/docker.images.yml b/.gitlab/ci/docker.images.yml
index 1f49b90..bbdd9f8 100644
--- a/.gitlab/ci/docker.images.yml
+++ b/.gitlab/ci/docker.images.yml
@@ -3,8 +3,8 @@
   extends:
     - .build_dynamic_image
   variables:
-    DOCKER: '20.10.21'
-    BUILDX: '0.9'
+    DOCKER: '23.0.0'
+    BUILDX: '0.10'
   rules:
     - !reference [.build_dynamic_image, rules]
     - changes:
@@ -14,11 +14,6 @@
 docker:
   extends:
     - .docker
-  variables:
-    OS: "debian:bullseye"
-
-docker-slim:
-  extends:
-    - .docker
-  variables:
-    OS: "debian:bullseye-slim"
+  parallel:
+    matrix:
+      - OS: ['debian:bullseye', 'debian:bullseye-slim']
diff --git a/.gitlab/ci/e2e.images.yml b/.gitlab/ci/e2e.images.yml
index 761c2ee..97114fa 100644
--- a/.gitlab/ci/e2e.images.yml
+++ b/.gitlab/ci/e2e.images.yml
@@ -24,7 +24,7 @@ e2e-docker:
   extends:
     - e2e
   variables:
-    DOCKER: '20.10.14'
+    DOCKER: '23.0.0'
 
 # Image with additional chrome installed
 e2e-chrome:
diff --git a/scripts/lib/custom-docker-build b/scripts/lib/custom-docker-build
index f9782cb..be658af 100755
--- a/scripts/lib/custom-docker-build
+++ b/scripts/lib/custom-docker-build
@@ -187,6 +187,11 @@ function print_buildx_args() {
             BUILDX_DOWNLOAD_SHA256[amd64]=a7fb95177792ca8ffc7243fad7bf2f33738b8b999a184b6201f002a63c43d136
             BUILDX_DOWNLOAD_SHA256[arm64]=bbf6a76bf9aef9c5759ff225b97ce23a24fc11e4fa3cdcae36e5dcf1de2cffc5
             ;;
+        0.10)
+            BUILDX_VERSION=0.10.2
+            BUILDX_DOWNLOAD_SHA256[amd64]=ee5a5e3ebf5e5c73ac840993720bd1e72c4beb3b4ee9e85e2d6b4364cac87d89
+            BUILDX_DOWNLOAD_SHA256[arm64]=5f6c706833221cd2cae267ac8612c1809f9d7e8f3fe87707ae86cb695c560cd9
+            ;;
         *) fail "Unknown buildx version $1" ;;
     esac