diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34983c02..11606e64 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,9 +8,6 @@ SET(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 SET(CMAKE_CXX_STANDARD 20)
 SET(CMAKE_CXX_STANDARD_REQUIRED True)
 
-SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wno-deprecated-enum-enum-conversion -DNDEBUG")
-SET(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG")
-
 SET(JFJOCH_WRITER_ONLY           OFF CACHE BOOL "Compile HDF5 writer only")
 SET(JFJOCH_INSTALL_DRIVER_SOURCE OFF CACHE BOOL "Install kernel driver source (ignored if building writer only; necessary for RPM building)")
 SET(JFJOCH_USE_CUDA              ON CACHE BOOL "Compile Jungfraujoch with CUDA")
@@ -42,7 +39,8 @@ INCLUDE(CheckIncludeFile)
 CHECK_LANGUAGE(CUDA)
 
 SET(CMAKE_CUDA_ARCHITECTURES 75 80 86 89 90 100 120) # T4, A100, RTX A4000, L4
-SET(CMAKE_CUDA_STANDARD 17)
+SET(CMAKE_CUDA_STANDARD 20)
+SET(CMAKE_CUDA_STANDARD_REQUIRED True)
 SET(CMAKE_CUDA_FLAGS_RELEASE "-O3 -lineinfo")
 SET(CMAKE_CUDA_RUNTIME_LIBRARY Static)
 
diff --git a/jungfrau/CMakeLists.txt b/jungfrau/CMakeLists.txt
index adc83356..2986d404 100644
--- a/jungfrau/CMakeLists.txt
+++ b/jungfrau/CMakeLists.txt
@@ -6,5 +6,3 @@ ADD_LIBRARY(JFCalibration STATIC
         JFPedestalCalc.cpp JFPedestalCalc.h)
 
 TARGET_LINK_LIBRARIES(JFCalibration JFJochCommon)
-
-SET_SOURCE_FILES_PROPERTIES(JFPedestalCalc.cpp JFConversionFloatingPoint.cpp PROPERTIES COMPILE_FLAGS -Ofast)