diff --git a/.github/workflows/autotools.yml b/.github/workflows/autotools.yml
index a5ef77ae5..209882496 100644
--- a/.github/workflows/autotools.yml
+++ b/.github/workflows/autotools.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, macos-latest]
+        os: [ubuntu-latest, macos-latest]
         crypto: [internal, openssl, nss]
         include:
           - crypto: internal
@@ -25,14 +25,14 @@ jobs:
 
     steps:
     - name: Setup Ubuntu
-      if: matrix.os == 'ubuntu-20.04'
-      run: sudo apt-get install valgrind
-
-    - name: Setup Ubuntu NSS
-      if: matrix.os == 'ubuntu-20.04' && matrix.crypto == 'nss'
+      if: matrix.os == 'ubuntu-latest'
       run: |
         sudo apt-get update
-        sudo apt-get install libnss3-dev
+        sudo apt-get install valgrind
+
+    - name: Setup Ubuntu NSS
+      if: matrix.os == 'ubuntu-latest' && matrix.crypto == 'nss'
+      run: sudo apt-get install libnss3-dev
 
     - name: Setup macOS OpenSSL
       if: matrix.os == 'macos-latest' && matrix.crypto == 'openssl'
@@ -54,5 +54,5 @@ jobs:
       run: make runtest
 
     - name: Test Valgrind
-      if:  matrix.os == 'ubuntu-20.04'
+      if:  matrix.os == 'ubuntu-latest' && matrix.crypto != 'nss'
       run: make runtest-valgrind