diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 651214d..4b40f00 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,18 +14,19 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Buildah Action - amd64
-        uses: redhat-actions/buildah-build@v2
-        with:
-          image: docker.io/containerscrew/infratools:amd64-v1.0.0
-          containerfiles: |
-            ./Containerfile
-          args: --arch amd64
 
-      - name: Buildah Action - arm64
+      # For multiarch
+      - name: Install qemu dependency
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y qemu-user-static  
+
+      - name: Buildah Action
         uses: redhat-actions/buildah-build@v2
         with:
-          image: docker.io/containerscrew/infratools:arm64-v1.0.0
+          image: docker.io/containerscrew/infratools
+          tags: v1.0.0 ${{ github.sha }}
           containerfiles: |
             ./Containerfile
-          args: --arch arm64
\ No newline at end of file
+          build-args: |
+            arch=arm64
\ No newline at end of file