diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
deleted file mode 100644
index 85cb1b13..00000000
--- a/.github/workflows/docker.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-name: Build
-
-on:
-  push:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    services:
-      registry:
-        image: registry:2
-        ports:
-          - 5000:5000
-
-    strategy:
-      matrix:
-        version: [12, 13]
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.9
-
-      - name: Setup Buildx
-        uses: docker/setup-buildx-action@v1
-        with:
-          driver-opts: network=host
-
-      - name: Install Docker Compose v2
-        uses: ndeloof/install-compose-action@4a33bc31f327b8231c4f343f6fba704fedc0fa23
-
-      - name: Get latest versions
-        run: ./.github/scripts/get-latest-tags.sh
-        env:
-          VERSION: ${{ matrix.version }}
-
-      - name: Build
-        uses: docker/bake-action@v1.6.0
-        with:
-          push: true
-        env:
-          USERNAME: localhost:5000/frappe
-
-      - name: Test
-        run: python3 tests/main.py
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 00000000..403fb535
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,93 @@
+name: Build
+
+on:
+  push:
+
+  # pull_request:
+  #   branches:
+  #     - main
+  #   paths:
+  #     - build/frappe-nginx/**
+  #     - build/frappe-socketio/**
+  #     - build/frappe-worker/**
+  #     - overrides/**
+  #     - tests/**
+  #     - compose.yml
+  #     - docker-bake.hcl
+  #     - example.env
+
+  # push:
+  #   branches:
+  #     - main
+  #   paths:
+  #     - build/frappe-nginx/**
+  #     - build/frappe-socketio/**
+  #     - build/frappe-worker/**
+  #     - overrides/**
+  #     - tests/**
+  #     - compose.yml
+  #     - docker-bake.hcl
+  #     - example.env
+
+  # # Triggered from frappe/frappe and frappe/erpnext on releases
+  # repository_dispatch:
+
+  # workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    services:
+      registry:
+        image: registry:2
+        ports:
+          - 5000:5000
+
+    strategy:
+      matrix:
+        version: [12, 13]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+
+      - name: Setup Buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          driver-opts: network=host
+
+      - name: Install Docker Compose v2
+        uses: ndeloof/install-compose-action@4a33bc31f327b8231c4f343f6fba704fedc0fa23
+
+      - name: Get latest versions
+        run: ./.github/scripts/get-latest-tags.sh
+        env:
+          VERSION: ${{ matrix.version }}
+
+      - name: Build
+        uses: docker/bake-action@v1.6.0
+        with:
+          push: true
+        env:
+          USERNAME: localhost:5000/frappe
+
+      - name: Test
+        run: python3 tests/main.py
+
+      - name: Login
+        if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Push
+        if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
+        uses: docker/bake-action@v1.6.0
+        with:
+          push: true