diff --git a/meta-quanta/meta-gbs/conf/local.conf.sample b/meta-quanta/meta-gbs/conf/local.conf.sample
index 02e7869..787ab30 100644
--- a/meta-quanta/meta-gbs/conf/local.conf.sample
+++ b/meta-quanta/meta-gbs/conf/local.conf.sample
@@ -1,5 +1,5 @@
 MACHINE ??= "gbs"
-DISTRO ?= "openbmc-phosphor"
+DISTRO ?= "gbmc"
 PACKAGE_CLASSES ?= "package_rpm"
 SANITY_TESTED_DISTROS_append ?= " *"
 EXTRA_IMAGE_FEATURES = "debug-tweaks"
diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf
index d5a6e78..2419052 100644
--- a/meta-quanta/meta-gbs/conf/machine/gbs.conf
+++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf
@@ -10,6 +10,8 @@
 require conf/machine/include/npcm7xx.inc
 require conf/machine/include/obmc-bsp-common.inc
 
+GBMC_NCSI_IF_NAME = "eth0"
+
 # Overwrite flash offsets
 FLASH_ROFS_OFFSET = "7296"
 FLASH_RWFS_OFFSET = "61440"
diff --git a/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton/gbs.cfg b/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton/gbs.cfg
index edd009c..57ccc5e 100644
--- a/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton/gbs.cfg
+++ b/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton/gbs.cfg
@@ -88,6 +88,26 @@
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCF857X=y
 
+# NetFilter Configuration
+CONFIG_NETFILTER=y
+CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_TABLES=y
+CONFIG_NFT_CT=y
+CONFIG_NF_TABLES_INET=y
+CONFIG_NFT_REJECT=y
+CONFIG_NFT_LOG=y
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_NF_LOG_IPV4=y
+CONFIG_NFT_FIB_IPV4=y
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP6_NF_IPTABLES=y
+CONFIG_NF_LOG_IPV6=y
+CONFIG_NFT_FIB_IPV6=y
+CONFIG_IP6_NF_FILTER=y
+CONFIG_IP6_NF_TARGET_REJECT=y
+
 # Misc
 CONFIG_OVERLAY_FS=y
 CONFIG_JFFS2_FS=y