diff --git a/projects/rocprim/docs/how-to/rocPRIM-spir-v.rst b/projects/rocprim/docs/how-to/rocPRIM-spir-v.rst
index 9cc00cfa6c0b..89dde296661f 100644
--- a/projects/rocprim/docs/how-to/rocPRIM-spir-v.rst
+++ b/projects/rocprim/docs/how-to/rocPRIM-spir-v.rst
@@ -10,31 +10,19 @@ Using SPIR-V with rocPRIM
 
 rocPRIM supports building with target-agnostic SPIR-V.
 
-.. note::
-
-    SPIR-V is in an early access state. Using it in production is not recommended.
-
-To build with SPIR-V, set the ``ROCPRIM_EXPERIMENTAL_SPIRV`` parameter to any non-zero value, and set ``--offload-arch`` to ``amdgcnspirv``.
+To build with SPIR-V, set ``--offload-arch`` to ``amdgcnspirv``.
 
 For example, with hipcc:
 
 .. code:: shell
 
-    hipcc -DROCPRIM_EXPERIMENTAL_SPIRV=1 --offload-arch=amdgcnspirv
+    hipcc --offload-arch=amdgcnspirv
 
 For example, with cmake:
 
 .. code:: shell
 
-    cmake -DCMAKE_CXX_FLAGS="-DROCPRIM_EXPERIMENTAL_SPIRV=1 --offload-arch=amdgcnspirv"
-
-
-.. note::
-
-    rocPRIM does not support mixed compilation targets. No other target can be set when ``--offload-arch=amdgcnspirv`` is used.
-    
-    Setting ``ROCPRIM_EXPERIMENTAL_SPIRV`` will disable all config dispatching.
-
+    cmake --offload-arch=amdgcnspirv"
 
 When targeting SPIR-V, the hardware wavefront size (also known as warp size) is not known
 at compile time. 
diff --git a/projects/rocprim/rocprim/include/rocprim/device/config_types.hpp b/projects/rocprim/rocprim/include/rocprim/device/config_types.hpp
index 5af686d245df..3d0891fa5757 100644
--- a/projects/rocprim/rocprim/include/rocprim/device/config_types.hpp
+++ b/projects/rocprim/rocprim/include/rocprim/device/config_types.hpp
@@ -609,7 +609,7 @@ constexpr arch::wavefront::target get_wavefront_size(const gen gen = gen::unknow
  */
 constexpr target_arch device_target_arch()
 {
-#if defined(__amdgcn_processor__) && !defined(ROCPRIM_EXPERIMENTAL_SPIRV)
+#if defined(__amdgcn_processor__)
     // The terminating zero is not counted in the length of the string
     return get_target_arch_from_name(__amdgcn_processor__,
                                      sizeof(__amdgcn_processor__) - sizeof('\0'));
diff --git a/projects/rocprim/test/rocprim/test_config_dispatch.cpp b/projects/rocprim/test/rocprim/test_config_dispatch.cpp
index f720d6d37b44..ddf9d2c3d5d3 100644
--- a/projects/rocprim/test/rocprim/test_config_dispatch.cpp
+++ b/projects/rocprim/test/rocprim/test_config_dispatch.cpp
@@ -85,8 +85,6 @@ TEST(RocprimConfigDispatchTests, GetTargetArch)
     ASSERT_TRUE(get_target_arch_from_name("gfx803", 6) == target_arch::gfx803);
 }
 
-#if !defined(ROCPRIM_EXPERIMENTAL_SPIRV) // This macro disables the config_dispatching
-
 TEST(RocprimConfigDispatchTests, HostMatchesDevice)
 {
     const int device_id = test_common_utils::obtain_device_from_ctest();
@@ -147,8 +145,6 @@ TEST(RocprimConfigDispatchTests, ParseCommonArches)
     ASSERT_EQ(parse_gcn_arch("gfx90a:sramecc+:xnack-"), target_arch::gfx90a);
 }
 
-#endif // ROCPRIM_EXPERIMENTAL_SPIRV
-
 #ifndef _WIN32
 TEST(RocprimConfigDispatchTests, DeviceIdFromStream)
 {