diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d7b7a4c636bdd926b8d0615df89b87216f229560..15fb884f85936edded88aeb89e010e654a327295 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ variables:
   APP_VERSION: "1.8.1"
   CHART_VERSION: "1.8.1"
   SUPPORTED_VERSIONS: "1.7.3, 1.8.0, 1.8.1"
-  SUPPORTED_ARCH: "linux/amd64,linux/arm64"
+  SUPPORTED_PLATFORMS: "linux/amd64,linux/arm64"
   MAINTAINED_SERVICES: "analyse-service, auth-service-init, dashboard-service, dashboard-service-init, data-service, metadata-service, search-db, search-service, search-service-init, storage-service-init, ui"
   CACHE_FALLBACK_KEY: "${CI_DEFAULT_BRANCH}"
   # This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
@@ -544,7 +544,8 @@ 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
+    - 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 bake $BAKE_ARGS --platform=linux/amd64