diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 47fcf1c..05fb6a7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,3 +48,26 @@ jobs:
 
       - name: Build website
         run: pnpm --dir web run build
+
+  docker-build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+
+      - name: Set up Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build self-host Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: Dockerfile.selfhost
+          push: false
+          load: false
+          platforms: linux/amd64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 5652517..aa6afb4 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -14,6 +14,7 @@ permissions:
 
 jobs:
   docker:
+    if: github.repository == 'every-app/open-seo'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout