diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf
index a7a59e9..90f98ad 100644
--- a/meta-quanta/meta-gbs/conf/machine/gbs.conf
+++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf
@@ -12,7 +12,6 @@
 
 SERIAL_CONSOLES = "115200;ttyS0"
 GBMC_NCSI_IF_NAME = "eth0"
-GBMC_KCS_DEV = "ipmi-kcs1"
 
 # Overwrite flash offsets
 FLASH_KERNEL_OFFSET_flash-65536 = "2048"
@@ -20,7 +19,7 @@
 FLASH_RWFS_OFFSET_flash-65536 = "62400"
 FLASH_SIZE = "65536"
 
-PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "gbmc-kcs-config"
+PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs"
 PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "gbs-led-manager-config-native"
 PREFERRED_PROVIDER_virtual/bios-update = "gbs-bios-update"
 
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend
new file mode 100644
index 0000000..34b6b79
--- /dev/null
+++ b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend
@@ -0,0 +1 @@
+KCS_DEVICE_gbs = "ipmi-kcs1"