diff --git a/builder-image.yml b/.gitea/workflows/builder-image.yml
similarity index 95%
rename from builder-image.yml
rename to .gitea/workflows/builder-image.yml
index 141c2f5..9b0eaeb 100644
--- a/builder-image.yml
+++ b/.gitea/workflows/builder-image.yml
@@ -15,7 +15,7 @@ env:
 
 jobs:
   build-image:
-    runs-on: [self-hosted, arm64]
+    runs-on: ubuntu-24.04-arm64
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/Dockerfile.yml b/Dockerfile
similarity index 96%
rename from Dockerfile.yml
rename to Dockerfile
index 8fd5581..be41c6b 100644
--- a/Dockerfile.yml
+++ b/Dockerfile
@@ -8,8 +8,8 @@ FROM eclipse-temurin:21-jdk-noble
 # cmdline-tools: find the current build number at
 #   https://developer.android.com/studio#command-line-tools-only
 ARG CMDLINE_TOOLS_VERSION=13114758
-ARG BUILD_TOOLS_VERSION=35.0.0
-ARG PLATFORM_VERSION=android-35
+ARG BUILD_TOOLS_VERSION=36.0.0
+ARG PLATFORM_VERSION=android-36
 
 ENV ANDROID_SDK_ROOT=/opt/android-sdk \
     ANDROID_HOME=/opt/android-sdk \
diff --git a/README.md b/README.md
index c201dbc..21bf9ae 100644
--- a/README.md
+++ b/README.md
@@ -22,10 +22,10 @@ Pinned versions live as `ARG`s at the top of the `Dockerfile`:
 | ARG                     | Default     | Where to check |
 | ----------------------- | ----------- | -------------- |
 | `CMDLINE_TOOLS_VERSION` | `13114758`  | https://developer.android.com/studio#command-line-tools-only |
-| `BUILD_TOOLS_VERSION`   | `35.0.0`    | SDK Manager / release notes |
-| `PLATFORM_VERSION`      | `android-35`| your app's `compileSdk` |
+| `BUILD_TOOLS_VERSION`   | `36.0.0`    | SDK Manager / release notes |
+| `PLATFORM_VERSION`      | `android-36`| your app's `compileSdk` |
 
-`aapt2` and the build-tools binaries ship native arm64 for 35.x, so packaging
+`aapt2` and the build-tools binaries ship native arm64 for 36.x, so packaging
 runs without emulation.
 
 ## Tagging model
@@ -61,7 +61,7 @@ app and pin the toolchain:
 ```yaml
 jobs:
   build:
-    runs-on: [self-hosted, arm64]
+    runs-on: ubuntu-24.04-arm64
     container:
       image: git.helu.ca/r/android:2026.06
       credentials:
diff --git a/build.yml b/templates/build.yml
similarity index 92%
rename from build.yml
rename to templates/build.yml
index 158b8f0..e5bef63 100644
--- a/build.yml
+++ b/templates/build.yml
@@ -24,7 +24,7 @@ env:
 
 jobs:
   build:
-    runs-on: [self-hosted, arm64]
+    runs-on: ubuntu-24.04-arm64
     container:
       image: git.helu.ca/r/android:2026.06
       credentials:
@@ -71,8 +71,10 @@ jobs:
             -exec cp {} out/ \;
           ls -l out
 
+      # Pinned to v3: upload-artifact@v4 requires a backend Gitea Actions does
+      # not implement and fails with "not supported on GHES".
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: release-artifacts
           path: out/*