diff --git a/CMakeLists.txt b/CMakeLists.txt
index bea1b398ced94f3ec4da97b5db6237fd9882d87d..20bffae234efc851b57869af4bf305170bfb204d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,13 +60,6 @@ endif()
 
 ##########
 # CUDA
-if(NOT $ENV{AIDGE_INSTALL} STREQUAL "")
-    message(WARNING "Env var CIBUILDWHEEL detected : currently building for a release job."
-                    "\nSetting manually CUDACXX, PATH & LD_LIBRARY_PATH Variables")
-    list(APPEND ENV{LD_LIBRARY_PATH} /usr/local/cuda/lib64)
-    list(APPEND ENV{PATH} /usr/local/cuda/bin)
-    set(ENV{CUDACXX} /usr/local/cuda/bin/nvcc)
-endif()
 find_package(CUDAToolkit REQUIRED)
 if(NOT DEFINED CMAKE_CUDA_STANDARD)
     set(CMAKE_CUDA_STANDARD 14)
diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt
index 807adc55e8c85f31f5e94013e174bf8cbc5a2320..23d5621490a317b892642281375f938db8245352 100644
--- a/unit_tests/CMakeLists.txt
+++ b/unit_tests/CMakeLists.txt
@@ -1,6 +1,6 @@
 Include(FetchContent)
 
-set(CATCH2_VERSION v3.0.1)
+set(CATCH2_VERSION v3.7.1)
 message(STATUS "Retrieving Catch2 ${CATCH2_VERSION} from git")
 FetchContent_Declare(
   Catch2