diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
new file mode 100644
index 00000000..bb32564c
--- /dev/null
+++ b/.github/workflows/merge.yml
@@ -0,0 +1,111 @@
+name: Build and Push Docker Image On Merge
+on:
+  push:
+    branches: ['main']
+
+  workflow_dispatch:
+
+jobs:
+  paths-filter:
+    runs-on: ubuntu-latest
+    outputs:
+      frontend: ${{ steps.filter.outputs.frontend }}
+      api: ${{ steps.filter.outputs.api }}
+      widget: ${{ steps.filter.outputs.widget }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Filter paths
+        id: filter
+        uses: dorny/paths-filter@v3
+        with:
+          filters: |
+            frontend:
+              - 'frontend/**'
+            api:  
+              - 'api/**'
+            widget:
+              - 'widget/**'
+
+  frontend-build-and-push:
+    runs-on: ubuntu-latest
+    if: ${{ needs.paths-filter.outputs.frontend == 'true' }}
+    steps:
+      - name: Check out repository code ...
+        uses: actions/checkout@v4
+      
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push docker image
+        id: docker_build
+        uses: docker/build-push-action@v6
+        with:
+          context: ./frontend
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: hexastack/hexabot-frontend:latest
+
+  api-build-and-push:
+    runs-on: ubuntu-latest
+    if: ${{ needs.paths-filter.outputs.api == 'true' }}
+    steps:
+      - name: Check out repository code ...
+        uses: actions/checkout@v4
+      
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push docker image
+        id: docker_build
+        uses: docker/build-push-action@v6
+        with:
+          context: ./api
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: hexastack/hexabot-api:latest
+
+  widget-build-and-push:
+    runs-on: ubuntu-latest
+    if: ${{ needs.paths-filter.outputs.widget == 'true' }}
+    steps:
+      - name: Check out repository code ...
+        uses: actions/checkout@v4
+      
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push docker image
+        id: docker_build
+        uses: docker/build-push-action@v6
+        with:
+          context: ./widget
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: hexastack/hexabot-widget:latest