diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cc34975..102598c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,20 +9,21 @@ on:
 jobs:
   build-docker-images:
     strategy:
-      matrix:
-        dolibarr_version: [ 15.0.3, 16.0.5, 17.0.4, 18.0.6, 19.0.4, 20.0.4, 21.0.0, develop ]
-        os_version: [ ubuntu-24.04 ]
-    runs-on: ${{ matrix.os_version }}
+      matrix: dolibarr_version: [ 15.0.3, 16.0.5, 17.0.4, 18.0.6, 19.0.4, 20.0.4, 21.0.0, develop ]
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v3
+      - uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+      - uses: docker/setup-qemu-action@v3
       - uses: docker/setup-buildx-action@v3
       - env:
           DOCKER_BUILD: 1
           DOCKER_PUSH: 1
         run: |
-          echo secrets.DOCKER_HUB_USERNAME=${{ secrets.DOCKER_HUB_USERNAME }}
-          echo ${{ secrets.DOCKER_HUB_PASSWORD }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-          ./update.sh ${{ matrix.dolibarr_version }} ${{ matrix.os_version }}
+          ./update.sh ${{ matrix.dolibarr_version }}
 
   update-readme:
     runs-on: ubuntu-24.04
diff --git a/update.sh b/update.sh
index e9b60fb..38df26f 100755
--- a/update.sh
+++ b/update.sh
@@ -19,13 +19,6 @@ source "${BASE_DIR}/versions.sh"
      DOLIBARR_VERSIONS=("$1")
  fi
 
-# Enforce build arch based on host arch
-if [[ "$2" == *"arm"* ]]; then
-  platform="linux/arm64"
-else
-  platform="linux/amd64"
-fi
-
 tags=""
 
 # First, clean the directory /images
@@ -92,13 +85,12 @@ for dolibarrVersion in "${DOLIBARR_VERSIONS[@]}"; do
         docker buildx build \
           --push \
           --compress \
-          --platform "$platform" \
+          --platform linux/amd64,linux/arm64 \
           ${buildOptionTags} \
           "${dir}"
       else
         docker build \
           --compress \
-          --platform "$platform" \
           ${buildOptionTags} \
           "${dir}"
       fi