diff --git a/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp b/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
index 8d24b098f8..d9aa96455c 100644
--- a/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
+++ b/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
@@ -100,6 +100,7 @@ Settings::Settings()
     siPlus_         = false;
     ciPlus_         = false;
     viPlus_         = false;
+    aiPlus_         = false;
 
     // Number of compute rings.
     numComputeRings_ = 0;
@@ -236,10 +237,15 @@ Settings::create(
         }
         enableExtension(ClAmdImage2dFromBufferReadOnly);
         break;
-    case CAL_TARGET_CARRIZO:
-        apuSystem_ = true;
     case CAL_TARGET_GREENLAND:
-        //TODO: specific code for AI
+        //TODO: specific codes for AI
+        aiPlus_ = true;
+        // Fall through to VI ...
+    case CAL_TARGET_CARRIZO:
+        if (!aiPlus_) {
+            // APU systems for VI
+            apuSystem_  = true;
+        }
     case CAL_TARGET_ICELAND:
     case CAL_TARGET_TONGA:
     case CAL_TARGET_FIJI:
diff --git a/projects/clr/rocclr/runtime/device/gpu/gpusettings.hpp b/projects/clr/rocclr/runtime/device/gpu/gpusettings.hpp
index 39859a1c2b..f88e45ddb3 100644
--- a/projects/clr/rocclr/runtime/device/gpu/gpusettings.hpp
+++ b/projects/clr/rocclr/runtime/device/gpu/gpusettings.hpp
@@ -61,6 +61,7 @@ public:
             uint    siPlus_: 1;         //!< SI and post SI features
             uint    ciPlus_: 1;         //!< CI and post CI features
             uint    viPlus_: 1;         //!< VI and post VI features
+            uint    aiPlus_: 1;         //!< AI and post AI features
             uint    rectLinearDMA_: 1;  //!< Rectangular linear DRMDMA support
             uint    threadTraceEnable_: 1;  //!< Thread trace enable
             uint    linearPersistentImage_: 1;  //!< Allocates linear images in persistent
@@ -74,7 +75,6 @@ public:
             uint    asyncMemCopy_: 1;   //!< Use async memory transfers
             uint    hsailDirectSRD_: 1; //!< Controls direct SRD for HSAIL
             uint    useDeviceQueue_: 1; //!< Submit to separate device queue
-            uint    reserved_: 1;
         };
         uint    value_;
     };