diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index a00b053..164ec05 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -8,7 +8,7 @@ permissions:
 
 jobs:
   dependabot:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: >
       github.actor == 'dependabot[bot]'
     steps:
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index c8f2359..8c73e38 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -14,7 +14,7 @@ permissions:
 
 jobs:
   lint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         task:
@@ -30,7 +30,7 @@ jobs:
       - run: bundle exec rake ${{ matrix.task }}
 
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix: # Use as the parameter injection
         java-version: