diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a42df804..0cae370f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -113,7 +113,7 @@ jobs:
              echo "gam=${gam}" >> $GITHUB_ENV
              echo "gampath=${gampath}" >> $GITHUB_ENV
 
-      - name: Build and install Python and OpenSSL
+      - name: Build and install Python, OpenSSL and PyInstaller
         if: matrix.goal != 'test' && steps.cache-primes.outputs.cache-hit != 'true'
         run: |
              set +e
@@ -123,6 +123,20 @@ jobs:
              echo "pip=$pip" >> $GITHUB_ENV
              echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV
              echo -e "Python: $python\nPip: $pip\nLD_LIB...: $LD_LIBRARY_PATH"
+             echo "Downloading PyInstaller..."
+             curl -O https://github.com/pyinstaller/pyinstaller/archive/$PYINSTALLER_COMMIT.tar.gz
+             tar xf $PYINSTALLER_COMMIT.tar.gz
+             mv pyinstaller-$PYINSTALLER_COMMIT pyinstaller
+             cd pyinstaller/bootloader
+             if [ "${PLATFORM}" == "x86" ]; then
+               BITS="32"
+             else
+               BITS="64"
+             echo "bootloader before:"
+             md5sum ../PyInstaller/bootloader/*/*
+             $python ./waf all --target-arch=${BITS}bit
+             echo "bootloader after:"
+             md5sum ../PyInstaller/bootloader/*/*
 
       - name: Install pip requirements
         run: |
diff --git a/src/travis/linux-before-install.sh b/src/travis/linux-before-install.sh
index 3b923f01..81e95a1e 100755
--- a/src/travis/linux-before-install.sh
+++ b/src/travis/linux-before-install.sh
@@ -108,7 +108,5 @@ else
     $pip install staticx
   fi
 
-  $pip install --upgrade git+git://github.com/pyinstaller/pyinstaller.git@$PYINSTALLER_COMMIT
-
   cd $whereibelong
 fi
diff --git a/src/travis/macos-before-install.sh b/src/travis/macos-before-install.sh
index 01558e4a..bd98232f 100755
--- a/src/travis/macos-before-install.sh
+++ b/src/travis/macos-before-install.sh
@@ -103,5 +103,3 @@ $python -V
 
 cd $whereibelong
 
-$pip install --upgrade git+git://github.com/pyinstaller/pyinstaller.git@$PYINSTALLER_COMMIT
- 
diff --git a/src/travis/windows-before-install.sh b/src/travis/windows-before-install.sh
index cc06bad1..23685703 100755
--- a/src/travis/windows-before-install.sh
+++ b/src/travis/windows-before-install.sh
@@ -44,22 +44,6 @@ fi
 
 cd $mypath
 
-# Install PyInstaller from source and build bootloader
-# to try and avoid getting flagged as malware since
-# lots of malware uses PyInstaller default bootloader
-# https://stackoverflow.com/questions/53584395/how-to-recompile-the-bootloader-of-pyinstaller
-echo "Downloading PyInstaller..."
-curl -O https://github.com/pyinstaller/pyinstaller/archive/$PYINSTALLER_COMMIT.tar.gz
-tar xf $PYINSTALLER_COMMIT.tar.gz
-mv pyinstaller-$PYINSTALLER_COMMIT pyinstaller
-cd pyinstaller/bootloader
-echo "bootloader before:"
-md5sum ../PyInstaller/bootloader/Windows-${BITS}bit/*
-
-$python ./waf all --target-arch=${BITS}bit --msvc_version "msvc 14.0"
-
-echo "bootloader after:"
-md5sum ../PyInstaller/bootloader/Windows-${BITS}bit/*
 echo "PATH: $PATH"
 cd ..
 $python setup.py install