diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6a458adaf..16c6a5036 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,8 +16,10 @@ jobs:
         include:
           - platform: linux/amd64
             runner: ubuntu-latest
+            arch: amd64
           - platform: linux/arm64
             runner: ubuntu-24.04-arm64
+            arch: arm64
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -38,7 +40,7 @@ jobs:
           context: .
           target: prod
           push: true
-          tags: thirdweb/engine:nightly-${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}
+          tags: thirdweb/engine:nightly-${{matrix.arch }}
           platforms: ${{ matrix.platform }}
           cache-from: type=gha,scope=${{ matrix.platform }}
           cache-to: type=gha,scope=${{ matrix.platform }},mode=max
@@ -48,6 +50,9 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
@@ -56,7 +61,10 @@ jobs:
 
       - name: Create and Push Multi-arch Manifest
         run: |
-          docker manifest create ${{ env.REGISTRY_IMAGE }}:nightly \
+          docker buildx imagetools create -t ${{ env.REGISTRY_IMAGE }}:nightly \
             ${{ env.REGISTRY_IMAGE }}:nightly-amd64 \
             ${{ env.REGISTRY_IMAGE }}:nightly-arm64
-          docker manifest push ${{ env.REGISTRY_IMAGE }}:nightly
\ No newline at end of file
+  
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:nightly
\ No newline at end of file
diff --git a/.github/workflows/tagBasedImageBuild.yml b/.github/workflows/tagBasedImageBuild.yml
index d02fe5795..8a6e8b28b 100644
--- a/.github/workflows/tagBasedImageBuild.yml
+++ b/.github/workflows/tagBasedImageBuild.yml
@@ -15,8 +15,10 @@ jobs:
         include:
           - platform: linux/amd64
             runner: ubuntu-latest
+            arch: amd64
           - platform: linux/arm64
             runner: ubuntu-24.04-arm64
+            arch: arm64
     env:
       LATEST_TAG: ${{ github.event.release.target_commitish == 'main' && 'thirdweb/engine:latest' || '' }}
 
@@ -43,8 +45,8 @@ jobs:
           platforms: ${{ matrix.platform }}
           push: true
           tags: |
-              ${{ env.REGISTRY_IMAGE }}:${{ github.event.release.tag_name }}-${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}
-              ${{ env.LATEST_TAG != '' && format('thirdweb/engine:latest-{0}', matrix.platform == 'linux/amd64' && 'amd64' || 'arm64') || '' }}
+              ${{ env.REGISTRY_IMAGE }}:${{ github.event.release.tag_name }}-${{ matrix.arch }}
+              ${{ env.LATEST_TAG != '' && format('thirdweb/engine:latest-{0}', matrix.arch) || '' }}
           cache-from: type=gha,scope=${{ matrix.platform }}
           cache-to: type=gha,scope=${{ matrix.platform }},mode=max
           build-args: ENGINE_VERSION=${{ github.event.release.tag_name }}
@@ -55,24 +57,33 @@ jobs:
     env:
       LATEST_TAG: ${{ github.event.release.target_commitish == 'main' && 'thirdweb/engine:latest' || '' }}
     steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name:  Create and Push Multi-arch Manifest (release tag)
+      - name: Create and Push Multi-arch Manifest (release tag)
         run: |
-          docker manifest create ${{ env.REGISTRY_IMAGE }}:${{ github.event.release.tag_name }} \
+          docker buildx imagetools create -t ${{ env.REGISTRY_IMAGE }}:${{ github.event.release.tag_name }} \
             ${{ env.REGISTRY_IMAGE }}:${{ github.event.release.tag_name }}-amd64 \
             ${{ env.REGISTRY_IMAGE }}:${{ github.event.release.tag_name }}-arm64
-          docker manifest push ${{ env.REGISTRY_IMAGE }}:${{ github.event.release.tag_name }}
-
+  
+      - name: Inspect release image
+        run: |
+          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ github.event.release.tag_name }}
 
-      - name:  Create and Push Multi-arch Manifest (latest tag) (if applicable)
+      - name: Create and Push Multi-arch Manifest (latest tag) (if applicable)
+        if: ${{ env.LATEST_TAG != '' }}
+        run: |
+          docker buildx imagetools create -t ${{ env.REGISTRY_IMAGE }}:latest \
+            ${{ env.REGISTRY_IMAGE }}:latest-amd64 \
+            ${{ env.REGISTRY_IMAGE }}:latest-arm64
+      
+      - name: Inspect latest image (if applicable)
         if: ${{ env.LATEST_TAG != '' }}
         run: |
-          docker manifest create ${{ env.REGISTRY_IMAGE }}:latest \
-            ${{ env.REGISTRY_IMAGE }}:latest-arm64 \
-            ${{ env.REGISTRY_IMAGE }}:latest-amd64
-          docker manifest push ${{ env.REGISTRY_IMAGE }}:latest
+          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:latest
\ No newline at end of file