diff --git a/acts.spec b/acts.spec
index 045b87e3fe5..d0cad3c74a7 100644
--- a/acts.spec
+++ b/acts.spec
@@ -27,7 +27,7 @@ Requires: py3-pybind11
 Requires: root
 Requires: xerces-c
 %{!?without_cuda:Requires: cuda}
-%{!?without_rocm:Requires: rocm}
+%{!?without_rocm:Requires: hip rocthrust rocprim comgr rocr-runtime}
 %if %{build_test}
 # These are ony used to build the examples and unit tests
 Requires: hepmc3
diff --git a/hipsparselt.spec b/hipsparselt.spec
index 533922e68bc..76251fcdbe8 100644
--- a/hipsparselt.spec
+++ b/hipsparselt.spec
@@ -2,7 +2,7 @@
 ### RPM external hipsparselt %{rocm_version}
 Source0: https://github.com/ROCm/rocm-libraries/archive/refs/tags/%{rocm_version}.tar.gz
 Requires: hipsparse msgpack-cxx rocm-core rocm-smi-lib rocminfo roctracer rocr-runtime rocm-cmake boost
-Requires: py3-joblib py3-PyYAML py3-msgpack py3-packaging rocm-llvm python3
+Requires: py3-joblib py3-PyYAML py3-msgpack py3-packaging rocm-llvm python3 comgr
 
 %prep
 %setup -q -n rocm-libraries-%{realversion}
diff --git a/hwloc.spec b/hwloc.spec
index c759114b7e6..861c191d839 100644
--- a/hwloc.spec
+++ b/hwloc.spec
@@ -3,7 +3,8 @@
 Source: https://download.open-mpi.org/release/%{n}/v%{mainversion}/%{n}-%{realversion}.tar.bz2
 
 BuildRequires: autotools
-Requires: libpciaccess libxml2 numactl rocm-smi-lib
+Requires: libpciaccess libxml2 numactl
+%{!?without_rocm:Requires: rocm-smi-lib}
 %{!?without_cuda:Requires: cuda}
 
 
diff --git a/mpich.spec b/mpich.spec
index 29edc9556fb..ac75e771eb2 100644
--- a/mpich.spec
+++ b/mpich.spec
@@ -6,7 +6,7 @@
 Source: git+https://github.com/pmodels/mpich.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}.tgz
 BuildRequires: autotools
 %{!?without_cuda:Requires: cuda}
-%{!?without_rocm:Requires: rocm}
+%{!?without_rocm:Requires: hip}
 Requires: libfabric
 Requires: ucx
 Requires: hwloc
@@ -55,7 +55,7 @@ sed -e's/do_ucx=.*/do_ucx=no/' -i autogen.sh
 # After it's resolved, replace --without-hip with the following:
 
 # %if 0%{!?without_rocm:1}
-#   --with-hip=$ROCM_ROOT \
+#   --with-hip=$HIP_ROOT \
 #   --with-hip-sm=%(echo %{rocm_archs} | sed -e's/ \+/,/g') \
 # %else
 #   --without-hip \
diff --git a/rocm-rocprofiler-systems.spec b/rocm-rocprofiler-systems.spec
index d87065c0aa3..32021d7a66b 100644
--- a/rocm-rocprofiler-systems.spec
+++ b/rocm-rocprofiler-systems.spec
@@ -3,7 +3,7 @@
 
 Source0: git+https://github.com/akritkbehera/rocprofiler-systems.git?obj=release/rocm-rel-7.2/%{rocm_version}&export=%{n}&submodules=1&output=/%{n}.tar.gz
 Requires: rocm-core rocr-runtime cmake rocm-cmake rocprofiler roctracer hip libxml2
-Requires: libunwind sqlite rocm-rocprofiler-sdk amdsmi flex bison bz2lib
+Requires: libunwind sqlite rocm-rocprofiler-sdk amdsmi flex bison bz2lib comgr
 Provides: libbz2.so.1()(64bit)
 
 %prep
diff --git a/rocm.spec b/rocm.spec
index cda95c7f78b..aafa615d3fb 100644
--- a/rocm.spec
+++ b/rocm.spec
@@ -2,9 +2,9 @@
 ### RPM external rocm %{rocm_version_num}
 ## Core runtime  (build this first everything depends on it)
 ## LLVM-based compiler: amdclang
-## INITENV SET HIP_PATH %{i}
-## INITENV SET ROCM_PATH %{i}
-## INITENV SET HIP_CLANG_PATH $ROCM_ROOT/lib/llvm/bin
+## INITENV SET HIP_PATH $HIP_ROOT
+## INITENV SET ROCM_PATH $ROCM_LLVM_ROOT
+## INITENV SET HIP_CLANG_PATH $ROCM_LLVM_ROOT/lib/llvm/bin
 Requires: rocm-llvm
 ## HSA runtime (ROCr) + HIP runtime (CLR)
 Requires: rocr-runtime
@@ -49,45 +49,4 @@ Requires: comgr
 %prep
 %build
 %install
-
-%define comp_roots ${ROCM_LLVM_ROOT} ${ROCR_RUNTIME_ROOT} ${HIP_ROOT} ${ROCM_CORE_ROOT} ${ROCM_CMAKE_ROOT} ${ROCMINFO_ROOT} ${ROCDBGAPI_ROOT} ${ROCPROFILER_ROOT} ${ROCPROFILER_REGISTER_ROOT} ${ROCPROFILER_COMPUTE_ROOT} ${ROCM_ROCPROFILER_SDK_ROOT} ${ROCM_ROCPROFILER_SYSTEMS_ROOT} ${ROCTRACER_ROOT} ${AQLPROFILE_ROOT} ${ROCM_SMI_LIB_ROOT} ${AMDSMI_ROOT} ${RCCL_ROOT} ${ROCSHMEM_ROOT} ${HIPBLAS_COMMON_ROOT} ${HIPBLAS_ROOT} ${ROCBLAS_ROOT} ${HIPBLASLT_ROOT} ${HIPSOLVER_ROOT} ${ROCSOLVER_ROOT} ${HIPSPARSE_ROOT} ${ROCSPARSE_ROOT} ${HIPSPARSELT_ROOT} ${HIPFFT_ROOT} ${ROCFFT_ROOT} ${HIPRAND_ROOT} ${HIPCUB_ROOT} ${ROCPRIM_ROOT} ${ROCTHRUST_ROOT} ${MIOPEN_ROOT} ${ROCRAND_ROOT} ${COMGR_ROOT}
-
-# Define the target install area
-mkdir -p %{i}
-INSTALL_TARGET="%{i}"
-
-for root in %{comp_roots}; do
-    if [ -d "$root" ]; then
-        echo "Merging $root into $INSTALL_TARGET..."
-        # Using -u (update) prevents overwriting newer files with older ones
-        # from different component roots
-        rsync -au --links "${root}/" "$INSTALL_TARGET/"
-    else
-        echo "ERROR: Component root not found: $root" >&2
-        exit 1
-    fi
-done
-rsync -a --ignore-existing "%{i}/lib64/" "%{i}/lib/"
-rm %{i}/lib/llvm/bin/*.cfg
-rm -fr '%{i}/lib64/'
-
-ln -r -s -f %{i}/lib %{i}/lib64
-ln -r -s -f %{i}/llvm/bin/amdclang     %{i}/bin/
-ln -r -s -f %{i}/llvm/bin/amdclang++   %{i}/bin/
-ln -r -s -f %{i}/llvm/bin/amdclang-cl  %{i}/bin/
-ln -r -s -f %{i}/llvm/bin/amdclang-cpp %{i}/bin/
-ln -r -s -f %{i}/llvm/bin/amdflang     %{i}/bin/
-ln -r -s -f %{i}/llvm/bin/amdlld       %{i}/bin/
-
-echo -e "--gcc-toolchain=$GCC_ROOT
---target=$(gcc -dumpmachine)
--m64
--L$GCC_ROOT/lib64
---rocm-path=%{i}
---rocm-device-lib-path=%{i}/amdgcn/bitcode" > %{i}/lib/llvm/bin/clang++.cfg
-ln -r -s -f %{i}/lib/llvm/bin/clang++.cfg %{i}/lib/llvm/bin/clang.cfg
-
 %post
-%if 0%{!?use_system_gcc:1}
-%{relocateConfig}/lib/llvm/bin/clang++.cfg
-%endif
diff --git a/scram-tools.file/tools/comgr/comgr.xml b/scram-tools.file/tools/comgr/comgr.xml
new file mode 100644
index 00000000000..fd706720843
--- /dev/null
+++ b/scram-tools.file/tools/comgr/comgr.xml
@@ -0,0 +1,6 @@
+<tool revision="1">
+  <client>
+    <environment name="LIBDIR"    default="$TOOL_BASE/lib"/>
+    <environment name="INCLUDE"   default="$TOOL_BASE/include"/>
+  </client>
+</tool>
diff --git a/scram-tools.file/tools/hip/hip.xml b/scram-tools.file/tools/hip/hip.xml
new file mode 100644
index 00000000000..cb4a3b5e2d6
--- /dev/null
+++ b/scram-tools.file/tools/hip/hip.xml
@@ -0,0 +1,18 @@
+<tool revision="1">
+<lib name="amdhip64"/>
+<client>
+  <environment name="HIPCC"        default="$TOOL_BASE/bin/hipcc"/>
+  <environment name="BINDIR"       default="$TOOL_BASE/bin"/>
+  <environment name="LIBDIR"       default="$TOOL_BASE/lib"/>
+  <environment name="INCLUDE"      default="$TOOL_BASE/include"/>
+  <!-- use -isystem instead of -I to silence warnings in the HIP/ROCm headers -->
+  <flags SYSTEM_INCLUDE="1"/>
+  <runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path" join="1"/>
+  <runtime name="PATH" value="$TOOL_BASE/bin" type="path"/>
+  <runtime name="HIP_PATH" value="$TOOL_BASE" type="path"/>
+</client>
+<use name="rocm-llvm"/>
+<use name="comgr"/>
+<use name="rocr-runtime"/>
+<use name="rocprofiler-register"/>
+</tool>
diff --git a/scram-tools.file/tools/hiprand/hiprand.xml b/scram-tools.file/tools/hiprand/hiprand.xml
new file mode 100644
index 00000000000..9fc78b90dee
--- /dev/null
+++ b/scram-tools.file/tools/hiprand/hiprand.xml
@@ -0,0 +1,7 @@
+<tool revision="1">
+<lib name="hiprand"/>
+<client>
+  <environment name="LIBDIR" default="$TOOL_BASE/lib"/>
+  <environment name="INCLUDE"   default="$TOOL_BASE/include"/>
+</client>
+</tool>
diff --git a/scram-tools.file/tools/rccl/rccl.xml b/scram-tools.file/tools/rccl/rccl.xml
new file mode 100644
index 00000000000..0062d9bbb5d
--- /dev/null
+++ b/scram-tools.file/tools/rccl/rccl.xml
@@ -0,0 +1,9 @@
+<tool revision="1">
+  <info url="https://rocm.docs.amd.com/projects/rccl/en/docs-@TOOL_VERSION@/"/>
+  <lib name="rccl"/>
+  <client>
+    <environment name="BINDIR"    default="$TOOL_BASE/bin"/>
+    <environment name="LIBDIR"    default="$TOOL_BASE/lib"/>
+    <environment name="INCLUDE"   default="$TOOL_BASE/include"/>
+  </client>
+</tool>
diff --git a/scram-tools.file/tools/rocm-core/rocm-core.xml b/scram-tools.file/tools/rocm-core/rocm-core.xml
new file mode 100644
index 00000000000..9173d986576
--- /dev/null
+++ b/scram-tools.file/tools/rocm-core/rocm-core.xml
@@ -0,0 +1,7 @@
+<tool revision="1">
+  <client>
+    <environment name="BINDIR"    default="$TOOL_BASE/bin"/>
+    <environment name="LIBDIR"    default="$TOOL_BASE/lib64"/>
+    <environment name="INCLUDE"   default="$TOOL_BASE/include"/>
+  </client>
+</tool>
diff --git a/scram-tools.file/tools/rocm-llvm/rocm-llvm.xml b/scram-tools.file/tools/rocm-llvm/rocm-llvm.xml
new file mode 100644
index 00000000000..75126c85334
--- /dev/null
+++ b/scram-tools.file/tools/rocm-llvm/rocm-llvm.xml
@@ -0,0 +1,9 @@
+<tool revision="1">
+  <client>
+    <environment name="BINDIR"    default="$TOOL_BASE/bin"/>
+    <environment name="LIBDIR"    default="$TOOL_BASE/lib"/>
+    <environment name="INCLUDE"   default="$TOOL_BASE/include"/>
+    <environment name="ROCM_PATH" default="$TOOL_BASE"/>
+  </client>
+  <runtime name="HIP_CLANG_PATH" value="$TOOL_BASE/lib/llvm/bin"/>
+</tool>
diff --git a/scram-tools.file/tools/rocm-rocprofiler-sdk/rocm-rocprofiler-sdk.xml b/scram-tools.file/tools/rocm-rocprofiler-sdk/rocm-rocprofiler-sdk.xml
new file mode 100644
index 00000000000..9e0369f9ea7
--- /dev/null
+++ b/scram-tools.file/tools/rocm-rocprofiler-sdk/rocm-rocprofiler-sdk.xml
@@ -0,0 +1,9 @@
+<tool revision="1">
+  <info url="https://rocm.docs.amd.com/projects/rocprofiler-sdk/en/latest/index.html"/>
+  <lib name="rocprofiler-sdk-roctx"/>
+  <client>
+    <environment name="BINDIR"    default="$TOOL_BASE/bin"/>
+    <environment name="LIBDIR"    default="$TOOL_BASE/lib"/>
+    <environment name="INCLUDE"   default="$TOOL_BASE/include"/>
+  </client>
+</tool>
diff --git a/scram-tools.file/tools/rocm-smi-lib/rocm-smi-lib.xml b/scram-tools.file/tools/rocm-smi-lib/rocm-smi-lib.xml
new file mode 100644
index 00000000000..490ce247109
--- /dev/null
+++ b/scram-tools.file/tools/rocm-smi-lib/rocm-smi-lib.xml
@@ -0,0 +1,8 @@
+<tool revision="1">
+  <lib name="rocm_smi64"/>
+  <client>
+    <environment name="BINDIR"    default="$TOOL_BASE/bin"/>
+    <environment name="LIBDIR"    default="$TOOL_BASE/lib"/>
+    <environment name="INCLUDE"   default="$TOOL_BASE/include"/>
+  </client>
+</tool>
diff --git a/scram-tools.file/tools/rocm/rocm-rocprofiler-sdk.xml b/scram-tools.file/tools/rocm/rocm-rocprofiler-sdk.xml
deleted file mode 100644
index 195ac52bd59..00000000000
--- a/scram-tools.file/tools/rocm/rocm-rocprofiler-sdk.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<tool revision="2">
-  <info url="https://rocm.docs.amd.com/projects/rocprofiler-sdk/en/latest/index.html"/>
-  <use name="rocm"/>
-  <lib name="rocprofiler-sdk-roctx"/>
-</tool>
diff --git a/scram-tools.file/tools/rocm/rocm.xml b/scram-tools.file/tools/rocm/rocm.xml
index 42d8c653485..84cfab63bb2 100644
--- a/scram-tools.file/tools/rocm/rocm.xml
+++ b/scram-tools.file/tools/rocm/rocm.xml
@@ -3,15 +3,8 @@
   <lib name="amdhip64"/>
   <lib name="hsa-runtime64"/>
   <lib name="rocm_smi64"/>
-  <client>
-    <environment name="HIPCC"     default="$TOOL_BASE/bin/hipcc"/>
-    <environment name="BINDIR"    default="$TOOL_BASE/bin"/>
-    <environment name="LIBDIR"    default="$TOOL_BASE/lib"/>
-    <environment name="INCLUDE"   default="$TOOL_BASE/include"/>
-    <environment name="HIP_INCLUDE_PATH" default="$TOOL_BASE/lib/llvm/bin"/>
-  </client>
   <flags CPPDEFINES="__HIP_PLATFORM_HCC__ __HIP_PLATFORM_AMD__"/>
-  <flags ROCM_FLAGS="--rocm-path=$TOOL_BASE"/>
+
   <flags ROCM_FLAGS="@ROCM_FLAGS@"/>
   <flags ROCM_FLAGS="-fgpu-rdc"/>
   <flags ROCM_FLAGS="-Wno-pass-failed"/>
@@ -21,10 +14,18 @@
   <flags ROCM_HOST_CXXFLAGS="-march=%{min_microarch_name}"/>
 %endif
 %endif
-  <!-- use -isystem instead of -I to silence warnings in the HIP/ROCm headers -->
-  <flags SYSTEM_INCLUDE="1"/>
-  <runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path" join="1"/>
-  <runtime name="PATH" value="$TOOL_BASE/bin" type="path"/>
   <runtime name="HSA_XNACK" value="1"/>
   <use name="fmt"/>
+  <use name="hip"/>
+  <use name="hiprand"/>
+  <use name="rocm-core"/>
+  <use name="rocm-llvm"/>
+  <use name="rocm-rocprofiler-sdk"/>
+  <use name="rocm-smi-lib"/>
+  <use name="rocr-runtime"/>
+  <use name="rocrand"/>
+  <use name="rccl"/>
+  <use name="rocprofiler-register"/>
+  <use name="rocthrust"/>
+  <use name="rocprim"/>
 </tool>
diff --git a/scram-tools.file/tools/rocprim/rocprim.xml b/scram-tools.file/tools/rocprim/rocprim.xml
new file mode 100644
index 00000000000..fd706720843
--- /dev/null
+++ b/scram-tools.file/tools/rocprim/rocprim.xml
@@ -0,0 +1,6 @@
+<tool revision="1">
+  <client>
+    <environment name="LIBDIR"    default="$TOOL_BASE/lib"/>
+    <environment name="INCLUDE"   default="$TOOL_BASE/include"/>
+  </client>
+</tool>
diff --git a/scram-tools.file/tools/rocprofiler-register/rocprofiler-register.xml b/scram-tools.file/tools/rocprofiler-register/rocprofiler-register.xml
new file mode 100644
index 00000000000..4eac94a77e1
--- /dev/null
+++ b/scram-tools.file/tools/rocprofiler-register/rocprofiler-register.xml
@@ -0,0 +1,7 @@
+<tool revision="1">
+  <client>
+    <environment name="BINDIR"    default="$TOOL_BASE/bin"/>
+    <environment name="LIBDIR"    default="$TOOL_BASE/lib"/>
+    <environment name="INCLUDE"   default="$TOOL_BASE/include"/>
+  </client>
+</tool>
diff --git a/scram-tools.file/tools/rocr-runtime/rocr-runtime.xml b/scram-tools.file/tools/rocr-runtime/rocr-runtime.xml
new file mode 100644
index 00000000000..03b38bfb235
--- /dev/null
+++ b/scram-tools.file/tools/rocr-runtime/rocr-runtime.xml
@@ -0,0 +1,9 @@
+<tool revision="1">
+<lib name="hsa-runtime64"/>
+<client>
+  <environment name="LIBDIR" default="$TOOL_BASE/lib64"/>
+  <environment name="INCLUDE"   default="$TOOL_BASE/include"/>
+</client>
+<use name="rocm-llvm"/>
+<use name="numactl"/>
+</tool>
diff --git a/scram-tools.file/tools/rocrand/rocrand.xml b/scram-tools.file/tools/rocrand/rocrand.xml
new file mode 100644
index 00000000000..cc9aada9dda
--- /dev/null
+++ b/scram-tools.file/tools/rocrand/rocrand.xml
@@ -0,0 +1,7 @@
+<tool revision="1">
+<lib name="rocrand"/>
+<client>
+  <environment name="LIBDIR" default="$TOOL_BASE/lib"/>
+  <environment name="INCLUDE"   default="$TOOL_BASE/include"/>
+</client>
+</tool>
diff --git a/scram-tools.file/tools/rocthrust/rocthrust.xml b/scram-tools.file/tools/rocthrust/rocthrust.xml
new file mode 100644
index 00000000000..fd706720843
--- /dev/null
+++ b/scram-tools.file/tools/rocthrust/rocthrust.xml
@@ -0,0 +1,6 @@
+<tool revision="1">
+  <client>
+    <environment name="LIBDIR"    default="$TOOL_BASE/lib"/>
+    <environment name="INCLUDE"   default="$TOOL_BASE/include"/>
+  </client>
+</tool>