diff --git a/bin/aomp_common_vars b/bin/aomp_common_vars
index 1d4c68e68..9a63458bd 100644
--- a/bin/aomp_common_vars
+++ b/bin/aomp_common_vars
@@ -160,13 +160,13 @@ AOMP_LIBDEVICE_REPO_NAME=${AOMP_LIBDEVICE_REPO_NAME:-rocm-device-libs}
 AOMP_LIBDEVICE_COMPONENT_NAME=${AOMP_LIBDEVICE_COMPONENT_NAME:-rocdl}
 AOMP_LIBDEVICE_REPO_BRANCH=${AOMP_LIBDEVICE_REPO_BRANCH:-amd-stg-open}
 DEVICELIBS_ROOT=${DEVICELIBS_ROOT:-$AOMP_REPOS/$AOMP_LIBDEVICE_REPO_NAME}
-#AOMP_LIBDEVICE_REPO_SHA=${AOMP_LIBDEVICE_REPO_SHA:-1f05cba}
+AOMP_LIBDEVICE_REPO_SHA=${AOMP_LIBDEVICE_REPO_SHA:-1a66b15}
 AOMP_COMGR_REPO_NAME=${AOMP_COMGR_REPO_NAME:-rocm-compilersupport}
 AOMP_COMGR_REPO_BRANCH=${AOMP_COMGR_REPO_BRANCH:-amd-stg-open}
-#AOMP_COMGR_REPO_SHA=${AOMP_COMGR_REPO_SHA:-7cad97c}
+AOMP_COMGR_REPO_SHA=${AOMP_COMGR_REPO_SHA:-cf76e40}
 AOMP_RINFO_REPO_NAME=${AOMP_RINFO_REPO_NAME:-rocminfo}
 AOMP_RINFO_REPO_BRANCH=${AOMP_RINFO_REPO_BRANCH:-master}
-#AOMP_RINFO_REPO_SHA=${AOMP_RINFO_REPO_SHA:-5d6be5b}
+AOMP_RINFO_REPO_SHA=${AOMP_RINFO_REPO_SHA:-5d6be5b}
 
 # These are repos we will use when we switch to HIP VDI
 AOMP_VDI_REPO_NAME=${AOMP_VDI_REPO_NAME:-vdi}