diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e14cd7ef..e6ad4ec5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,8 +23,18 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-16.04, ubuntu-18.04, ubuntu-20.04, macos-10.15, windows-2019, windows-2016]
-    continue-on-error: true
+        os: [ubuntu-16.04, ubuntu-18.04, ubuntu-20.04, macos-10.13, macos-10.14, macos-10.15, windows-2016, windows-2019]
+        include:
+          - os: ubuntu-20.04
+            env:
+              TESTING: "python_36"
+          - os: ubuntu-20.04
+            env:
+              TESTING: "python_37"
+          - os: ubuntu-20.04
+            env:
+              TESTING: "python_38"
+
     steps:
 
       - uses: actions/checkout@master
@@ -34,6 +44,7 @@ jobs:
 
       - name: Cache multiple paths
         uses: actions/cache@v2
+        if: env.TESTING == ""
         with:
           path: |
             ~/python
diff --git a/src/travis/linux-install.sh b/src/travis/linux-install.sh
index be54dc6a..8ad24ca8 100755
--- a/src/travis/linux-install.sh
+++ b/src/travis/linux-install.sh
@@ -19,7 +19,7 @@ else
   echo "PyInstaller GAM info:"
   du -h $gam
   time $gam version extended
-  if [ "${TRAVIS_DIST}" == "xenial" ] && [ "${PLATFORM}" == "x86_64" ]; then
+  if ([ "${ImageOS}" == "ubuntu16" ]) && [ "${HOSTTYPE}" == "x86_64" ]; then
     GAM_LEGACY_ARCHIVE=gam-${GAMVERSION}-${GAMOS}-${PLATFORM}-legacy.tar.xz
     $python -OO -m staticx -l /lib/x86_64-linux-gnu/libresolv.so.2 -l /lib/x86_64-linux-gnu/libnss_dns.so.2 $gam $gam-staticx
     strip $gam-staticx