diff --git a/include/KokkosInterface.h b/include/KokkosInterface.h
index 9e5426ee62..a730d9bf71 100644
--- a/include/KokkosInterface.h
+++ b/include/KokkosInterface.h
@@ -46,7 +46,7 @@ namespace nalu {
 #if defined(KOKKOS_ENABLE_CUDA)
 typedef Kokkos::CudaSpace MemSpace;
 #elif defined(KOKKOS_ENABLE_HIP)
-typedef Kokkos::Experimental::HIPSpace MemSpace;
+typedef Kokkos::HIPSpace MemSpace;
 #elif defined(KOKKOS_HAVE_OPENMP)
 typedef Kokkos::OpenMP MemSpace;
 #else
diff --git a/include/aero/actuator/ActuatorTypes.h b/include/aero/actuator/ActuatorTypes.h
index 940234ea89..6f7939941e 100644
--- a/include/aero/actuator/ActuatorTypes.h
+++ b/include/aero/actuator/ActuatorTypes.h
@@ -24,7 +24,7 @@ namespace nalu {
 using ActuatorMemSpace = Kokkos::CudaSpace;
 using ActuatorExecutionSpace = Kokkos::DefaultExecutionSpace;
 #elif defined(KOKKOS_ENABLE_HIP)
-using ActuatorMemSpace = Kokkos::Experimental::HIPSpace;
+using ActuatorMemSpace = Kokkos::HIPSpace;
 using ActuatorExecutionSpace = Kokkos::DefaultExecutionSpace;
 #else
 using ActuatorMemSpace = Kokkos::HostSpace;
diff --git a/include/matrix_free/KokkosFramework.h b/include/matrix_free/KokkosFramework.h
index cad2f3689c..daee542ca7 100644
--- a/include/matrix_free/KokkosFramework.h
+++ b/include/matrix_free/KokkosFramework.h
@@ -62,12 +62,12 @@ struct ExecTraits<Kokkos::Cuda>
 
 #if defined(KOKKOS_ENABLE_HIP)
 template <>
-struct ExecTraits<Kokkos::Experimental::HIP>
+struct ExecTraits<Kokkos::HIP>
 {
   using data_type = double;
   using memory_traits =
     Kokkos::MemoryTraits<Kokkos::Restrict | Kokkos::Aligned>;
-  using memory_space = typename Kokkos::Experimental::HIP::memory_space;
+  using memory_space = typename Kokkos::HIP::memory_space;
   using layout = Kokkos::LayoutLeft;
   static constexpr int alignment = alignof(data_type);
   static constexpr int simd_len = 1;
diff --git a/unit_tests/UnitTestBasicKokkos.C b/unit_tests/UnitTestBasicKokkos.C
index 05e365a572..5a53e7d6a3 100644
--- a/unit_tests/UnitTestBasicKokkos.C
+++ b/unit_tests/UnitTestBasicKokkos.C
@@ -28,7 +28,7 @@ TEST(BasicKokkos, discover_execution_space)
 #endif
 
 #if defined(KOKKOS_ENABLE_HIP)
-    std::cout << "Kokkos::Experimental::HIP is available." << std::endl;
+    std::cout << "Kokkos::HIP is available." << std::endl;
 #endif
 
     std::cout << "Default execution space info: ";
diff --git a/wind-utils b/wind-utils
index e32b19dfa0..228b77695f 160000
--- a/wind-utils
+++ b/wind-utils
@@ -1 +1 @@
-Subproject commit e32b19dfa07f307f816a9b4bdb3d8478eb18d02c
+Subproject commit 228b77695f220f75a93a4ecd71033677faad42c4