diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index f60310d544..050d66e5d5 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -24,6 +24,7 @@ jobs:
   make:
     strategy:
       matrix:
+        os: [ubuntu-22.04, ubuntu-20.04]
         test_task: [check]
         arch: ['']
         configure: ['cppflags=-DVM_CHECK_MODE']
@@ -31,19 +32,24 @@ jobs:
         include:
           - test_task: check
             arch: i686
+            os: ubuntu-22.04
           - test_task: check
             configure: '--disable-yjit'
+            os: ubuntu-22.04
           - test_task: check
             configure: '--enable-shared --enable-load-relative'
+            os: ubuntu-22.04
           - test_task: test-bundler-parallel
+            os: ubuntu-22.04
           - test_task: test-bundled-gems
+            os: ubuntu-22.04
       fail-fast: false
 
     env:
       GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
       RUBY_DEBUG: ci
 
-    runs-on: ubuntu-20.04
+    runs-on: ${{ matrix.os }}
 
     if: >-
       ${{!(false