diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c3bbd275..f981813e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -171,10 +171,13 @@ jobs:
              echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV
              echo -e "Python: $python\nPip: $pip\nLD_LIB...: $LD_LIBRARY_PATH"
              if [ $GAMOS == "macos" ]; then
-               #export pipoptions='--no-binary ":all:"'
+               export pipoptions='--no-binary ":all:"'
                echo "PATH=$PATH" >> $GITHUB_ENV # keep gnutools for MacOS
                export MACOSX_DEPLOYMENT_TARGET="10.9"
-               #export CFLAGS="-arch arm64 -arch x86_64"
+               export CFLAGS="-arch arm64 -arch x86_64"
+               echo "pipoptions=$pipoptions" >> $GITHUB_ENV
+               echo "MACOSX_DEPLOYMENT_TARGET=$MACOS_DEPLOYMENT_TARGET" >> $GITHUB_ENV
+               echo "CFLAGS=$CGLAGS" >> $GITHUB_ENV
              fi
              $pip install --upgrade pip $pipoptions
              $pip install wheel $pipoptions
@@ -202,6 +205,9 @@ jobs:
              set +e
              git clone https://github.com/pyinstaller/pyinstaller.git
              cd pyinstaller
+             # use latest pyinstaller tag version
+             git fetch --tags
+             git checkout $(git describe --tags $(git rev-list --tags --max-count=1))
              # remove pre-compiled bootloaders so we fail if bootloader compile fails
              rm -rf PyInstaller/bootloader/*-*/*
              cd bootloader
@@ -212,16 +218,11 @@ jobs:
              $python ./waf all $TARGETARCH
              cat build/config.log
              cd ..
-             $pip install .
+             $pip install . $pipoptions
 
       - name: Install pip requirements
         run: |
              set +e
-             if [ $GAMOS == "macos" ]; then
-               #export pipoptions='--no-binary ":all:"'
-               export MACOSX_DEPLOYMENT_TARGET="10.9"
-               export CFLAGS="-arch arm64 -arch x86_64"
-             fi
              $pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1  | xargs -n1 $pip install -U --force-reinstall $pipoptions
              $pip install --upgrade -r requirements.txt $pipoptions