diff --git a/.github/workflows/build-app.yaml b/.github/workflows/build-app.yaml
new file mode 100644
index 000000000..c57a10708
--- /dev/null
+++ b/.github/workflows/build-app.yaml
@@ -0,0 +1,37 @@
+name: App
+
+on:
+  pull_request:
+
+env:
+  # Our build metadata
+  BUILD_USER: builder
+  BUILD_HOST: github.syncthing.net
+
+jobs:
+  build:
+    name: Build
+    if: github.event_name == 'pull_request'
+    runs-on: ubuntu-latest
+    container: ghcr.io/syncthing/syncthing-android-builder
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: build
+        run: |
+          java -version
+          ./gradlew --no-daemon buildNative lint assembleDebug
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: syncthing-debug.apk
+          path: app/build/outputs/apk/debug/app-debug.apk
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: reports-and-libs
+          path: |
+            app/build/reports/**
+            app/src/main/jniLibs/**
diff --git a/.github/workflows/build.yaml b/.github/workflows/build-builder.yaml
similarity index 87%
rename from .github/workflows/build.yaml
rename to .github/workflows/build-builder.yaml
index fc9e119da..a741f935f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build-builder.yaml
@@ -1,7 +1,9 @@
-name: Build/Release
+name: Builder Image
 
 on:
   pull_request:
+    paths:
+      - 'docker/**'
   workflow_dispatch:
 
 jobs: