diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
index 05a2b49..c2d182f 100644
--- a/.github/workflows/build-wheels.yml
+++ b/.github/workflows/build-wheels.yml
@@ -35,14 +35,6 @@ jobs:
           echo "MACOSX_DEPLOYMENT_TARGET=$(sw_vers -productVersion | cut -d '.' -f 1-2)" >> $GITHUB_ENV
           # This does not work inside CIBW_BEFORE_ALL_MACOS; Without it, the wheel repair fails.
 
-      - name: Windows - Set up pkg-config and CMake
-        if: runner.os == 'windows'
-        shell: bash
-        run: |
-          choco install cmake --version=3.31.5 --allow-downgrade -y --no-progress
-          choco install -y --no-progress --stoponfirstfailure pkgconfiglite
-          echo "PKG_CONFIG_PATH=C:/mingw64/lib/pkgconfig" >> $GITHUB_ENV
-
       - name: Build wheels
         uses: pypa/cibuildwheel@v4.3.1
         env:
@@ -51,18 +43,10 @@ jobs:
           CIBW_BUILD_FRONTEND: build
           CIBW_BUILD_VERBOSITY: 3
           CIBW_TEST_REQUIRES: pytest scipy
-          CIBW_TEST_COMMAND: |
-            pytest {project}/tests
+          CIBW_TEST_COMMAND: pytest {project}/tests
           CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux_2_28_x86_64
           CIBW_MUSLLINUX_X86_64_IMAGE: musllinux_1_2
-          CIBW_BEFORE_ALL_LINUX: |
-            bash {project}/cibw-scripts/before_all_linux.sh {project}
-        #   CIBW_ENVIRONMENT_WINDOWS: >
-        #     MESON_ARGS="-Dodrpack95:blas_option=refblas"
-          CIBW_BEFORE_ALL_WINDOWS: |
-            bash {project}/cibw-scripts/before_all_windows.sh
-          CIBW_BEFORE_BUILD_WINDOWS: |
-            pip install delvewheel
+          CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel
           CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: |
             bash ./cibw-scripts/repair_wheel_command_windows.sh {wheel} {dest_dir}
 
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index beca64a..62c4244 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -43,8 +43,8 @@ jobs:
 
       - name: Install Ubuntu-build dependencies
         run: |
-          sudo apt-get update
-          sudo apt-get install -y libopenblas-dev
+          # sudo apt-get update
+          # sudo apt-get install -y libopenblas-dev
           gfortran --version
           gcc --version
 
diff --git a/cibw-scripts/before_all_linux.sh b/cibw-scripts/before_all_linux.sh
deleted file mode 100644
index eeb4344..0000000
--- a/cibw-scripts/before_all_linux.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-set -xe
-
-PROJECT_DIR="$1"
-
-if [ -e /etc/alpine-release ]; then
-    # musllinux (Alpine Linux)
-    echo "Detected musllinux environment. Installing OpenBLAS using apk..."
-    apk add --no-cache build-base openblas-dev
-else
-    # manylinux (CentOS)
-    echo "Detected manylinux environment. Installing OpenBLAS using yum..."
-    yum install -y openblas-devel
-fi
diff --git a/cibw-scripts/before_all_windows.sh b/cibw-scripts/before_all_windows.sh
deleted file mode 100644
index 92b5a01..0000000
--- a/cibw-scripts/before_all_windows.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-set -xe
-
-# Verify active compiler locations
-which gcc
-which gfortran
-
-# Update pacman database and upgrade system packages
-PATH="/c/msys64/usr/bin:$PATH"
-pacman -Sy --noconfirm
-pacman -Suu --noconfirm
-
-# Install OpenBLAS
-pacman -S --noconfirm mingw-w64-x86_64-openblas
-
-ls -l /c/msys64/mingw64/lib/pkgconfig/
-ls -l /c/msys64/mingw64/lib/libopenblas.*
-ls -l /c/msys64/mingw64/bin
-
-# Copy OpenBLAS files to mingw64 (where the active compiler toolchain is)
-# Without this, some dlls come from c/msys64/mingw64 and others from c/msys64/ resulting in
-# a runtime failure
-mkdir -p /c/mingw64/lib/pkgconfig
-cp /c/msys64/mingw64/lib/pkgconfig/openblas.pc /c/mingw64/lib/pkgconfig/
-cp /c/msys64/mingw64/bin/libopenblas.dll /c/mingw64/bin/
-cp /c/msys64/mingw64/lib/libopenblas.*   /c/mingw64/lib/
-cp -r /c/msys64/mingw64/include/openblas    /c/mingw64/include
-
-# Verify OpenBLAS detection
-pkg-config --modversion openblas
diff --git a/meson.build b/meson.build
index c5974d2..a0717ab 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,8 @@ project(
   default_options: [
     'buildtype=release',
     'b_ndebug=if-release',
-    'cpp_std=c++17'
+    'cpp_std=c++17',
+    'odrpack95:blas_option=refblas'
   ],
 )