diff --git a/.forgejo/workflows/build-on-commit.yml b/.forgejo/workflows/build-on-commit.yml
index e8f0d2e..a4094f5 100644
--- a/.forgejo/workflows/build-on-commit.yml
+++ b/.forgejo/workflows/build-on-commit.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-    tags: 
+    tags:
       - '!' # Exclude tags
 
 jobs:
@@ -21,20 +21,22 @@ jobs:
           echo "REPO_HOST=$(echo "${{ github.server_url }}" | sed 's~http[s]*://~~g')" >> $GITHUB_ENV
           echo "REPO_PATH=${{ github.repository }}" >> $GITHUB_ENV
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Login to OCI registry
         run: |
           echo "${{ secrets.OCI_TOKEN }}" | docker login $REPO_HOST -u "${{ secrets.OCI_USER }}" --password-stdin
 
-      - name: Build and push Docker images
+      - name: Build and push multi-arch Docker images
         run: |
-          # Build Docker image with commit SHA
-          docker build -t $REPO_HOST/$REPO_PATH:${{ github.sha }} .
-          docker push $REPO_HOST/$REPO_PATH:${{ github.sha }}
+          docker buildx create --use
+          docker buildx build \
+            --platform linux/amd64,linux/arm64 \
+            --tag $REPO_HOST/$REPO_PATH:${{ github.sha }} \
+            --tag $REPO_HOST/$REPO_PATH:nightly \
+            --push \
+            .
 
-          # Build Docker image with nightly tag
-          docker tag $REPO_HOST/$REPO_PATH:${{ github.sha }} $REPO_HOST/$REPO_PATH:nightly
-          docker push $REPO_HOST/$REPO_PATH:nightly
-
-          # Remove local images to save storage
-          docker rmi $REPO_HOST/$REPO_PATH:${{ github.sha }}
-          docker rmi $REPO_HOST/$REPO_PATH:nightly
+      - name: Remove builder (optional cleanup)
+        run: docker buildx rm