diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 332a6373..00f5f719 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   ruff:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout pygit2
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8ff1f984..f1525f7f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -12,11 +12,11 @@ jobs:
     strategy:
       matrix:
         include:
-        - os: ubuntu-22.04
+        - os: ubuntu-24.04
           python-version: 3.9
-        - os: ubuntu-22.04
+        - os: ubuntu-24.04
           python-version: '3.13-dev'
-        - os: ubuntu-22.04
+        - os: ubuntu-24.04
           python-version: 'pypy3.9'
         - os: macos-latest
           python-version: 3.9
@@ -43,7 +43,7 @@ jobs:
         LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.1 /bin/sh build.sh test
 
   aarch64:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -60,7 +60,7 @@ jobs:
           LIBSSH2_VERSION=1.11.0 LIBGIT2_VERSION=1.8.1 /bin/sh build.sh test
 
   s390x:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: github.ref == 'refs/heads/master'
     steps:
     - name: Checkout
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index dc89ae49..4420dd67 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-12]
+        os: [ubuntu-24.04, macos-12]
 
     steps:
       - uses: actions/checkout@v4
@@ -42,7 +42,7 @@ jobs:
   pypi:
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
     needs: [build_wheels]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/download-artifact@v3