diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce0bd1a..5377aea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,7 +35,7 @@ stages:
 variables:
   DOCKER_HOST: tcp://docker:2375
   BASE_BUILD_REGISTRY_IMAGE: registry.gitlab.com/gitlab-org/gitlab-build-images
-  DOCKER_VERSION: "23.0.1"
+  DOCKER_VERSION: "24.0.5"
 
 dont-interrupt-me:
   extends: .dont-interrupt-me
diff --git a/.gitlab/ci/definitions.yml b/.gitlab/ci/definitions.yml
index 3fb8a05..6457919 100644
--- a/.gitlab/ci/definitions.yml
+++ b/.gitlab/ci/definitions.yml
@@ -1,7 +1,7 @@
 .install-qemu:
   timeout: 4 hours # builds with emulation can take a long time to complete
   tags:
-    - docker
+    - saas-linux-2xlarge-amd64 # use largest instance for better performance for arm64 builds
   variables:
     QEMU_IMAGE: tonistiigi/binfmt:qemu-v7.0.0
   before_script:
diff --git a/.gitlab/ci/e2e.images.yml b/.gitlab/ci/e2e.images.yml
index 8080c53..591cea8 100644
--- a/.gitlab/ci/e2e.images.yml
+++ b/.gitlab/ci/e2e.images.yml
@@ -24,7 +24,7 @@ e2e-docker:
   extends:
     - e2e
   variables:
-    DOCKER: '23.0.1'
+    DOCKER: '24.0.5'
 
 # Image with additional chrome installed
 e2e-chrome: