diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5c093d4db37eb5be7eacbf268ae69c851b523681..b5083f1d1e03e0478e5febc623660ee7a06d29d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -524,7 +524,6 @@ release-images:
   image: docker:${DOCKER_VERSION}-dind
   variables:
     BUILDX_BAKE_ARGS: --allow=network.host --load
-    BUILDX_BUILD_ARGS: --builder=multiarch --output="type=docker,name=dbrepo-core:build" --target=build
   dependencies:
     - clean-images
     - test-analyse-service
@@ -546,10 +545,10 @@ release-images:
     - "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 $BUILDX_BUILD_ARGS --platform=linux/arm64 ./lib/java/dbrepo-core
+    - docker buildx build --platform=linux/amd64 --builder=multiarch --output="type=docker,name=dbrepo-core:build" --target build ./lib/java/dbrepo-core
     - "docker buildx bake $BUILDX_BAKE_ARGS"
     - REPOSITORY_URL=$CI_REGISTRY2_URL make release-images
-    - docker buildx build $BUILDX_BUILD_ARGS --platform=linux/amd64 ./lib/java/dbrepo-core
+    - docker buildx build --platform=linux/arm64 --builder=multiarch --output="type=docker,name=dbrepo-core:build" --target build ./lib/java/dbrepo-core
     - "docker buildx bake $BUILDX_BAKE_ARGS"
     - REPOSITORY_URL=$CI_REGISTRY2_URL make release-images