diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml
index cb002e2d1f..f46a1443f8 100644
--- a/.github/workflows/push-docker.yml
+++ b/.github/workflows/push-docker.yml
@@ -42,3 +42,57 @@ jobs:
           push: true
           tags: arguflow/search:latest,arguflow/search:${{ env.sha_short }}
           labels: ${{ steps.meta.outputs.labels }}
+
+  build_chat:
+    name: Building Chat Docker Image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@v4
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Declare some variables
+        shell: bash
+        run: |
+          echo "sha_short=$(git rev-parse --short "$GITHUB_SHA")" >> "$GITHUB_ENV"
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: chat/
+          file: ./chat/Dockerfile
+          push: true
+          tags: arguflow/chat:latest,arguflow/chat:${{ env.sha_short }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+  build_server:
+    name: Building Server Docker Image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@v4
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Declare some variables
+        shell: bash
+        run: |
+          echo "sha_short=$(git rev-parse --short "$GITHUB_SHA")" >> "$GITHUB_ENV"
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: server/
+          file: ./server/Dockerfile
+          push: true
+          tags: arguflow/server:latest,arguflow/server:${{ env.sha_short }}
+          labels: ${{ steps.meta.outputs.labels }}