diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1716f06035..6c42b9b5b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -762,9 +762,7 @@ IF(ALBANY_ENABLE_CUDA)
   IF (ENABLE_ALBANY_EPETRA)
     MESSAGE(FATAL_ERROR "\nError: Albany with Epetra is not supported with CUDA KokkosNode!  Please re-configure w/o Epetra (ENABLE_ALBANY_EPETRA=OFF).")
   ENDIF()
-  SET(NUM_GPUS_PER_NODE 4 CACHE STRING "set Number of GPUs per Node")
-  MESSAGE("-- NUM_GPUS_PER_NODE=${NUM_GPUS_PER_NODE}")
-  SET(KOKKOS_NDEVICES "--kokkos-ndevices=${NUM_GPUS_PER_NODE}")
+  SET(KOKKOS_NDEVICES "--kokkos-map-device-id-by=mpi_rank")
   IF (ENABLE_CUDA_ERROR_CHECK)
     SET(ALBANY_CUDA_ERROR_CHECK ON)
     MESSAGE("-- CUDA Error Check        Enabled")