diff --git a/.github/workflows/speculos-builder.yml b/.github/workflows/speculos-builder.yml
index 6077fc4f..4259bb2e 100644
--- a/.github/workflows/speculos-builder.yml
+++ b/.github/workflows/speculos-builder.yml
@@ -7,10 +7,7 @@ on:
   push:
     branches:
       - master
-    paths:
-      - .github/workflows/speculos-builder.yml
-      - build.Dockerfile
-
+    
 jobs:
   build:
     name: Build and push speculos-builder image
@@ -22,13 +19,39 @@ jobs:
     - name: Clone
       uses: actions/checkout@v4
 
-    - name: Build and push speculos-builder to GitHub Packages
-      uses: docker/build-push-action@v1
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
       with:
-        dockerfile: build.Dockerfile
-        repository: blooo-io/speculos-builder
         registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
-        tag_with_sha: true
-        tags: latest
+
+    - name: Build and push speculos-builder to GitHub Packages
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        platforms: linux/amd64,linux/arm64
+        dockerfile: build.Dockerfile
+        push: true
+        registry: ghcr.io
+        tags: |
+          ghcr.io/blooo-io/speculos-builder:latest
+          ghcr.io/blooo-io/speculos-builder:sha-${{ github.sha }}
+
+    - name: Build and push speculos to GitHub Packages
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        platforms: linux/amd64,linux/arm64
+        dockerfile: Dockerfile
+        push: true
+        registry: ghcr.io
+        tags: |
+          ghcr.io/blooo-io/speculos:latest
+          ghcr.io/blooo-io/speculos:sha-${{ github.sha }}