diff --git a/.ahoy.yml b/.ahoy.yml
index d2bb5137..6a8ae631 100644
--- a/.ahoy.yml
+++ b/.ahoy.yml
@@ -15,6 +15,7 @@ commands:
   build:
     usage: Build project locally (single-local architecture only).
     cmd: |
+      set -e
       cat .env | grep -v "#" | grep -v -e '^$'
       if [ "$1" == "y" ]; then
         env $(cat .env | grep -v "#" | xargs) docker buildx bake -f docker-compose.yml --no-cache cli --load
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 00000000..fab8c17b
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,36 @@
+name: Build
+
+on:
+  pull_request:
+    branches:
+      - '**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver: docker
+
+      - name: Install Ahoy
+        run: |
+          sudo wget -q https://github.com/ahoy-cli/ahoy/releases/download/v2.1.1/ahoy-bin-linux-amd64 -O /usr/local/bin/ahoy
+          sudo chmod +x /usr/local/bin/ahoy
+
+      - name: Create Docker network
+        run: docker network create amazeeio-network || true
+
+      - name: Create .env from defaults
+        run: cp .env.default .env
+
+      - name: Build
+        run: ahoy build y
+        env:
+          COMPOSER_AUTH: ""
+          DOCKER_BUILDKIT: 1