diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9f0cd6f26a..157cf54e24 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,11 +12,11 @@ jobs:
       # Allows for matrix sub-jobs to fail without canceling the rest
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04, windows-latest]
-        python-version: [3.8, 3.9]
+        os: [ubuntu-20.04, macos-11.0, windows-2019]
+        python-version: [3.8, 3.9, 3.10.0-alpha.4]
         image: [null]
         include:
-          - os: ubuntu-18.04
+          - os: ubuntu-20.04
             python-version: null
             image: davfsa/stackless-python-hikari:3.8.0b3
 
@@ -42,7 +42,7 @@ jobs:
           nox -s pytest-speedups -- --cov-append
 
       - name: Upload report
-        if: ${{ matrix.os == 'ubuntu-18.04' && matrix.python-version == '3.8' }}
+        if: ${{ matrix.os == 'ubuntu-20.04' && matrix.python-version == '3.8' }}
         run: |
           curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
           chmod +x ./cc-test-reporter
@@ -51,7 +51,7 @@ jobs:
           --id "d40e64ea0ff74713f79365fea4378ab51a2141ad4fcf0fb118496bbf560d4192"
 
   linting:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checkout repo
@@ -70,7 +70,7 @@ jobs:
           nox -s safety mypy flake8
 
   twemoji:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checkout repo
@@ -89,7 +89,7 @@ jobs:
           nox -s twemoji-test
 
   pages:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checkout repo
@@ -122,7 +122,7 @@ jobs:
     if: github.event.release.published
     needs: [test, linting, twemoji, pages]
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     env:
       GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}