diff --git a/.github/workflows/wheels.yaml b/.github/workflows/wheels.yaml
index b76027c04..50fd9abde 100644
--- a/.github/workflows/wheels.yaml
+++ b/.github/workflows/wheels.yaml
@@ -41,20 +41,16 @@ jobs:
 
       # Setup the fortran compiler. This is aware of the operating system.
       - uses: awvwgk/setup-fortran@main
-        if: runner.os != 'Windows'
         id: sf
         with:
           compiler: gcc
           version: 11
 
-      - uses: msys2/setup-msys2@v2
-        if: runner.os == 'Windows'
-
       # We use the cibuildwheel action to take care of everything
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.15
         env:
-          #SKBUILD_CMAKE_ARGS: -DCMAKE_Fortran_COMPILER=${{ steps.sf.outputs.fc }};-DCMAKE_C_COMPILER=${{ steps.sf.outputs.cc }}
+          SKBUILD_CMAKE_ARGS: -DCMAKE_Fortran_COMPILER=${{ steps.sf.outputs.fc }};-DCMAKE_C_COMPILER=${{ steps.sf.outputs.cc }}
           CC: ${{ steps.setup-fortran.outputs.cc }}
           FC: ${{ steps.setup-fortran.outputs.fc }}
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c45693fb8..26a215efe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,13 +66,16 @@ message(STATUS "Compilation flags")
 list(APPEND CMAKE_MESSAGE_INDENT "  ")
 
 set(CFLAGS $ENV{CFLAGS})
+cmake_print_variables(CMAKE_C_COMPILER)
 cmake_print_variables(CFLAGS)
 cmake_print_variables(CMAKE_C_FLAGS)
 set(CXXFLAGS $ENV{CXXFLAGS})
+cmake_print_variables(CMAKE_CXX_COMPILER)
 cmake_print_variables(CXXFLAGS)
 cmake_print_variables(CMAKE_CXX_FLAGS)
 if(WITH_FORTRAN)
   set(FFLAGS $ENV{FFLAGS})
+  cmake_print_variables(CMAKE_Fortran_COMPILER)
   cmake_print_variables(FFLAGS)
   cmake_print_variables(CMAKE_Fortran_FLAGS)
 endif()
diff --git a/pyproject.toml b/pyproject.toml
index f7219f604..494790da3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -309,14 +309,22 @@ skip = [
 test-command = "bash {project}/tools/build_tools/test_wheel.sh {project}"
 
 [tool.cibuildwheel.linux]
-archs = ["x86_64", "aarch64"]
-
+archs = [
+    "x86_64",
+    "aarch64",
+]
 
 [tool.cibuildwheel.windows]
-archs = ["AMD64", "x86"]
+archs = [
+    "AMD64",
+    "x86",
+]
 
 test-command = "pytest --pyargs sisl -m 'not slow'"
 
 [tool.cibuildwheel.macos]
-archs = ["x86_64", "universal2"]
+archs = [
+    "x86_64",
+#    "universal2",
+]
 test-skip = "*-macosx_arm64 *-macosx_universal2:arm64"