diff --git a/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h b/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h
index 6bccc00b45..4cbfb03ed6 100644
--- a/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h
+++ b/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil.h
@@ -83,12 +83,12 @@ static const TargetMapping AMDILTargetMapping_0_8[] = {
   { "SI", "Oland",      "oland",   amd::GPU_Library_SI,        SI_OLAND_M_A0,           F_SI_BASE, true, true, FAMILY_SI },
   { "CI", "Bonaire",    "bonaire", amd::GPU_Library_CI,        CI_BONAIRE_M_A0,         F_SI_BASE, true, false, FAMILY_CI },
   { "SI", "Hainan",     "hainan",  amd::GPU_Library_SI,        SI_HAINAN_V_A0,          F_SI_BASE, true, true, FAMILY_SI },
+  { "CZ", "Carrizo",    "peacock", amd::GPU_Library_CI,        CARRIZO_A0,              F_SI_BASE, true,  true, FAMILY_CZ },
 
   UnknownTarget,
   UnknownTarget,
   UnknownTarget,
   UnknownTarget,
-  UnknownTarget,
   { "TN", "Devastator", "trinity", amd::GPU_Library_Evergreen, TN_DEVASTATOR_W_A0,       F_NI_EXT, true, false, FAMILY_TN },
   { "TN", "Devastator", "trinity", amd::GPU_Library_Evergreen, TN_DEVASTATOR_W_A1,       F_NI_EXT, true, false, FAMILY_TN },
   { "TN", "Scrapper",   "trinity", amd::GPU_Library_Evergreen, TN_SCRAPPER_LV_A0,        F_NI_EXT, true, false, FAMILY_TN },
diff --git a/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil64.h b/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil64.h
index b44e5210c0..a84ddf14b2 100644
--- a/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil64.h
+++ b/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_amdil64.h
@@ -35,12 +35,12 @@ static const TargetMapping AMDIL64TargetMapping_0_8[] = {
   { "SI", "Oland",     "oland",     amd::GPU64_Library_SI, SI_OLAND_M_A0,      F_SI_64BIT_PTR, true,  true,  FAMILY_SI },
   { "CI", "Bonaire",   "bonaire",   amd::GPU64_Library_CI, CI_BONAIRE_M_A0,    F_SI_64BIT_PTR, true,  false, FAMILY_CI },
   { "SI", "Hainan",    "hainan",    amd::GPU64_Library_SI, SI_HAINAN_V_A0,     F_SI_64BIT_PTR, true,  true,  FAMILY_SI },
+  { "CZ", "Carrizo",   "peacock",   amd::GPU64_Library_CI, CARRIZO_A0,         F_SI_64BIT_PTR, true,  true,  FAMILY_CZ },
 
   UnknownTarget,
   UnknownTarget,
   UnknownTarget,
   UnknownTarget,
-  UnknownTarget,
 
   { "VI", "Iceland",    "iceland",  amd::GPU64_Library_CI, VI_ICELAND_M_A0,    F_SI_64BIT_PTR, true,  true,  FAMILY_VI },
   { "VI", "Tonga",      "tonga",    amd::GPU64_Library_CI, VI_TONGA_P_A0,      F_SI_64BIT_PTR, true,  true,  FAMILY_VI },
diff --git a/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h b/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h
index db47433c36..6e91be5d52 100644
--- a/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h
+++ b/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail.h
@@ -21,12 +21,12 @@ static const TargetMapping HSAILTargetMapping_0_8[] = {
   { "CI", "Hawaii",  "generic", amd::GPU_Library_HSAIL, CI_HAWAII_P_A0,  0, true, true,  FAMILY_CI },
   { "VI", "Iceland", "generic", amd::GPU_Library_HSAIL, VI_ICELAND_M_A0, 0, true, true,  FAMILY_VI },
   { "VI", "Tonga",   "generic", amd::GPU_Library_HSAIL, VI_TONGA_P_A0,   0, true, true,  FAMILY_VI },
+  { "CZ", "Carrizo", "generic", amd::GPU_Library_HSAIL, CARRIZO_A0,      0, true, true,  FAMILY_CZ },
 
   UnknownTarget,
   UnknownTarget,
   UnknownTarget,
   UnknownTarget,
-  UnknownTarget,
   InvalidTarget
 };
 
diff --git a/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h b/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h
index 88648cf77c..dcbcb54c7a 100644
--- a/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h
+++ b/projects/clr/rocclr/compiler/lib/utils/v0_8/target_mappings_hsail64.h
@@ -20,12 +20,12 @@ static const TargetMapping HSAIL64TargetMapping_0_8[] = {
   { "CI", "Hawaii",  "generic", amd::GPU_Library_HSAIL, CI_HAWAII_P_A0,  0, true, true,  FAMILY_CI },
   { "VI", "Iceland", "generic", amd::GPU_Library_HSAIL, VI_ICELAND_M_A0, 0, true, true,  FAMILY_VI },
   { "VI", "Tonga",   "generic", amd::GPU_Library_HSAIL, VI_TONGA_P_A0,   0, true, true,  FAMILY_VI },
+  { "CZ", "Carrizo", "generic", amd::GPU_Library_HSAIL, CARRIZO_A0,      0, true, true,  FAMILY_CZ },
 
   UnknownTarget,
   UnknownTarget,
   UnknownTarget,
   UnknownTarget,
-  UnknownTarget,
   InvalidTarget
 };