diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 201281b7..85a2d21b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ env:
 
 jobs:
   validate:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -44,6 +44,7 @@ jobs:
       fail-fast: false
       matrix:
         os:
+          - ubuntu-22.04
           - ubuntu-20.04
           - macOS-11
           - windows-2022
@@ -59,13 +60,13 @@ jobs:
           cache: true
       -
         name: Install deps
-        if: ${{ matrix.os == 'ubuntu-20.04' }}
+        if: startsWith(matrix.os, 'ubuntu-')
         run: |
           sudo apt-get update
           sudo apt-get install -y dbus-x11 gnome-keyring libsecret-1-dev pass
       -
         name: GPG conf
-        if: ${{ matrix.os == 'ubuntu-20.04' }}
+        if: startsWith(matrix.os, 'ubuntu-')
         uses: actions/github-script@v6
         id: gpg
         with:
@@ -82,7 +83,7 @@ jobs:
             core.setOutput('passphrase', fs.readFileSync('.github/workflows/fixtures/7D851EB72D73BDA0.pass', {encoding: 'utf8'}));
       -
         name: Import GPG key
-        if: ${{ matrix.os == 'ubuntu-20.04' }}
+        if: startsWith(matrix.os, 'ubuntu-')
         uses: crazy-max/ghaction-import-gpg@v5
         with:
           gpg_private_key: ${{ steps.gpg.outputs.key }}
@@ -90,7 +91,7 @@ jobs:
       -
         name: Test
         run: |
-          if [ "${{ matrix.os }}" = "ubuntu-20.04" ]; then
+          if [[ "${{ matrix.os }}" = ubuntu-* ]]; then
             echo -e "trust\n5\ny" | gpg --batch --no-tty --command-fd 0 --edit-key 7D851EB72D73BDA0
             pass init 7D851EB72D73BDA0
           fi
@@ -104,7 +105,7 @@ jobs:
           file: ./coverage.txt
 
   test-sandboxed:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       -
         name: Checkout
@@ -127,7 +128,7 @@ jobs:
           file: ${{ env.DESTDIR }}//coverage.txt
 
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       -
         name: Checkout
@@ -173,7 +174,7 @@ jobs:
           files: ${{ env.DESTDIR }}/*
 
   build-deb:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       -
         name: Checkout