diff --git a/.github/workflows/pre-release-tests.yml b/.github/workflows/pre-release-tests.yml
index 26f96f0b..fda1a997 100644
--- a/.github/workflows/pre-release-tests.yml
+++ b/.github/workflows/pre-release-tests.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: ["macos-latest", "ubuntu-20.04"]
+        os: ["macos-latest", "ubuntu-latest"]
     env:
       DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
     steps:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 30514f3e..bd12cb0c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: ["macos-latest", "ubuntu-20.04"]
+        os: ["macos-latest", "ubuntu-latest"]
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
diff --git a/bors.toml b/bors.toml
index 433ea7c7..8030ac72 100644
--- a/bors.toml
+++ b/bors.toml
@@ -1,6 +1,6 @@
 status = [
   'integration-tests on macos-latest',
-  'integration-tests on ubuntu-20.04',
+  'integration-tests on ubuntu-latest',
   'linter-check'
 ]
 # 1 hour timeout