diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59eedadb..1bbcb019 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ set(CMAKE_CUDA_STANDARD_REQUIRED ON)
 set(CMAKE_CUDA_SEPARABLE_COMPILATION OFF)
 # Set CUDA archs so all supported GPUs are covered
 if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES)
-  set(CMAKE_CUDA_ARCHITECTURES "all")
+  set(CMAKE_CUDA_ARCHITECTURES "all-major")
 endif()
 IF (CMAKE_BUILD_TYPE MATCHES "Debug")
   if(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA")
diff --git a/setup.py b/setup.py
index 024ffd58..45e24a85 100644
--- a/setup.py
+++ b/setup.py
@@ -55,6 +55,10 @@ def build_extension(self, ext):
             f"-DDOUBLEPRECISION={double_precision}",
         ]
 
+        cuda_arch = os.environ.get("CMAKE_CUDA_ARCHITECTURES", "")
+        if cuda_arch:
+            cmake_args.append(f"-DCMAKE_CUDA_ARCHITECTURES={cuda_arch}")
+
         num_jobs = os.cpu_count()
         build_args = ["--config", "Release", f"-j{num_jobs}"]