diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 99ac7a2..90d06a6 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -35,7 +35,7 @@ jobs:
             cmake_build_type: 'Release'
             kokkos_ver: '4.1.00'
             json: External
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     container: ghcr.io/ecp-copa/ci-containers/${{ matrix.distro }}
     continue-on-error: ${{ matrix.distro == 'ubuntu:intel' }}
     steps:
diff --git a/.github/workflows/Weekly.yml b/.github/workflows/Weekly.yml
index 37ac60a..65ac560 100644
--- a/.github/workflows/Weekly.yml
+++ b/.github/workflows/Weekly.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         backend: ["OPENMP", "SERIAL"]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     container: ghcr.io/ecp-copa/ci-containers/ubuntu:latest
     steps:
       - name: Checkout kokkos