diff --git a/tools/rocm-build/ROCm.mk b/tools/rocm-build/ROCm.mk
index 1dde4638f..bc1e18ddc 100644
--- a/tools/rocm-build/ROCm.mk
+++ b/tools/rocm-build/ROCm.mk
@@ -114,7 +114,7 @@ $(call adddep,roctracer,${ASAN_DEP} rocr hip_on_rocclr)
 
 
 # rocm-dev points to all possible last finish components of Stage1 build.
-rocm-dev-components :=amd_smi_lib aqlprofile aqlprofiletest comgr dbgapi devicelibs hip_on_rocclr hipcc hipify_clang \
+rocm-dev-components :=amd_smi_lib aqlprofile comgr dbgapi devicelibs hip_on_rocclr hipcc hipify_clang \
 	lightning rocprofiler-compute opencl_on_rocclr openmp_extras rocm_bandwidth_test rocm_smi_lib \
 	rocm-cmake rocm-core rocm-gdb rocminfo rocprofiler-register rocprofiler-sdk rocprofiler-systems \
 	rocprofiler rocr rocr_debug_agent rocrsamples roctracer
diff --git a/tools/rocm-build/envsetup.sh b/tools/rocm-build/envsetup.sh
index fff230b27..d67d9f574 100755
--- a/tools/rocm-build/envsetup.sh
+++ b/tools/rocm-build/envsetup.sh
@@ -217,7 +217,7 @@ export RCCL_ROOT=$WORK_ROOT/rccl
 export ROCM_DBGAPI_ROOT=$WORK_ROOT/ROCdbgapi
 export ROCM_GDB_ROOT=$WORK_ROOT/ROCgdb
 # export ROCclr_ROOT=$WORK_ROOT/vdi
-export HIP_ON_ROCclr_ROOT=$WORK_ROOT/HIP
+export HIP_ON_ROCclr_ROOT=$WORK_ROOT/hip
 export HIPAMD_ROOT=$WORK_ROOT/hipamd
 export HIP_CATCH_TESTS_ROOT=$WORK_ROOT/hip-tests
 # export OPENCL_ON_ROCclr_ROOT=$WORK_ROOT/opencl-on-vdi