diff --git a/CMakeLists.txt b/CMakeLists.txt
index 441062bd6e00cca6306cebf7d0a761db08c7e18a..6839589707785a95c48e15b2de4750cb33ee084b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,6 +86,10 @@ endif()
 set(GNU_CXX_MIN_VERSION "9.0.0")
 set(CLANG_CXX_MIN_VERSION "10.0.0")
 
+#------------------------------------------------------
+# Change Kokkos namespace to avoid conflicts
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DKokkos=InlineKokkos")
+
 #------------------------------------------------------
 # Pugs default compiler flags
 set(PUGS_CXX_FLAGS "${PUGS_CXX_FLAGS} -Wall -Wextra -pedantic")