diff --git a/projects/clr/rocclr/runtime/device/pal/paldefs.hpp b/projects/clr/rocclr/runtime/device/pal/paldefs.hpp
index 99de1b00ad..2247f429e1 100644
--- a/projects/clr/rocclr/runtime/device/pal/paldefs.hpp
+++ b/projects/clr/rocclr/runtime/device/pal/paldefs.hpp
@@ -155,11 +155,14 @@ static const AMDDeviceInfo Gfx9PlusSubDeviceInfo[] = {
     /* Vega10 XNACK */{ LIGHTNING_SWITCH("gfx900","gfx901"),  LIGHTNING_SWITCH("gfx900","gfx901"),
                         4, 16, 1, 256, 64 * Ki, 32,  LIGHTNING_SWITCH(900, 901)},
     /* Vega12       */{"gfx904", "gfx904", 4, 16, 1, 256, 64 * Ki, 32, 904},
-    /* Vega12 XNACK */{"gfx905", "gfx905", 4, 16, 1, 256, 64 * Ki, 32, 905},
-    /* Vega20       */{ "", "", 4, 16, 1, 256, 64 * Ki, 32, 906},
-    /* Vega20 XNACK */{ "", "", 4, 16, 1, 256, 64 * Ki, 32, 907},
+    /* Vega12 XNACK */{ LIGHTNING_SWITCH("gfx904","gfx905"), LIGHTNING_SWITCH("gfx904","gfx905"),
+                        4, 16, 1, 256, 64 * Ki, 32, LIGHTNING_SWITCH(904, 905)},
+    /* Vega20       */{"gfx906", "gfx906", 4, 16, 1, 256, 64 * Ki, 32, 906},
+    /* Vega20 XNACK */{ LIGHTNING_SWITCH("gfx906","gfx907"), LIGHTNING_SWITCH("gfx906","gfx907"),
+                        4, 16, 1, 256, 64 * Ki, 32, LIGHTNING_SWITCH(906, 907)},
     /* Raven        */{"gfx902", "gfx902", 4, 16, 1, 256, 64 * Ki, 32, 902},
-    /* Raven XNACK  */{"gfx903", "gfx903", 4, 16, 1, 256, 64 * Ki, 32, 903},
+    /* Raven XNACK  */{ LIGHTNING_SWITCH("gfx902","gfx903"), LIGHTNING_SWITCH("gfx902","gfx903"),
+                        4, 16, 1, 256, 64 * Ki, 32, LIGHTNING_SWITCH(902, 903)},
     /* Raven2       */{""      , ""      , 0, 0 , 0, 0  , 0      , 0 , 0},
     /* Raven2 XNACK */{""      , ""      , 0, 0 , 0, 0  , 0      , 0 , 0},
     /* Navi10       */{ "", "", 4, 16, 1, 256, 64 * Ki, 32, 1000},