diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 17f4f05..8fafcea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -96,31 +96,20 @@ build:docker-releases:
     - linux
     - docker
 
-check:
-  image: tonistiigi/binfmt
-  script:
-    - binfmt --version
-
 build:docker-development:
-  image: docker:20.10.11
+  image: jdrouet/docker-with-buildx:stable
 
   services:
-    - docker:20.10.11-dind
+    - docker:dind
 
   variables:
+    DOCKER_HOST: tcp://docker:2375/
     DOCKER_DRIVER: overlay2
-    BUILDX_VERSION: "v0.7.1"
-    BUILDX_ARCH: "linux-amd64"
-  before_script:
-    - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY --username
-      $CI_REGISTRY_USER --password-stdin
-    - wget -O /usr/bin/docker-buildx
-      https://github.com/docker/buildx/releases/download/${BUILDX_VERSION}/buildx-${BUILDX_VERSION}.${BUILDX_ARCH}
-    - chmod +x /usr/bin/docker-buildx
+
   script:
     - docker-buildx create --use
     - docker-buildx build 
-      --platform linux/386,linux/amd64,linux/amd64,linux/arm/v7,linux/arm64/v8
+      --platform linux/386,linux/amd64,linux/arm/v7,linux/arm64/v8
       --tag ${CI_REGISTRY_IMAGE}:test 
       --push 
       .