diff --git a/.github/workflows/checkstyle.yaml b/.github/workflows/checkstyle.yaml
index 7b50626259..0b7b82fc19 100644
--- a/.github/workflows/checkstyle.yaml
+++ b/.github/workflows/checkstyle.yaml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   checkstyle:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
       with:
@@ -14,6 +14,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
+        sudo apt-get -qq upgrade
         sudo apt-get install --yes -qq build-essential autoconf libtool gawk alien fakeroot linux-headers-$(uname -r)
         sudo apt-get install --yes -qq zlib1g-dev uuid-dev libattr1-dev libblkid-dev libselinux-dev libudev-dev libssl-dev python-dev python-setuptools python-cffi python3 python3-dev python3-setuptools python3-cffi
         # packages for tests
diff --git a/.github/workflows/zfs-tests-functional.yml b/.github/workflows/zfs-tests-functional.yml
index c2a8dec996..a3913b531f 100644
--- a/.github/workflows/zfs-tests-functional.yml
+++ b/.github/workflows/zfs-tests-functional.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [20.04]
+        os: [20.04, 22.04]
     runs-on: ubuntu-${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -18,6 +18,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
+        sudo apt-get -qq upgrade
         sudo apt-get install --yes -qq build-essential autoconf libtool gdb lcov \
           git alien fakeroot wget curl bc fio acl \
           sysstat mdadm lsscsi parted gdebi attr dbench watchdog ksh \
diff --git a/.github/workflows/zfs-tests-sanity.yml b/.github/workflows/zfs-tests-sanity.yml
index c563556230..34518428f6 100644
--- a/.github/workflows/zfs-tests-sanity.yml
+++ b/.github/workflows/zfs-tests-sanity.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
       with:
@@ -14,6 +14,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
+        sudo apt-get -qq upgrade
         sudo apt-get install --yes -qq build-essential autoconf libtool gdb lcov \
           git alien fakeroot wget curl bc fio acl \
           sysstat mdadm lsscsi parted gdebi attr dbench watchdog ksh \
diff --git a/.github/workflows/zloop.yml b/.github/workflows/zloop.yml
index 1c42491ee9..b9976264bf 100644
--- a/.github/workflows/zloop.yml
+++ b/.github/workflows/zloop.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       TEST_DIR: /var/tmp/zloop
     steps:
@@ -16,6 +16,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
+        sudo apt-get -qq upgrade
         sudo apt-get install --yes -qq build-essential autoconf libtool gdb \
           git alien fakeroot \
           zlib1g-dev uuid-dev libblkid-dev libselinux-dev \