@@ -7,6 +7,9 @@ name: Build executables
 # individual release assets, the same way existing releases already do (so
 # in-place updates via Update.exe keep working).
 #
+# All jobs run on GitHub-hosted runners (including the ARM64 leg, via
+# GitHub's ubuntu-24.04-arm image) — no self-hosted machine is required.
+#
 # `workflow_call` is included so a future release workflow can trigger a
 # fresh build directly instead of reusing old artifacts.
 on:
@@ -32,37 +35,28 @@ jobs:
         include:
           - os: windows-latest
             label: windows
-            hosted: github
             pyinstaller: pyinstaller
             add_data_sep: ";"
             exe_suffix: ".exe"
-          # GitHub-hosted, so a fresh x86_64 VM every run: the common case,
-          # what almost every Linux desktop needs.
+          # A fresh x86_64 VM every run: the common case, what almost every
+          # Linux desktop needs.
           - os: ubuntu-22.04
             label: linux-x86_64
-            hosted: github
             pyinstaller: pyinstaller
             add_data_sep: ":"
             exe_suffix: ""
-          # Self-hosted (a Raspberry Pi) — the only realistic way to get an
-          # ARM64 build without cross-compiling. NOTE: this binary only runs
-          # on ARM64 Linux (other Pis, ARM SBCs), never on x86_64 desktops.
-          - os: [self-hosted, Linux, ARM64]
+          # GitHub-hosted ARM64 image. NOTE: this binary only runs on ARM64
+          # Linux (Raspberry Pis, ARM SBCs), never on x86_64 desktops.
+          - os: ubuntu-24.04-arm
             label: linux-arm64
-            hosted: self
-            pyinstaller: venv/bin/pyinstaller
+            pyinstaller: pyinstaller
             add_data_sep: ":"
             exe_suffix: ""
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
 
-      # actions/setup-python doesn't reliably have a matching download for
-      # every Python version on ARM, and isn't needed anyway: the self-hosted
-      # runner is a persistent machine with its own system Python already
-      # set up (see the apt note below), unlike an ephemeral GitHub-hosted VM.
       - uses: actions/setup-python@v5
-        if: matrix.hosted == 'github'
         with:
           python-version: "3.12"
 
@@ -71,7 +65,7 @@ jobs:
       # GStreamer bindings. None of this is pip-installable; it has to come
       # from apt, on the same interpreter pip installs into.
       - name: Install Linux system dependencies
-        if: matrix.label == 'linux-x86_64'
+        if: startsWith(matrix.label, 'linux-')
         run: |
           sudo apt-get update
           sudo apt-get install -y \
@@ -80,33 +74,11 @@ jobs:
             gstreamer1.0-plugins-good gstreamer1.0-pipewire \
             python3-dbus libgirepository1.0-dev
 
-      # The self-hosted runner is persistent, not an ephemeral VM: install
-      # these once by hand instead, so every run doesn't re-apt-get them:
-      #   sudo apt-get install -y python3-gi gir1.2-webkit2-4.1 python3-tk \
-      #     gir1.2-gst-plugins-base-1.0 gstreamer1.0-plugins-base \
-      #     gstreamer1.0-plugins-good gstreamer1.0-pipewire \
-      #     python3-dbus libgirepository1.0-dev python3-venv \
-      #     build-essential python3-dev
-      # (the last three are for pip to build python-uinput/pynput from
-      # source on ARM, where prebuilt wheels are less common.)
-
-      - name: Install Python dependencies (GitHub-hosted)
-        if: matrix.hosted == 'github'
+      - name: Install Python dependencies
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements.txt pyinstaller
 
-      # --system-site-packages: the apt packages above (WebKitGTK/GStreamer
-      # bindings) only exist system-wide, not on PyPI, so the venv needs to
-      # see them. Recreated every run for a clean, reproducible build.
-      - name: Install Python dependencies (self-hosted)
-        if: matrix.hosted == 'self'
-        run: |
-          rm -rf venv
-          python3 -m venv --system-site-packages venv
-          venv/bin/pip install --upgrade pip
-          venv/bin/pip install -r requirements.txt pyinstaller
-
       - name: Build Text2Pen
         run: ${{ matrix.pyinstaller }} --onefile --noconsole --add-data "webui${{ matrix.add_data_sep }}webui" --name Text2Pen Text2Pen.py
 
 
@@ -35,10 +35,7 @@ jobs:
 
   release:
     needs: build
-    # Self-hosted, same as build.yml's Linux leg. Needs `git` on PATH for the
-    # tag check below (actions/checkout itself can fall back to the REST API
-    # without it, but this job's own script can't).
-    runs-on: [self-hosted, Linux]
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with: