diff --git a/.github/workflows/on-pr.yml b/.github/workflows/on-pr.yml
index cf8d84f74..b78f6522d 100644
--- a/.github/workflows/on-pr.yml
+++ b/.github/workflows/on-pr.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         java-version: [ 8 ]
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b248f5b71..bb7e21533 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   tagged-release:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         java-version: [ 8 ]