diff --git a/extra/rocm/rocm_clone.sh b/extra/rocm/rocm_clone.sh
index 65636480a7..bff5e938b7 100755
--- a/extra/rocm/rocm_clone.sh
+++ b/extra/rocm/rocm_clone.sh
@@ -4,7 +4,8 @@ cd src
 git clone https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface.git -b rocm-5.5.0
 git clone https://github.com/RadeonOpenCompute/ROCm-Device-Libs.git -b rocm-5.5.0
 git clone https://github.com/RadeonOpenCompute/llvm-project.git -b rocm-5.5.0 --depth 1
-git clone https://github.com/RadeonOpenCompute/ROCm-CompilerSupport.git -b rocm-5.5.0
 git clone https://github.com/RadeonOpenCompute/ROCR-Runtime.git -b rocm-5.5.0
+git clone https://github.com/ROCm-Developer-Tools/ROCclr.git -b rocm-5.5.0
+git clone https://github.com/RadeonOpenCompute/ROCm-CompilerSupport.git -b rocm-5.5.0
 git clone https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime.git -b rocm-5.5.0
 cd ../
\ No newline at end of file
diff --git a/extra/rocm/rocm_from_scratch.sh b/extra/rocm/rocm_from_scratch.sh
index f48546e984..2be75a351c 100755
--- a/extra/rocm/rocm_from_scratch.sh
+++ b/extra/rocm/rocm_from_scratch.sh
@@ -13,6 +13,20 @@ then
   cd ../
 fi
 
+
+# build custom LLVM
+if [ ! -f llvm-project/bin/clang ]
+then
+  mkdir -p llvm-project
+  cd llvm-project
+  cmake -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS="llvm;clang;lld" -DLLVM_TARGETS_TO_BUILD="AMDGPU;X86" ../../src/llvm-project/llvm
+  make -j32
+  cd ..
+fi
+
+# use custom LLVM
+export PATH="$PWD/llvm-project/bin:$PATH"
+
 # ROCm-Device-Libs
 if [ ! -f debs/rocm-device-libs_1.0.0.99999-local_amd64.deb ]
 then
@@ -21,22 +35,35 @@ then
   cmake ../../src/ROCm-Device-Libs
   make -j32 package
   cp rocm-device-libs_1.0.0.99999-local_amd64.deb ../debs
+  cd ../
 fi
 
-# build custom LLVM
-mkdir -p llvm-project
-cd llvm-project
-cmake -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS="llvm;clang;lld" -DLLVM_TARGETS_TO_BUILD="AMDGPU;X86" ../../src/llvm-project/llvm
-make -j32
+# ROCR-Runtime
+if [ ! -f debs/hsa-rocr_1.8.0-local_amd64.deb ]
+then
+  mkdir -p ROCR-Runtime
+  cd ROCR-Runtime
+  cmake ../../src/ROCR-Runtime/src
+  make -j32 package
+  cp hsa-rocr_1.8.0-local_amd64.deb ../debs
+  cp hsa-rocr-dev_1.8.0-local_amd64.deb ../debs
+  cd ../
+fi
 
-# ROCm-CompilerSupport
+# ROCm-OpenCL-Runtime (needs ROCclr)
+if [ ! -f debs/rocm-opencl_2.0.0-local_amd64.deb ]
+then
+  mkdir -p ROCm-OpenCL-Runtime
+  cd ROCm-OpenCL-Runtime
+  cmake ../../src/ROCm-OpenCL-Runtime
+  make -j32 package
+  cp rocm-opencl_2.0.0-local_amd64.deb ../debs
+  cp rocm-opencl-dev_2.0.0-local_amd64.deb ../debs
+  cp rocm-ocl-icd_2.0.0-local_amd64.deb ../debs
+fi
+
+# ROCm-CompilerSupport (broken)
 #mkdir -p ROCm-CompilerSupport
 #cd ROCm-CompilerSupport
 #cmake ../../src/ROCm-CompilerSupport/lib/comgr
-#make -j32 package
-
-# ROCR-Runtime
-#mkdir -p ROCR-Runtime
-#cd ROCR-Runtime
-#cmake ../../src/ROCR-Runtime/src
-#make -j32 package
+#make -j32
\ No newline at end of file