diff --git a/.docker/qgis3-qt5-build-deps.dockerfile b/.docker/qgis3-qt5-build-deps.dockerfile
index 34cbaf72643..7d268004c37 100644
--- a/.docker/qgis3-qt5-build-deps.dockerfile
+++ b/.docker/qgis3-qt5-build-deps.dockerfile
@@ -1,5 +1,5 @@
 
-ARG DISTRO_VERSION=20.04
+ARG DISTRO_VERSION=22.04
 
 # Oracle Docker image is too large, so we add as less dependencies as possible
 # so there is enough space on GitHub runner
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 8b4e5718061..b22af692507 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -36,7 +36,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - distro-version: '20.04'
+          - distro-version: '22.04'
             qt-version: 5
             run-tests: true
             docker-tag-suffix: ''
@@ -44,23 +44,8 @@ jobs:
             with-qt5: ON
             with-3d: ON
             with-quick: ON
-            with-clazy: OFF
-            patch-qt-3d: true
-            with-grass7: OFF
-            with-grass8: OFF
-            LD_PRELOAD: /lib/x86_64-linux-gnu/libSegFault.so
-            experimental: false
-
-          - distro-version: '21.10'
-            qt-version: 5
-            run-tests: false
-            docker-tag-suffix: _21.10
-            with-qt6: OFF
-            with-qt5: ON
-            with-3d: OFF
-            with-quick: ON
             with-clazy: ON
-            patch-qt-3d: false
+            patch-qt-3d: true
             with-grass7: OFF
             with-grass8: OFF
             LD_PRELOAD: /lib/x86_64-linux-gnu/libSegFault.so
@@ -304,13 +289,13 @@ jobs:
 
     strategy:
       matrix:
-        distro-version: [20.04]
+        distro-version: [22.04]
         qt-version: [5]
         test-batch: [ALL_BUT_PROVIDERS, POSTGRES, HANA]
         docker-target: [binary-only]
 
         include:
-          - distro-version: 20.04
+          - distro-version: 22.04
             qt-version: 5
             test-batch: ORACLE
             docker-target: binary-for-oracle