diff --git a/.github/workflows/build_wheel_ci.yml b/.github/workflows/build_wheel_ci.yml
index 7bc337d..e62d484 100644
--- a/.github/workflows/build_wheel_ci.yml
+++ b/.github/workflows/build_wheel_ci.yml
@@ -16,9 +16,10 @@ jobs:
       CIBW_ARCHS_LINUX: "x86_64 aarch64"
       CIBW_ARCHS_WINDOWS: "AMD64 x86"
       CIBW_ARCHS_MACOS: "x86_64 universal2 arm64"
-      CIBW_CONFIG_SETTINGS: "--use-cython --use-cffi"
+      CIBW_ENVIRONMENT: USE-CYTHON="1" USE-CFFI="1"
     steps:
     - uses: actions/checkout@v4
+      run: git submodule update --init --recursive
     - uses: actions/setup-python@v5
     - name: Set up QEMU
       if: runner.os == 'Linux'
diff --git a/setup.py b/setup.py
index c9ef9a2..20e5488 100644
--- a/setup.py
+++ b/setup.py
@@ -92,6 +92,9 @@ def has_option(name: str) -> bool:
     if name in sys.argv[1:]:
         sys.argv.remove(name)
         return True
+    name = name.strip("-").upper()
+    if os.environ.get(name, None) is not None:
+        return True
     return False
 
 
@@ -100,7 +103,7 @@ def has_option(name: str) -> bool:
 setup_kw = {}
 if has_option("--use-cython"):
     print("building cython")
-    setup_requires.append("cython")
+    setup_requires.append("Cython>=3.0.9")
     setup_kw["ext_modules"] = cythonize(
         extensions,
         compiler_directives={