diff --git a/rocclr/compiler/lib/utils/v0_8/target_mappings.h b/rocclr/compiler/lib/utils/v0_8/target_mappings.h
index fdff09bad9..db0ff91d86 100644
--- a/rocclr/compiler/lib/utils/v0_8/target_mappings.h
+++ b/rocclr/compiler/lib/utils/v0_8/target_mappings.h
@@ -192,7 +192,7 @@ static const char* calTargetMapping[] = {
       "Spectre", "Spooky", "Kalindi",
       "Hainan", "Hawaii",
       "Iceland", "Tonga", "Mullins", "Fiji",
-      "Carrizo", "", "",
+      "Carrizo", "Horse", "Goose",
       "",  "Dummy",
     };
 
diff --git a/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h b/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h
index b0579fac44..c754f9ef20 100644
--- a/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h
+++ b/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h
@@ -87,8 +87,8 @@ static const TargetMapping AMDILTargetMapping_0_8[] = {
 
   UnknownTarget,
   UnknownTarget,
-  UnknownTarget,
-  UnknownTarget,
+  { "VI", "Horse",     "horse",   amd::GPU_Library_CI,        VI_ELLESMERE_P_A0,       F_SI_BASE, true,  true, FAMILY_VI },
+  { "VI", "Goose",     "goose",   amd::GPU_Library_CI,        VI_BAFFIN_M_A0,          F_SI_BASE, true,  true, FAMILY_VI },
   UnknownTarget,
   { "CZ", "Dummy",      "dummy",   amd::GPU_Library_CI,        STONEY_A0,               F_SI_BASE, true, true, FAMILY_CZ },
   { "CZ", "Carrizo",    "carrizo", amd::GPU_Library_CI,        CARRIZO_A0,              F_SI_BASE, true,  true, FAMILY_CZ },
diff --git a/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil64.h b/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil64.h
index c2be995f1c..5a67169a80 100644
--- a/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil64.h
+++ b/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil64.h
@@ -38,8 +38,8 @@ static const TargetMapping AMDIL64TargetMapping_0_8[] = {
 
   UnknownTarget,
   UnknownTarget,
-  UnknownTarget,
-  UnknownTarget,
+  { "VI", "Horse",     "horse",     amd::GPU64_Library_CI, VI_ELLESMERE_P_A0,  F_SI_64BIT_PTR, true,  true,  FAMILY_VI },
+  { "VI", "Goose",     "goose",     amd::GPU64_Library_CI, VI_BAFFIN_M_A0,     F_SI_64BIT_PTR, true,  true,  FAMILY_VI },
   UnknownTarget,
   { "CZ", "Dummy",     "dummy",     amd::GPU64_Library_CI, STONEY_A0,          F_SI_64BIT_PTR, true,  true,  FAMILY_CZ },
   { "CZ", "Carrizo",   "carrizo",   amd::GPU64_Library_CI, CARRIZO_A0,         F_SI_64BIT_PTR, true,  true,  FAMILY_CZ },
diff --git a/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h b/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h
index 9b0b18d976..6ecf089052 100644
--- a/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h
+++ b/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h
@@ -25,8 +25,8 @@ static const TargetMapping HSAILTargetMapping_0_8[] = {
 
   UnknownTarget,
   UnknownTarget,
-  UnknownTarget,
-  UnknownTarget,
+  { "VI", "Horse",    "generic", amd::GPU_Library_HSAIL, VI_ELLESMERE_P_A0, 0, true, true,  FAMILY_VI },
+  { "VI", "Goose",    "generic", amd::GPU_Library_HSAIL, VI_BAFFIN_M_A0, 0, true, true,  FAMILY_VI },
   UnknownTarget,
   { "CZ", "Dummy",   "generic", amd::GPU_Library_HSAIL, STONEY_A0, 0,       true, true,  FAMILY_CZ },
   { "CZ", "Carrizo", "generic", amd::GPU_Library_HSAIL, CARRIZO_A0,      0, true, true,  FAMILY_CZ },
diff --git a/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h b/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h
index 9612b156e4..4ecbc938f2 100644
--- a/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h
+++ b/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h
@@ -24,8 +24,8 @@ static const TargetMapping HSAIL64TargetMapping_0_8[] = {
 
   UnknownTarget,
   UnknownTarget,
-  UnknownTarget,
-  UnknownTarget,
+  { "VI", "Horse",    "generic", amd::GPU_Library_HSAIL, VI_ELLESMERE_P_A0, 0, true, true,  FAMILY_VI },
+  { "VI", "Goose",    "generic", amd::GPU_Library_HSAIL, VI_BAFFIN_M_A0, 0, true, true,  FAMILY_VI },
   UnknownTarget,
   { "CZ", "Dummy",   "generic", amd::GPU_Library_HSAIL, STONEY_A0, 0,       true, true, FAMILY_CZ },
   { "CZ", "Carrizo", "generic", amd::GPU_Library_HSAIL, CARRIZO_A0,      0, true, true,  FAMILY_CZ },
diff --git a/rocclr/runtime/device/gpu/gpudefs.hpp b/rocclr/runtime/device/gpu/gpudefs.hpp
index b866b7212c..6b4f312dc1 100644
--- a/rocclr/runtime/device/gpu/gpudefs.hpp
+++ b/rocclr/runtime/device/gpu/gpudefs.hpp
@@ -123,8 +123,8 @@ static const AMDDeviceInfo DeviceInfo[] = {
 /* CAL_TARGET_MULLINS */    { ED_ATI_CAL_MACHINE_GODAVARI_ISA,  "Mullins",      "mullins",      4, 16, 1, 256, 64 * Ki, 32, 702 },
 /* CAL_TARGET_FIJI */       { ED_ATI_CAL_MACHINE_FIJI_ISA,      "Fiji",         "fiji",         4, 16, 1, 256, 64 * Ki, 32, 800 },
 /* CAL_TARGET_CARRIZO */    { ED_ATI_CAL_MACHINE_CARRIZO_ISA,   "Carrizo" ,     "carrizo",      4, 16, 1, 256, 64 * Ki, 32, 800 },
-/* CAL_TARGET_ELLESMERE */  { ED_ATI_CAL_MACHINE_ELLESMERE_ISA, "",  "",    4, 16, 1, 256, 64 * Ki, 32, 800 },
-/* CAL_TARGET_BAFFIN */     { ED_ATI_CAL_MACHINE_BAFFIN_ISA,    "",     "",    4, 16, 1, 256, 64 * Ki, 32, 800 },
+/* CAL_TARGET_ELLESMERE */  { ED_ATI_CAL_MACHINE_ELLESMERE_ISA, "Horse", "horse",    4, 16, 1, 256, 64 * Ki, 32, 800 },
+/* CAL_TARGET_BAFFIN */     { ED_ATI_CAL_MACHINE_BAFFIN_ISA,    "Goose",    "goose",    4, 16, 1, 256, 64 * Ki, 32, 800 },
 /* CAL_TARGET_GREENLAND */  { ED_ATI_CAL_MACHINE_GREENLAND_ISA, "",  "",   4, 16, 1, 256, 64 * Ki, 32, 900 },
 /* CAL_TARGET_STONEY */     { ED_ATI_CAL_MACHINE_STONEY_ISA,    "Dummy",                   "dummy",     4, 16, 1, 256, 64 * Ki, 32, 800 },
 };