diff --git a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp
index 26a65db582..f944528e58 100644
--- a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp
+++ b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp
@@ -665,7 +665,7 @@ bool Device::create(Pal::IDevice* device) {
   uint subtarget = isXNACKSupported;
 
   // Update HW info for the device
-  if ((GPU_ENABLE_PAL == 1) && (properties().revision <= Pal::AsicRevision::Baffin)) {
+  if ((GPU_ENABLE_PAL == 1) && (properties().revision <= Pal::AsicRevision::Polaris11)) {
     hwInfo_ = &DeviceInfo[static_cast<uint>(properties().revision)];
   } else if (ipLevel_ >= Pal::GfxIpLevel::GfxIp9) {
       // For compiler sub targets
diff --git a/projects/clr/rocclr/runtime/device/pal/palsettings.cpp b/projects/clr/rocclr/runtime/device/pal/palsettings.cpp
index b8b15115fc..e05fa0ba39 100644
--- a/projects/clr/rocclr/runtime/device/pal/palsettings.cpp
+++ b/projects/clr/rocclr/runtime/device/pal/palsettings.cpp
@@ -192,8 +192,8 @@ bool Settings::create(const Pal::DeviceProperties& palProp,
     case Pal::AsicRevision::Iceland:
     case Pal::AsicRevision::Tonga:
     case Pal::AsicRevision::Fiji:
-    case Pal::AsicRevision::Ellesmere:
-    case Pal::AsicRevision::Baffin:
+    case Pal::AsicRevision::Polaris10:
+    case Pal::AsicRevision::Polaris11:
       // Disable tiling aperture on VI+
       linearPersistentImage_ = true;
       // Keep this false even though we have support