diff --git a/layer/bsp-alix/ROOTFS b/layer/bsp-alix/ROOTFS
index 2736b09..5e85f71 100644
--- a/layer/bsp-alix/ROOTFS
+++ b/layer/bsp-alix/ROOTFS
@@ -1,10 +1,4 @@
 kmod
-inetutils
-ethtool
-iproute2
-iana-etc
 btrfs-progs
 dosfstools
-nftables
-dhcpcd
 linux
diff --git a/layer/bsp-rpi3/ROOTFS b/layer/bsp-rpi3/ROOTFS
index ce38295..cce83ff 100644
--- a/layer/bsp-rpi3/ROOTFS
+++ b/layer/bsp-rpi3/ROOTFS
@@ -1,15 +1,7 @@
 kmod
-inetutils
-ethtool
-iproute2
-iana-etc
 btrfs-progs
 dosfstools
-nftables
-kbd
-firmware-rpi3
-dhcpcd
-iw
-hostapd
-linux-firmware-rpi3
 linux-rpi3
+firmware-rpi3
+linux-firmware-rpi3
+kbd
diff --git a/layer/pygos-cli-net/ROOTFS b/layer/pygos-cli-net/ROOTFS
new file mode 100644
index 0000000..746e850
--- /dev/null
+++ b/layer/pygos-cli-net/ROOTFS
@@ -0,0 +1,8 @@
+ldns
+ntp
+iana-etc
+inetutils
+ethtool
+iproute2
+nftables
+dhcpcd
diff --git a/layer/pygos-cli/ROOTFS b/layer/pygos-cli/ROOTFS
new file mode 100644
index 0000000..2e5f5f7
--- /dev/null
+++ b/layer/pygos-cli/ROOTFS
@@ -0,0 +1,21 @@
+bash
+bash-completion
+coreutils
+diffutils
+findutils
+util-linux
+nano
+grep
+less
+xz
+gzip
+bzip2
+tar
+sed
+gawk
+shadow
+procps-ng
+psmisc
+file
+init
+tzdata
diff --git a/layer/router-base/ROOTFS b/layer/router-base/ROOTFS
index e34167c..8da1280 100644
--- a/layer/router-base/ROOTFS
+++ b/layer/router-base/ROOTFS
@@ -1,27 +1,4 @@
-coreutils
-bash
-bash-completion
-nano
-util-linux
-grep
-less
-xz
-gzip
-bzip2
-tar
-diffutils
-findutils
-sed
-gawk
-shadow
-procps-ng
-psmisc
-file
-init
 unbound
 dnsmasq
 openssh
-ldns
 tcpdump
-ntp
-tzdata
diff --git a/layer/router-rpi3/ROOTFS b/layer/router-rpi3/ROOTFS
new file mode 100644
index 0000000..8ab3d2c
--- /dev/null
+++ b/layer/router-rpi3/ROOTFS
@@ -0,0 +1,2 @@
+hostapd
+iw
diff --git a/product/router-alix.layers b/product/router-alix.layers
index 5e6515b..6badafd 100644
--- a/product/router-alix.layers
+++ b/product/router-alix.layers
@@ -1,3 +1,5 @@
 bsp-alix
+pygos-cli
+pygos-cli-net
 router-base
 router-alix
diff --git a/product/router-rpi3.layers b/product/router-rpi3.layers
index 2002ac8..53cdaad 100644
--- a/product/router-rpi3.layers
+++ b/product/router-rpi3.layers
@@ -1,3 +1,5 @@
 bsp-rpi3
+pygos-cli
+pygos-cli-net
 router-base
 router-rpi3