diff --git a/.github/workflows/build-deb.yml b/.github/workflows/build-deb.yml
index 82cd20c..cccc7d3 100644
--- a/.github/workflows/build-deb.yml
+++ b/.github/workflows/build-deb.yml
@@ -69,14 +69,16 @@ jobs:
           make deb-build
           mkdir -p $GITHUB_WORKSPACE/deb-packages
           cp ../*.deb $GITHUB_WORKSPACE/deb-packages/
-          rm -f ../cryptpilot_*.deb # Remove the generated main package
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: deb-packages-${{ matrix.arch }}
           if-no-files-found: error
-          path: ./deb-packages/*.deb
+          path: |
+            ./deb-packages/cryptpilot-fde_*.deb
+            ./deb-packages/cryptpilot-crypt_*.deb
+            ./deb-packages/cryptpilot-verity_*.deb
 
   test:
     strategy:
diff --git a/.github/workflows/build-rpm.yml b/.github/workflows/build-rpm.yml
index 26b59b7..45b7bc3 100644
--- a/.github/workflows/build-rpm.yml
+++ b/.github/workflows/build-rpm.yml
@@ -124,7 +124,9 @@ jobs:
           if-no-files-found: error
           path: |
             /tmp/rpmbuild/SRPMS/cryptpilot-*.al8.src.rpm
-            /tmp/rpmbuild/RPMS/${{ matrix.arch }}/cryptpilot-*.al8.${{ matrix.arch }}.rpm
+            /tmp/rpmbuild/RPMS/${{ matrix.arch }}/cryptpilot-fde-*.al8.${{ matrix.arch }}.rpm
+            /tmp/rpmbuild/RPMS/${{ matrix.arch }}/cryptpilot-crypt-*.al8.${{ matrix.arch }}.rpm
+            /tmp/rpmbuild/RPMS/${{ matrix.arch }}/cryptpilot-verity-*.al8.${{ matrix.arch }}.rpm
 
   test:
     strategy: