diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
index 9e6b478..929f8df 100644
--- a/.forgejo/workflows/build.yml
+++ b/.forgejo/workflows/build.yml
@@ -1,19 +1,22 @@
-name: Build FAH Client Package
+name: Build & Upload FAH Client DEB
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
 
 jobs:
-  build-deb:
+  build:
     runs-on: [self-hosted]
     env:
       BRANCH: ${{ github.ref_name }}
       COMMIT: ${{ github.sha }}
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
+      - name: Clone current branch
+        run: |
+          git clone --branch "$BRANCH" https://mentalnet.xyz/forgejo/markmental/fah-debian13.git .
+          echo "✅ Checked out branch $BRANCH ($COMMIT)"
 
       - name: Install packaging tools
         run: |
@@ -22,17 +25,21 @@ jobs:
 
       - name: Build Debian package
         run: |
-          mkdir -p build
-          dpkg-deb --build . build/fahclient.deb
-          echo "✅ Built build/fahclient.deb"
+          mkdir -p build/"$BRANCH"
+          SHORT_HASH=$(echo "$COMMIT" | cut -c1-7)
+          PKG_NAME="fahclient-${BRANCH}-${SHORT_HASH}.deb"
+          dpkg-deb --build . build/"$BRANCH"/"$PKG_NAME"
+          echo "🎉 Built $PKG_NAME"
 
-      - name: Lint package
+      - name: Verify package
         run: |
-          lintian build/fahclient.deb || true
+          lintian build/"$BRANCH"/*.deb || true
+          dpkg-deb --info build/"$BRANCH"/*.deb
+          dpkg-deb --contents build/"$BRANCH"/*.deb | head -20
 
       - name: Upload .deb artifact
         uses: actions/upload-artifact@v3
         with:
-          name: fahclient-deb
-          path: build/fahclient.deb
+          name: fahclient-${{ env.BRANCH }}-${{ env.COMMIT }}
+          path: build/${{ env.BRANCH }}/*.deb