diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 838926f5f2..ab934e4178 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
 
     #if: false    # uncomment to prevent the rest of the workflow running
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     # Stop existing workflows for matching branches and pull requests
     concurrency:
diff --git a/.github/workflows/matrix.py b/.github/workflows/matrix.py
index d1dd140d27..dbfe532719 100644
--- a/.github/workflows/matrix.py
+++ b/.github/workflows/matrix.py
@@ -26,14 +26,14 @@
 #   dynamically linked by pyinstaller.
 #   https://pyinstaller.readthedocs.io/en/stable/usage.html#making-gnu-linux-apps-forward-compatible
 os_release_list = [
-    'ubuntu-20.04',
+    'ubuntu-22.04',
     'windows-latest',
     'macos-latest',
 ]
 
 # List of OS images to use for release tests
 os_test_list = os_release_list + [
-    'ubuntu-latest',
+    'ubuntu-24.04',
 ]
 
 # List of python versions to use for release builds