diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ef5e686..d960102b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,10 +45,12 @@ include(SetRequiredBuildSettingsForGCC8)
 #Idefix requires Cuda Lambdas (experimental)
 if(Kokkos_ENABLE_CUDA)
   set(Kokkos_ENABLE_CUDA_LAMBDA ON CACHE BOOL "Idefix requires lambdas on Cuda" FORCE)
+  set(Kokkos_ENABLE_IMPL_CUDA_MALLOC_ASYNC OFF CACHE BOOL "Disable Async malloc to avoid bugs on PSM2" FORCE)
 endif()
 
 # Add kokkos CMAKE files (required early since these set compiler options)
 add_subdirectory(src/kokkos build/kokkos)
+include_directories(${Kokkos_INCLUDE_DIRS_RET})
 
 # Add Idefix CXX Flags
 add_compile_options(${Idefix_CXX_FLAGS})
diff --git a/src/kokkos b/src/kokkos
index 6ecdf605..15dc143e 160000
--- a/src/kokkos
+++ b/src/kokkos
@@ -1 +1 @@
-Subproject commit 6ecdf605e0f7639adec599d25cf0e206d7b8f9f5
+Subproject commit 15dc143e5f39949eece972a798e175c4b463d4b8