diff --git a/.gitlab/ci/tagged-build.yml b/.gitlab/ci/tagged-build.yml
index a41383a..c2e0674 100644
--- a/.gitlab/ci/tagged-build.yml
+++ b/.gitlab/ci/tagged-build.yml
@@ -94,17 +94,18 @@ release-prod-windows-amd64:
     - branches
 
 docker-build-prod-tagged:
-  image: ezkrg/buildx
+  image: jdrouet/docker-with-buildx:stable
   stage: build-docker
   services:
   - docker:dind
   before_script:
-  - docker buildx create --use
+  - docker context create build
+  - docker buildx create build --use
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
   - |
     docker buildx build \
-      --platform linux/amd64,linux/arm64 \
+      --platform linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7 \
       --no-cache \
       --build-arg CI_COMMIT_BRANCH=$CI_COMMIT_BRANCH \
       --build-arg CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA \
@@ -115,4 +116,4 @@ docker-build-prod-tagged:
   only:
     - tags
   except:
-    - branches
\ No newline at end of file
+    - branches