diff --git a/hip-config.cmake.in b/hip-config.cmake.in
index 914d71be17..21dd9c156e 100755
--- a/hip-config.cmake.in
+++ b/hip-config.cmake.in
@@ -123,8 +123,10 @@ if(HIP_COMPILER STREQUAL "clang")
   if(NOT WIN32)
     find_dependency(AMDDeviceLibs)
   endif()
-  set(AMDGPU_TARGETS "gfx900;gfx906;gfx908" CACHE STRING "AMD GPU targets to compile for")
-  set(GPU_TARGETS "${AMDGPU_TARGETS}" CACHE STRING "GPU targets to compile for")
+  set(GPU_DEFAULT_TARGETS "gfx900;gfx906;gfx908;gfx90a;gfx1030")
+  set(GPU_SUPPORTED_TARGETS "gfx701;gfx801;gfx802;gfx803;gfx900;gfx906;gfx908;gfx90a;gfx1010;gfx1011;gfx1012;gfx1030;gfx1031")
+  set(GPU_TARGETS "${GPU_DEFAULT_TARGETS}" CACHE STRING "GPU targets to compile for")
+  set_property(CACHE GPU_TARGETS PROPERTY STRINGS ${GPU_SUPPORTED_TARGETS})
 endif()
 
 if(NOT WIN32)