diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 368d0977..6acc4ff6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -7,8 +7,16 @@ jobs:
     strategy:
       max-parallel: 6
       matrix:
+        # ubuntu-22.04 supports Python 3.7-3.12
+        # ubuntu-24.04 (currently latest & preferred) supports Python 3.9-3.12
+        # More details: https://github.com/actions/runner-images/issues/10636
         os: [ubuntu-latest]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        include:
+          - os: ubuntu-22.04
+            python-version: "3.7"
+          - os: ubuntu-22.04
+            python-version: "3.8"
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
diff --git a/setup.py b/setup.py
index 8cdd4864..b8577d53 100644
--- a/setup.py
+++ b/setup.py
@@ -39,6 +39,10 @@
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Topic :: Utilities",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
     ],