diff --git a/.gitea/workflows/deployment.yaml b/.gitea/workflows/deployment.yaml
index 7c157a5..cc20a22 100644
--- a/.gitea/workflows/deployment.yaml
+++ b/.gitea/workflows/deployment.yaml
@@ -6,7 +6,6 @@ on:
   workflow_dispatch:
 
 jobs:
-  # ---- Tests run once on Linux; both build jobs depend on this ----
   test:
     runs-on: ubuntu-latest
     steps:
@@ -16,13 +15,11 @@ jobs:
           distribution: temurin
           java-version: "21"
       - run: chmod +x ./gradlew
-      - name: Run tests
-        run: ./gradlew --no-daemon jvmTest
+      - run: ./gradlew --no-daemon jvmTest
 
-  # ---- Portable fat jar (Linux + macOS arm64 Skiko bundled) ----
   build-jar:
     needs: test
-    runs-on: ubuntu-latest   # your k3s runners
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
@@ -30,18 +27,16 @@ jobs:
           distribution: temurin
           java-version: "21"
       - run: chmod +x ./gradlew
-      - name: Build fat jar
-        run: ./gradlew --no-daemon desktopFatJar
+      - run: ./gradlew --no-daemon packageUberJarForCurrentOS   # Linux jar (plugin task, always present)
       - uses: actions/upload-artifact@v3
         with:
-          name: adbkey-uber-jar
-          path: "**/build/libs/adbkey-all.jar"
+          name: adbkey-linux-jar
+          path: "**/build/compose/jars/*.jar"
           if-no-files-found: error
 
-  # ---- Native DMG built ON macOS (jpackage needs the target OS) ----
   build-dmg:
     needs: test
-    runs-on: macos          # match the label of YOUR registered macOS runner
+    runs-on: macos
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
@@ -49,8 +44,7 @@ jobs:
           distribution: temurin
           java-version: "21"
       - run: chmod +x ./gradlew
-      - name: Build DMG
-        run: ./gradlew --no-daemon packageDistributionForCurrentOS
+      - run: ./gradlew --no-daemon packageDistributionForCurrentOS   # macOS .dmg
       - uses: actions/upload-artifact@v3
         with:
           name: adbkey-macos-dmg