diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
index 4fb65e0c1..78a75cd1c 100644
--- a/.github/workflows/core.yml
+++ b/.github/workflows/core.yml
@@ -8,14 +8,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04]
-        # py3.9 is in quick-test
-        python-version: [3.7, 3.8, 3.10-dev, pypy-3.6, pypy-3.7]
+        os: [ubuntu-latest]
+        # CPython 3.9 is in quick-test
+        python-version: ['3.6', '3.7', '3.10', 3.11-dev, pypy-3.6, pypy-3.7, pypy-3.8, pypy-3.9]
         run-tests-ext: [sh]
         include:
         # atleast one of the tests must be in windows
         - os: windows-latest
-          python-version: 3.6
+          python-version: 3.8
           run-tests-ext: bat
     steps:
     - uses: actions/checkout@v2
diff --git a/.github/workflows/download.yml b/.github/workflows/download.yml
index dd242fa56..3b696549a 100644
--- a/.github/workflows/download.yml
+++ b/.github/workflows/download.yml
@@ -8,12 +8,12 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-18.04]
-        python-version: [3.7, 3.8, 3.9, 3.10-dev, pypy-3.6, pypy-3.7]
+        os: [ubuntu-latest]
+        python-version: ['3.6', '3.7', '3.9', '3.10', 3.11-dev, pypy-3.6, pypy-3.7, pypy-3.8, pypy-3.9]
         run-tests-ext: [sh]
         include:
         - os: windows-latest
-          python-version: 3.6
+          python-version: 3.8
           run-tests-ext: bat
     steps:
     - uses: actions/checkout@v2