diff --git a/.github/workflows/build-os-trixie.yml b/.github/workflows/build-os-trixie.yml
new file mode 100644
index 000000000..e530a79b7
--- /dev/null
+++ b/.github/workflows/build-os-trixie.yml
@@ -0,0 +1,33 @@
+---
+name: build-os-trixie
+on:
+  push:
+    tags:
+      - 'software/v*'
+  merge_group:
+  workflow_dispatch:
+    inputs:
+      git-ref:
+        description: 'Git ref (optional)'
+        required: false
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: build
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+    uses: ./.github/workflows/build-os.yml
+    secrets: inherit
+    with:
+      name: PlanktoScope-OS
+      base_release_name: trixie
+      base_image_variant: lite
+      base_release_date: 2025-10-02
+      base_file_release_date: 2025-10-01
+      arch: arm64
diff --git a/.github/workflows/build-os.yml b/.github/workflows/build-os.yml
index 3ffaa6a1c..29a14dd95 100644
--- a/.github/workflows/build-os.yml
+++ b/.github/workflows/build-os.yml
@@ -143,17 +143,17 @@ jobs:
       # RUN OS SETUP SCRIPTS
 
       - name: Run OS setup scripts in an unbooted container
-        uses: ethanjli/pinspawn-action@v0.1.5
+        uses: ethanjli/pinspawn-qemu@v0.1.5
         with:
           image: ${{ steps.expand-image.outputs.destination }}
           user: ${{ env.SETUP_USER }}
           # Note: CAP_NET_ADMIN is needed for iptables, which is needed for Docker (at least in an
           # unbooted container). Setting the machine ID (and therefore hostname) to `raspberrypi`
           # resolves noisy (but harmless) error messages from sudo.
-          args: >-
-            --bind "$(pwd)":/run/os-setup
-            --capability=CAP_NET_ADMIN
-            --machine=raspberrypi
+          # args: >-
+          #   --bind "$(pwd)":/run/os-setup
+          #   --capability=CAP_NET_ADMIN
+          #   --machine=raspberrypi
           run: |
             echo "Running setup scripts..."
             export DEBIAN_FRONTEND=noninteractive
@@ -167,7 +167,7 @@ jobs:
           DEFAULT_KEYBOARD_LAYOUT: us
         with:
           image: ${{ steps.expand-image.outputs.destination }}
-          args: --machine=raspberrypi
+          # args: --machine=raspberrypi
           run: |
             # Change default settings for the SD card to enable headless & keyboardless first boot
             # Note: we could change the username by making a `userconf.txt` file with the new
@@ -194,7 +194,7 @@ jobs:
       # RUN TESTS
 
       - name: Run tests
-        uses: ethanjli/pinspawn-action@v0.1.5
+        uses: ethanjli/pinspawn-qemu@v0.1.5
         with:
           image: ${{ steps.expand-image.outputs.destination }}
           user: pi