diff --git a/.github/workflows/cmake-linux-ubuntu.yml b/.github/workflows/cmake-linux-ubuntu.yml
index 294cb043..7dc4b98f 100644
--- a/.github/workflows/cmake-linux-ubuntu.yml
+++ b/.github/workflows/cmake-linux-ubuntu.yml
@@ -8,30 +8,25 @@ env:
   QT_QPA_PLATFORM: offscreen
   DEBIAN_FRONTEND: noninteractive
   DEBFULLNAME: GitHub build
-  DEBEMAIL: github-action@github
+  DEBEMAIL: github-action@github.com
   CMAKE_BUILD_PARALLEL_LEVEL: 3
 
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: ${{matrix.container}}
+    container: ubuntu:${{matrix.container}}
     strategy:
       matrix:
-        container: ['ubuntu:20.04', 'ubuntu:22.04']
-        include:
-        - container: 'ubuntu:20.04'
-          name: ubuntu2004
-        - container: 'ubuntu:22.04'
-          name: ubuntu2204
+        container: ['20.04', '22.04', '24.04']
 
     steps:
       - name: Install dependencies
-        if: matrix.container == 'ubuntu:20.04'
-        run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts debhelper pkg-config cmake libpcsclite-dev libssl-dev libgtest-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev
+        if: matrix.container == '20.04'
+        run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts debhelper lintian pkg-config cmake libpcsclite-dev libssl-dev libgtest-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev
 
       - name: Install dependencies
-        if: matrix.container != 'ubuntu:20.04'
-        run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts debhelper pkg-config cmake libpcsclite-dev libssl-dev libgtest-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libqt6core5compat6-dev
+        if: matrix.container != '20.04'
+        run: apt update -qq && apt install --no-install-recommends -y git lsb-release fakeroot build-essential devscripts debhelper lintian pkg-config cmake libpcsclite-dev libssl-dev libgtest-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libqt6core5compat6-dev
 
       - uses: actions/checkout@v4
         with:
@@ -44,9 +39,12 @@ jobs:
         run: |
           cmake --build build --config $BUILD_TYPE --target installer
           # Debian creates artifacts outside of project dir, copy them back to make them available in the build artifacts
-          cp -r ../web-eid*.* build/src/app
+          mv ../web-eid*.* build/
+
+      - name: Test package
+        run: lintian build/*.deb
 
       - uses: actions/upload-artifact@v4
         with:
-          name: web-eid-app-ubuntu-build-${{matrix.name}}-${{github.run_number}}
-          path: build/src/app/*.*deb
+          name: web-eid-app-ubuntu-build-ubuntu${{matrix.container}}-${{github.run_number}}
+          path: build/*.*deb
diff --git a/debian/control b/debian/control
index f5126285..c610a169 100644
--- a/debian/control
+++ b/debian/control
@@ -27,9 +27,11 @@ Description: Web eID application suite (metapackage)
 
 Package: web-eid-native
 Architecture: any
+Multi-Arch: foreign
 Depends: pcscd, ${shlibs:Depends}, ${misc:Depends}
 Replaces: token-signing-native
 Breaks: token-signing-native
+Suggests: web-eid-firefox, web-eid-chrome
 Description: Web eID browser extension helper application
  Native messaging host for Web eID Chrome and Firefox extensions that performs
  cryptographic digital signing and authentication operations with electronic ID
@@ -37,9 +39,11 @@ Description: Web eID browser extension helper application
 
 Package: web-eid-firefox
 Architecture: all
-Depends: jq, web-eid-native (= ${binary:Version})
+Depends: jq, web-eid-native
 Replaces: token-signing-firefox
 Breaks: token-signing-firefox
+Suggests: firefox
+Enhances: firefox
 Description: Web eID browser extension for Firefox
  The Web eID extension for Firefox communicates with the Web eID native
  application using Native messaging to enable usage of electronic ID smart
@@ -47,9 +51,11 @@ Description: Web eID browser extension for Firefox
 
 Package: web-eid-chrome
 Architecture: all
-Depends: web-eid-native (= ${binary:Version})
+Depends: web-eid-native
 Replaces: token-signing-chrome
 Breaks: token-signing-chrome
+Suggests: chromium, chromium-browser, chrome
+Enhances: chromium, chromium-browser, chrome
 Description: Web eID browser extension for Chrome
  The Web eID extension for Chrome communicates with the Web eID native
  application using Native messaging to enable usage of electronic ID smart
diff --git a/debian/source/options b/debian/source/options
index a6772838..4420190e 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1 +1,2 @@
-tar-ignore = "build/*"
+tar-ignore
+tar-ignore = build