diff --git a/.github/workflows/ui-docker-build-amd.yml b/.github/workflows/ui-docker-build-amd.yml
index e67211b6..0a59edc7 100644
--- a/.github/workflows/ui-docker-build-amd.yml
+++ b/.github/workflows/ui-docker-build-amd.yml
@@ -2,7 +2,7 @@ name: frontend-docker-build (amd64)
 
 on:
   workflow_run:
-    workflows: ["frontend-ci-amd"]
+    workflows: ["frontend-ci"]
     branches: [main]
     types:
       - completed
@@ -38,6 +38,6 @@ jobs:
           file: ./ui/Dockerfile
           push: true
           tags: |
-            ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}-amd
-            ${{ env.IMAGE_NAME }}:${{ github.sha }}-amd
+            ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
+            ${{ env.IMAGE_NAME }}:${{ github.sha }}
           platforms: linux/amd64
\ No newline at end of file
diff --git a/.github/workflows/ui-docker-build-arm.yml b/.github/workflows/ui-docker-build-arm.yml
new file mode 100644
index 00000000..3c7d19ab
--- /dev/null
+++ b/.github/workflows/ui-docker-build-arm.yml
@@ -0,0 +1,43 @@
+name: frontend-docker-build (arm)
+
+on:
+  workflow_run:
+    workflows: ["frontend-ci"]
+    branches: [main]
+    types:
+      - completed
+
+env:
+  IMAGE_NAME: multiwoven/multiwoven-ui
+  IMAGE_TAG: edge
+
+jobs:
+  build_and_push:
+    runs-on: macos-latest-large
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Build and Push Docker image
+        uses: docker/build-push-action@v2
+        with:
+          context: ./ui
+          file: ./ui/Dockerfile
+          push: true
+          tags: |
+            ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
+            ${{ env.IMAGE_NAME }}:${{ github.sha }}
+          platforms: linux/arm64
\ No newline at end of file