diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 860207455dccd7d107226a4acbbc91844b381c69..181c28602bed0100d261530264bf713739731794 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -523,8 +523,8 @@ release-images:
   stage: release
   image: docker:${DOCKER_VERSION}-dind
   variables:
-    BUILD_ARGS: --platform=$SUPPORTED_PLATFORMS --network=host --load
-    BAKE_ARGS: --allow=network.host --load
+    BUILDX_BAKE_ARGS: --allow=network.host --load
+    BUILDX_BUILD_ARGS: --load
   dependencies:
     - clean-images
     - test-analyse-service
@@ -544,9 +544,10 @@ release-images:
     - "echo ${CI_REGISTRY_PASSWORD} | docker login --username ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY_URL}"
     - "docker logout ${CI_REGISTRY2_URL}"
     - "echo ${CI_REGISTRY2_PASSWORD} | docker login --username ${CI_REGISTRY2_USER} --password-stdin ${CI_REGISTRY2_URL}"
+    - "docker buildx create --name multiarch --driver docker-container --use"
   script:
-    - "docker buildx build $BUILD_ARGS -t dbrepo-core:build --target build ./lib/java/dbrepo-core"
-    - "docker buildx bake $BAKE_ARGS --platform=linux/amd64"
+    - "docker buildx build $BUILDX_BUILD_ARGS --platform=$SUPPORTED_PLATFORMS -t dbrepo-core:build ./lib/java/dbrepo-core"
+    - "docker buildx bake $BUILDX_BAKE_ARGS"
     - REPOSITORY_URL=$CI_REGISTRY_URL make release-images
     - REPOSITORY_URL=$CI_REGISTRY2_URL make release-images