diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f76542d..3242bec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: debian:buster-slim
+image: jdrouet/docker-with-buildx:stable
 
 variables:
     DOCKER_HOST: tcp://docker:2375/
@@ -7,17 +7,12 @@ variables:
 services:
     - docker:dind
 
-before_script:
-    - apt update && apt install -y docker.io curl qemu-user-static
-    - curl -L --output /docker-buildx "https://github.com/docker/buildx/releases/download/v0.3.1/buildx-v0.3.1.linux-amd64"
-    - chmod a+x /docker-buildx
-    - mkdir -p /usr/lib/docker/cli-plugins/
-    - cp /docker-buildx /usr/lib/docker/cli-plugins/docker-buildx
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker buildx create --use
-
 build:
     stage: build
     script:
-        - docker buildx build --platform linux/arm64/v8,linux/amd64 --tag $CI_REGISTRY_IMAGE:$DOCKER_ENV_CI_COMMIT_REF_SLUG . 
+        - apk add qemu
+        - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+        - docker buildx create --use
+        - docker info
+        - docker buildx build --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag $CI_REGISTRY_IMAGE:$DOCKER_ENV_CI_COMMIT_REF_SLUG .