diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index 7a9c0e99..248cf43b 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -136,7 +136,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ macos-12, macos-13, macos-13-xlarge, macos-14, ubuntu-latest, windows-latest ]
+        os: [ macos-12, macos-13, macos-14, ubuntu-20.04, windows-latest ]
 
     steps:
       - uses: actions/setup-python@v5
diff --git a/fortran/Makefile b/fortran/Makefile
index d12106f8..4bf28d89 100644
--- a/fortran/Makefile
+++ b/fortran/Makefile
@@ -101,7 +101,7 @@ ifneq ($(shell echo $(compiler_ver) | awk '{print ($$1 >= 14.0)}'),0)
 SFFLAGS += -static-libgfortran -static-libgcc -static-libquadmath 
 endif
 else
-SFFLAGS = -shared -fpic -static-libgfortran -static-libgcc
+SFFLAGS = -shared -fpic
 endif