diff --git a/.github/workflows/autotools-tier1.yml b/.github/workflows/autotools-tier1.yml
index 4159824..5170422 100644
--- a/.github/workflows/autotools-tier1.yml
+++ b/.github/workflows/autotools-tier1.yml
@@ -66,6 +66,9 @@ jobs:
 
 
   windows-msys2:
+    # Disable for now, the configure stage errors out with "The directory name is invalid."
+    if: ${{ false }}  # disable for now
+
     runs-on: windows-latest
     strategy:
       matrix:
@@ -102,15 +105,15 @@ jobs:
 
       - name: Create Build Directory
         shell: msys2 {0}
-        run: mkdir -p ${{runner.workspace}}/build
+        working-directory: ${{runner.workspace}}
+        run: mkdir build
 
       - name: Configure
         shell: msys2 {0}
         working-directory: ${{runner.workspace}}/build
-        run: make
-      #        run: >
-      #          ../gsmartcontrol/configure --enable-tests --with-nsis=${{ matrix.root }}/bin/makensis.exe --with-windows-sysroot=${{ matrix.root }}
-      #        run: "${GITHUB_WORKSPACE}/gsmartcontrol/configure" --enable-tests
+#        run: >
+#          ../gsmartcontrol/configure --enable-tests --with-nsis=${{ matrix.root }}/bin/makensis.exe --with-windows-sysroot=${{ matrix.root }}
+        run: "${GITHUB_WORKSPACE}/gsmartcontrol/configure" --enable-tests
 
       - name: Build
         shell: msys2 {0}
diff --git a/.github/workflows/autotools-tier2.yml b/.github/workflows/autotools-tier2.yml
index c87783d..abc4bf6 100644
--- a/.github/workflows/autotools-tier2.yml
+++ b/.github/workflows/autotools-tier2.yml
@@ -55,6 +55,9 @@ jobs:
 
 
   freebsd:
+    # Disable for now, make cannot find file2csource.sh for some reason.
+    if: ${{ false }}  # disable for now
+
     runs-on: macos-10.15
 #    env:
 #    variables to pass to VM