diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4a2aaa7..fb9d9cd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ env:
 
 jobs:
   linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     env:
       ICU_MAJOR_VERSION: 71
@@ -32,7 +32,7 @@ jobs:
         with:
           path: ${{ env.LIBLOOT_INSTALL_PATH }}
           # Key includes ICU major version because libloot links against it as a shared library.
-          key: ${{ runner.os }}-libloot-${{ env.LIBLOOT_VERSION }}-icu-${{ env.ICU_MAJOR_VERSION }}
+          key: ${{ runner.name }}-libloot-${{ env.LIBLOOT_VERSION }}-icu-${{ env.ICU_MAJOR_VERSION }}
 
       - name: Get descriptive version
         id: get-version
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 94c3592..c90239a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ env:
 
 jobs:
   create_release:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
       git_tag: ${{ steps.get-git-tag.outputs.name }}
@@ -32,7 +32,7 @@ jobs:
             The `metadata-validator.tar.xz` file contains a Linux binary.
 
   linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: create_release
 
     env:
@@ -53,7 +53,7 @@ jobs:
         with:
           path: ${{ env.LIBLOOT_INSTALL_PATH }}
           # Key includes ICU major version because libloot links against it as a shared library.
-          key: ${{ runner.os }}-libloot-${{ env.LIBLOOT_VERSION }}-icu-${{ env.ICU_MAJOR_VERSION }}
+          key: ${{ runner.name }}-libloot-${{ env.LIBLOOT_VERSION }}-icu-${{ env.ICU_MAJOR_VERSION }}
 
       - name: Get descriptive version
         id: get-version