diff --git a/.forgejo/workflows/pr-checks.yml b/.forgejo/workflows/pr-checks.yml
index 58a18ce..d60baff 100644
--- a/.forgejo/workflows/pr-checks.yml
+++ b/.forgejo/workflows/pr-checks.yml
@@ -6,7 +6,9 @@ on:
 
 jobs:
   lint:
-    runs-on: swift-latest
+    runs-on: ubuntu-latest
+    container:
+      image: swift:6.3
     steps:
       - name: Install Node.js
         run: apt-get update -qq && apt-get install -y -qq nodejs
@@ -15,7 +17,7 @@ jobs:
         run: swift format lint --recursive Sources/
 
   flatpak-build:
-    runs-on: flatpak-builder-lint
+    runs-on: ubuntu-latest
     container:
       image: ghcr.io/flathub/flatpak-builder-lint:latest
       options: --privileged --security-opt seccomp=unconfined --security-opt apparmor=unconfined
@@ -28,9 +30,5 @@ jobs:
         with:
           manifest-path: dev.bscubed.Luminate.json
           bundle: Luminate.flatpak
-          cache-key: flatpak-pr-${{ forge.sha }}
           upload-artifact: false
           keep-build-dirs: true
-      - name: Run tests
-        run: |
-          flatpak-builder --run flatpak_app dev.bscubed.Luminate.json swift test --enable-code-coverage
diff --git a/.forgejo/workflows/pr-labeler.yml b/.forgejo/workflows/pr-labeler.yml
index 8cb0355..643f326 100644
--- a/.forgejo/workflows/pr-labeler.yml
+++ b/.forgejo/workflows/pr-labeler.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   label:
-    runs-on: docker
+    runs-on: ubuntu-latest
     steps:
       - name: Label by branch prefix
         env:
diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml
index 5d24e4a..86eef8d 100644
--- a/.forgejo/workflows/release.yml
+++ b/.forgejo/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
         with:
           manifest-path: dev.bscubed.Luminate.json
           bundle: Luminate.flatpak
-          cache-key: flatpak-release
+          cache-key: flatpak-builder-${arch}-${sha256(dev.bscubed.Luminate.json)}-release
           branch: stable
           repository-url: https://flathub.org/repo/flathub.flatpakrepo
           upload-artifact: false