diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 91e25551..0d8ee254 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,9 +7,9 @@ jobs:
   build-ubuntu:
     strategy:
       matrix:
-        python: [3.6, 3.7, 3.8]
+        python: [3.6, 3.7, 3.8, 3.9, "3.10"]
     name: Build (Python ${{ matrix.python }})
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-21.04
     steps:
       - uses: actions/checkout@v2
         with:
@@ -22,11 +22,11 @@ jobs:
         shell: bash
         run: |
           sudo apt-get update
-          sudo apt-get install -y notmuch python3-notmuch python3-venv flake8
+          sudo apt-get install -y notmuch python3-notmuch2 python3-venv flake8
           python3 -m venv env
           source ./env/bin/activate
           pip install setuptools pytest dkimpy
-          ln -s /usr/lib/python3/dist-packages/notmuch ./env/lib/python*/site-packages
+          ln -s /usr/lib/python3/dist-packages/notmuch2 ./env/lib/python*/site-packages
       - name: flake8 lint
         run: |
           source ./env/bin/activate