diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3dcebed4640110b65d3a6b4946f963a0c0d0ce5d..32555f934f9ca2dc8170af2dc372d8666927198f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -524,7 +524,7 @@ release-images:
   image: docker:${DOCKER_VERSION}-dind
   variables:
     BUILDX_BAKE_ARGS: --allow=network.host --load
-    BUILDX_BUILD_ARGS: --platform=$SUPPORTED_PLATFORMS --builder=multiarch --output="type=image"
+    BUILDX_BUILD_ARGS: --builder=multiarch --output="type=docker,name=dbrepo-core:build"
   dependencies:
     - clean-images
     - test-analyse-service
@@ -546,9 +546,11 @@ 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 -t dbrepo-core:build ./lib/java/dbrepo-core"
+    - "docker buildx build $BUILDX_BUILD_ARGS --platform=linux/arm64 ./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 bake $BUILDX_BAKE_ARGS"
-    - REPOSITORY_URL=$CI_REGISTRY_URL make release-images
     - REPOSITORY_URL=$CI_REGISTRY2_URL make release-images
 
 release-helm: