diff --git a/.github/workflows/container-tests.yml b/.github/workflows/container-tests.yml
index a2488a91..492d55ab 100644
--- a/.github/workflows/container-tests.yml
+++ b/.github/workflows/container-tests.yml
@@ -8,7 +8,7 @@ jobs:
   build:
     # This job only runs for '[test]' pull request comments by owner, member
     name: Container-tests by GitHub Action on Testing Farm service
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/sanity-tests.yaml b/.github/workflows/sanity-tests.yaml
index 86678951..ebc2e41f 100644
--- a/.github/workflows/sanity-tests.yaml
+++ b/.github/workflows/sanity-tests.yaml
@@ -8,7 +8,7 @@ jobs:
   sanity:
     # This job only runs for '[test]' pull request comments by owner, member
     name: Sanity tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: |
       github.event.issue.pull_request
       && (contains(github.event.comment.body, '[test]') || contains(github.event.comment.body, '[test-all]'))