diff --git a/templates/docker-18.yml b/templates/docker-18.yml
index 869772209a22988991555a3fc4f67fa1bb2e99b8..7567e8c63629246209b9bce6db0afa5f30e6bcaa 100644
--- a/templates/docker-18.yml
+++ b/templates/docker-18.yml
@@ -1,7 +1,9 @@
+variables:
+  DOCKER_DRIVER: overlay2
+  DOCKER_BUILDKIT: 1
+
 .docker:
   image: docker:18
-  environment:
-    DOCKER_BUILDKIT: 1
   services:
     - name: docker:18-dind-rootless
   tags:
diff --git a/templates/docker-20.yml b/templates/docker-20.yml
index 11375efffb214969c8c828be9fa6744a0794e775..3ba8c5cf12fa89f1ec0937ea2d9481b496978135 100644
--- a/templates/docker-20.yml
+++ b/templates/docker-20.yml
@@ -1,7 +1,9 @@
+variables:
+  DOCKER_DRIVER: overlay2
+  DOCKER_BUILDKIT: 1
+
 .docker:
   image: docker:20
-  environment:
-    DOCKER_BUILDKIT: 1
   services:
     - name: docker:20-dind-rootless
   tags:
diff --git a/templates/docker-23.yml b/templates/docker-23.yml
index 595f0a928b2a9390944a38fe34eb7dce64ea1e8b..f5c02d82f6e979ab36cbc50bb07df9fbb864cf42 100644
--- a/templates/docker-23.yml
+++ b/templates/docker-23.yml
@@ -1,7 +1,9 @@
+variables:
+  DOCKER_DRIVER: overlay2
+  DOCKER_BUILDKIT: 1
+
 .docker:
   image: docker:23
-  environment:
-    DOCKER_BUILDKIT: 1
   services:
     - name: docker:23-dind-rootless
   tags:
diff --git a/templates/docker-24.yml b/templates/docker-24.yml
index c81c32e0a84eb8239a99cd06a3408ca663525302..e2ef5ee93ef5f3142d6ff62b358e40016893bc89 100644
--- a/templates/docker-24.yml
+++ b/templates/docker-24.yml
@@ -1,7 +1,9 @@
+variables:
+  DOCKER_DRIVER: overlay2
+  DOCKER_BUILDKIT: 1
+
 .docker:
   image: docker:24
-  environment:
-    DOCKER_BUILDKIT: 1
   services:
     - name: docker:24-dind-rootless
   tags: