diff --git a/.circleci/images/kernel-amd64/config_linux.txt b/.circleci/images/kernel-amd64/config_linux.txt
index 4378df1075..95a6a65bfb 100644
--- a/.circleci/images/kernel-amd64/config_linux.txt
+++ b/.circleci/images/kernel-amd64/config_linux.txt
@@ -96,10 +96,21 @@ CONFIG_BRIDGE_MRP=y
 CONFIG_NETLINK_DIAG=y
 
 # Network shaping
-CONFIG_NET_SCHED
-CONFIG_NET_SCH_HTB
-CONFIG_NET_SCH_HFSC
-CONFIG_NET_SCH_INGRESS
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_NETFILTER_NETLINK=y
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=y
+CONFIG_NET_SCH_HFSC=y
+CONFIG_NET_SCH_INGRESS=y
+CONFIG_NET_SCH_CHOKE=y
+CONFIG_NET_SCH_QFQ=y
+CONFIG_NET_SCH_CODEL=y
+CONFIG_NET_SCH_FQ_CODEL=y
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=y
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_GACT=y
 
 # 9P net filesystem
 CONFIG_NET_9P=y
diff --git a/.circleci/images/kernel-arm/config_linux.txt b/.circleci/images/kernel-arm/config_linux.txt
index 947e546bf5..97cc87a490 100644
--- a/.circleci/images/kernel-arm/config_linux.txt
+++ b/.circleci/images/kernel-arm/config_linux.txt
@@ -110,10 +110,21 @@ CONFIG_BRIDGE_MRP=y
 CONFIG_NETLINK_DIAG=y
 
 # Network shaping
-CONFIG_NET_SCHED
-CONFIG_NET_SCH_HTB
-CONFIG_NET_SCH_HFSC
-CONFIG_NET_SCH_INGRESS
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_NETFILTER_NETLINK=y
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=y
+CONFIG_NET_SCH_HFSC=y
+CONFIG_NET_SCH_INGRESS=y
+CONFIG_NET_SCH_CHOKE=y
+CONFIG_NET_SCH_QFQ=y
+CONFIG_NET_SCH_CODEL=y
+CONFIG_NET_SCH_FQ_CODEL=y
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=y
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_GACT=y
 
 # GPIO test - mock GPIO libraries
 CONFIG_GPIOLIB=y
diff --git a/.circleci/images/kernel-arm64/config_linux.txt b/.circleci/images/kernel-arm64/config_linux.txt
index 07964c4023..5e26dbdcf7 100644
--- a/.circleci/images/kernel-arm64/config_linux.txt
+++ b/.circleci/images/kernel-arm64/config_linux.txt
@@ -104,10 +104,21 @@ CONFIG_BRIDGE_MRP=y
 CONFIG_NETLINK_DIAG=y
 
 # Network shaping
-CONFIG_NET_SCHED
-CONFIG_NET_SCH_HTB
-CONFIG_NET_SCH_HFSC
-CONFIG_NET_SCH_INGRESS
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_NETFILTER_NETLINK=y
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=y
+CONFIG_NET_SCH_HFSC=y
+CONFIG_NET_SCH_INGRESS=y
+CONFIG_NET_SCH_CHOKE=y
+CONFIG_NET_SCH_QFQ=y
+CONFIG_NET_SCH_CODEL=y
+CONFIG_NET_SCH_FQ_CODEL=y
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=y
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_GACT=y
 
 # GPIO test - mock GPIO libraries
 CONFIG_GPIOLIB=y