diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index f411b20224ed..65a8e0e481f7 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -268,6 +268,7 @@ CONFIG_NET_CLS_FW=y
 CONFIG_NET_CLS_U32=y
 CONFIG_CLS_U32_MARK=y
 CONFIG_NET_CLS_FLOW=y
+CONFIG_NET_CLS_CGROUP=y
 CONFIG_NET_CLS_BPF=y
 CONFIG_NET_CLS_MATCHALL=y
 CONFIG_NET_EMATCH=y
@@ -285,7 +286,6 @@ CONFIG_NET_ACT_BPF=y
 CONFIG_VSOCKETS=y
 CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_CAN=m
 CONFIG_BT=m
 CONFIG_BT_RFCOMM=m