diff --git a/opencl.xml b/opencl.xml
index c53f8d7..623dbfe 100644
--- a/opencl.xml
+++ b/opencl.xml
@@ -3,14 +3,14 @@
   <remote name="RadeonOpenCompute" fetch="https://github.com/RadeonOpenCompute/"/>
   <remote name="KhronosGroup" fetch="https://github.com/KhronosGroup/"/>
 
-  <default remote="RadeonOpenCompute" revision="master" sync-c="true" sync-j="4"/>
+  <default remote="RadeonOpenCompute" revision="refs/tags/roc-2.9.0" sync-c="true" sync-j="4"/>
 
   <project path="opencl" name="ROCm-OpenCL-Runtime"/>
   <project path="opencl/compiler/driver" name="ROCm-OpenCL-Driver"/>
-  <project path="opencl/compiler/llvm" name="llvm" revision="amd-common"/>
-  <project path="opencl/compiler/llvm/tools/clang" name="clang" revision="amd-common"/>
-  <project path="opencl/compiler/llvm/tools/lld" name="lld" revision="amd-common"/>
-  <project path="opencl/library/amdgcn" name="ROCm-Device-Libs"/>
+  <project path="opencl/compiler/llvm" name="llvm" revision="refs/tags/roc-ocl-2.9.0"/>
+  <project path="opencl/compiler/llvm/tools/clang" name="clang"/>
+  <project path="opencl/compiler/llvm/tools/lld" name="lld" revision="refs/tags/roc-ocl-2.9.0"/>
+  <project path="opencl/library/amdgcn" name="ROCm-Device-Libs" revision="refs/tags/roc-ocl-2.9.0"/>
 
-  <project path="opencl/api/opencl/khronos/icd" name="OpenCL-ICD-Loader" remote="KhronosGroup"/>
+  <project path="opencl/api/opencl/khronos/icd" name="OpenCL-ICD-Loader" remote="KhronosGroup" revision="6c03f8b58fafd9dd693eaac826749a5cfad515f8"/>
 </manifest>