diff --git a/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp b/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
index ecee8c18ce..bc977cd694 100644
--- a/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
+++ b/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
@@ -145,7 +145,9 @@ const struct supported_device {
 
 	{0x5904, 0x5906, INTEL_MODEL_KBY,  "Kabylake ULT GT1"},
 	{0x590f, 0x5902, INTEL_MODEL_KBY,  "Kabylake DT GT1"},
-	{0x590c, 0x5916, INTEL_MODEL_KBY,  "Kabylake ULT GT2"},
+	{0x5904, 0x5916, INTEL_MODEL_KBYM, "Kabylake ULT GT2"},
+	{0x590c, 0x5916, INTEL_MODEL_KBYM, "Kabylake ULT GT2"},
+	{0x5904, 0x5921, INTEL_MODEL_KBYM, "Kabylake ULT GT2F"},
 	{0x590c, 0x591c, INTEL_MODEL_KBY,  "Kabylake ULX GT2"},
 	{0x590c, 0x591e, INTEL_MODEL_KBY,  "Kabylake ULX GT2"},
 	{0x591f, 0x5912, INTEL_MODEL_KBY,  "Kabylake DT GT2"},
diff --git a/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp b/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
index 701d0f47e4..4bb745d887 100644
--- a/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
+++ b/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
@@ -136,7 +136,8 @@ const struct supported_device {
 
 	{0x5906, INTEL_MODEL_KBY,  "Kabylake ULT GT1"},
 	{0x5902, INTEL_MODEL_KBY,  "Kabylake DT GT1"},
-	{0x5916, INTEL_MODEL_KBY,  "Kabylake ULT GT2"},
+	{0x5916, INTEL_MODEL_KBYM, "Kabylake ULT GT2"},
+	{0x5921, INTEL_MODEL_KBYM, "Kabylake ULT GT2F"},
 	{0x591c, INTEL_MODEL_KBY,  "Kabylake ULX GT2"},
 	{0x591e, INTEL_MODEL_KBY,  "Kabylake ULX GT2"},
 	{0x5912, INTEL_MODEL_KBY,  "Kabylake DT GT2"},