diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 0e89b68..40910d8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -10,7 +10,7 @@ on:
 jobs:
   lint:
     name: Run linter and formatter
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
@@ -29,7 +29,7 @@ jobs:
 
   build_sdist:
     name: Build sdist
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
@@ -49,7 +49,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-10.15]
+        os: [ubuntu-latest, macos-latest]
 
     steps:
       - uses: actions/checkout@v2
@@ -57,7 +57,7 @@ jobs:
           fetch-depth: "0"
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.3.1
+        uses: pypa/cibuildwheel@v2.16.2
         env:
           # TODO: Remove this option adn build wheels for musllinux.
           # Currently CLAPACK fails to build for musllinux due to lack of
@@ -71,7 +71,7 @@ jobs:
 
   upload_pypi:
     name: Upload to PyPI
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs:
       - build_sdist
       - build_wheels
diff --git a/setup.py b/setup.py
index 00f5153..712d4ca 100644
--- a/setup.py
+++ b/setup.py
@@ -57,11 +57,11 @@
     classifiers=[
         'Development Status :: 4 - Beta',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 3.6',
-        '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',
         'License :: OSI Approved :: Apache Software License',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],