diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0e7b9c0e..d3d773f2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,15 +21,10 @@ jobs:
       matrix:
         os: [self-hosted, ubuntu-latest, macos-latest]
         python-version: ['3.8', '3.10', '3.12']
-        include:
-          - os: ubuntu-20.04
-            python-version: '3.6'
-          - os: macos-latest
-            python-version: '3.6'
       fail-fast: false
     steps:
       - name: "Software Install - Ubuntu"
-        if: ${{ matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-20.04' || matrix.os == 'self-hosted' }}
+        if: ${{ matrix.os == 'ubuntu-latest' || matrix.os == 'self-hosted' }}
         run: |
           sudo apt-get update && \
           sudo apt-get install -y \
@@ -88,7 +83,7 @@ jobs:
                nbformat \
                nbconvert
       - name: "Software Install - PSRDADA"
-        if: ${{ matrix.os == 'ubuntu-20.04' || matrix.os == 'self-hosted' }}
+        if: ${{ matrix.os == 'self-hosted' }}
         run: |
           git clone git://git.code.sf.net/p/psrdada/code psrdada
           cd psrdada