diff --git a/CMakeLists.txt b/CMakeLists.txt
index d931b6e9ec6b15ec3b4239f16da7e08d588c2051..6839589707785a95c48e15b2de4750cb33ee084b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,6 +86,11 @@ 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")
 
@@ -576,7 +581,7 @@ target_link_libraries(
   PugsUtils
   PugsOutput
   PugsLanguageUtils
-  kokkos
+  Kokkos::kokkos
   ${PETSC_LIBRARIES}
   ${SLEPC_LIBRARIES}
   ${PARMETIS_LIBRARIES}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 085f012fb6d0e1bd9ad519d594e6bc8121f27303..37a87d841e2ad88946edcdfe46abb3fe8ca4ea71 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -196,7 +196,7 @@ target_link_libraries (unit_tests
   PugsScheme
   PugsOutput
   PugsUtils
-  kokkos
+  Kokkos::kokkos
   ${PARMETIS_LIBRARIES}
   ${MPI_CXX_LINK_FLAGS} ${MPI_CXX_LIBRARIES}
   ${PETSC_LIBRARIES}
@@ -223,7 +223,7 @@ target_link_libraries (mpi_unit_tests
   PugsUtils
   PugsAlgebra
   PugsMesh
-  kokkos
+  Kokkos::kokkos
   ${PARMETIS_LIBRARIES}
   ${MPI_CXX_LINK_FLAGS} ${MPI_CXX_LIBRARIES}
   ${PETSC_LIBRARIES}