diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 15fb884f85936edded88aeb89e010e654a327295..689942b98e683b512fada04984f4f819e6115143 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -547,11 +547,9 @@ release-images:
     - docker buildx ls
     - docker buildx create --name multiarch --driver docker-container --use --bootstrap --platform=$SUPPORTED_PLATFORMS
   script:
-    - docker buildx build $BUILD_ARGS --platform=linux/amd64 -t dbrepo-core:build --target build ./lib/java/dbrepo-core
+    - docker buildx build $BUILD_ARGS --platform=linux/amd64,linux/arm64 -t dbrepo-core:build --target build ./lib/java/dbrepo-core
     - docker buildx bake $BAKE_ARGS --platform=linux/amd64
     - REPOSITORY_URL=$CI_REGISTRY_URL make release-images
-    - docker buildx build $BUILD_ARGS --platform=linux/arm64 -t dbrepo-core:build --target build ./lib/java/dbrepo-core
-    - docker buildx bake $BAKE_ARGS --platform=linux/arm64
     - REPOSITORY_URL=$CI_REGISTRY2_URL make release-images
 
 release-helm: