diff --git a/packageset/testbuildbot/backbone.txt b/packageset/testbuildbot/backbone.txt
index 9179e00..610f772 100644
--- a/packageset/testbuildbot/backbone.txt
+++ b/packageset/testbuildbot/backbone.txt
@@ -1,77 +1 @@
--wpad-mini
-#wpad
-
-# Defaults
-falter-berlin-dhcp-defaults
-falter-berlin-freifunk-defaults
-falter-berlin-network-defaults
-falter-berlin-olsrd-defaults
-falter-berlin-statistics-defaults
-falter-berlin-system-defaults
-falter-berlin-uhttpd-defaults
-
-# Common
-#dnsmasq is already provided via dnsmasq-full
--dnsmasq
-
-# falter Common
-falter-common
-falter-common-olsr
-falter-berlin-tunneldigger
-
-# Utils
-tcpdump-mini
-mtr
-ip
-iperf3
-tmux
-vnstat
-ethtool
-iwinfo
-libiwinfo-lua
-
-# GUI-basics
-uhttpd
-uhttpd-mod-ubus
-luci
-luci-ssl
-luci-mod-falter
-luci-app-olsr
-luci-app-opkg
-luci-app-olsr-services
-luci-app-falter-owm
-luci-app-falter-owm-ant
-luci-app-falter-owm-cmd
-luci-app-falter-owm-gui
-luci-proto-ppp
-luci-theme-bootstrap
-
-# GUI translation stuff
-luci-i18n-base-de
-luci-i18n-olsr-de
-luci-i18n-opkg-de
-luci-i18n-statistics-de
-luci-i18n-falter-de
-
-# OLSR
-olsrd
-olsrd-mod-arprefresh
-olsrd-mod-dyn-gw
-olsrd-mod-jsoninfo
-olsrd-mod-txtinfo
-olsrd-mod-nameservice
-olsrd-mod-watchdog
-kmod-ipip
-
-# Statistics
-luci-app-statistics
-collectd
-collectd-mod-dhcpleases
-collectd-mod-interface
-collectd-mod-iwinfo
-collectd-mod-network
-collectd-mod-olsrd
-collectd-mod-rrdtool
-collectd-mod-ping
-collectd-mod-uptime
-collectd-mod-memory
+falter-backbone
diff --git a/packageset/testbuildbot/notunnel.txt b/packageset/testbuildbot/notunnel.txt
index 2d7d26f..a2e7711 100644
--- a/packageset/testbuildbot/notunnel.txt
+++ b/packageset/testbuildbot/notunnel.txt
@@ -1,96 +1 @@
--wpad-mini
-#wpad
-
-# Defaults
-falter-berlin-dhcp-defaults
-falter-berlin-firewall-defaults
-falter-berlin-freifunk-defaults
-falter-berlin-migration
-falter-berlin-network-defaults
-falter-berlin-olsrd-defaults
-falter-berlin-statistics-defaults
-falter-berlin-system-defaults
-falter-berlin-uhttpd-defaults
-
-# Common
-mtr
-ip
-iperf3
-tmux
-vnstat
-ethtool
-#dnsmasq is already provided via dnsmasq-full
--dnsmasq
-qos-scripts
-firewall4
-iptables-nft
-iwinfo
-libiwinfo-lua
-tcpdump-mini
-
-# falter Common
-falter-common
-falter-common-olsr
-falter-policyrouting
-falter-profiles
-# allow upgrade from one type to another
-falter-berlin-tunneldigger
-
-# GUI-basics
-uhttpd
-uhttpd-mod-ubus
-luci
-luci-ssl
-luci-app-ffwizard-falter
-luci-mod-falter
-luci-app-olsr
-luci-app-opkg
-luci-app-firewall
-luci-app-olsr-services
-luci-app-falter-owm
-luci-app-falter-owm-ant
-luci-app-falter-owm-cmd
-luci-app-falter-owm-gui
-luci-proto-ppp
-luci-theme-bootstrap
-
-# GUI translation stuff
-luci-i18n-base-de
-luci-i18n-firewall-de
-luci-i18n-olsr-de
-luci-i18n-opkg-de
-luci-i18n-statistics-de
-luci-i18n-falter-de
-luci-i18n-ffwizard-falter-de
-luci-i18n-falter-policyrouting-de
-
-# service registrar
-falter-berlin-service-registrar
-luci-app-falter-service-registrar
-luci-i18n-falter-service-registrar-de
-
-# OLSR
-olsrd
-olsrd-mod-arprefresh
-olsrd-mod-dyn-gw
-olsrd-mod-jsoninfo
-olsrd-mod-txtinfo
-olsrd-mod-nameservice
-olsrd-mod-watchdog
-kmod-ipip
-
-# Uplink
-falter-berlin-uplink-notunnel
-
-# Statistics
-luci-app-statistics
-collectd
-collectd-mod-dhcpleases
-collectd-mod-interface
-collectd-mod-iwinfo
-collectd-mod-network
-collectd-mod-olsrd
-collectd-mod-rrdtool
-collectd-mod-ping
-collectd-mod-uptime
-collectd-mod-memory
+falter-notunnel
diff --git a/packageset/testbuildbot/tunneldigger.txt b/packageset/testbuildbot/tunneldigger.txt
index 8e59698..6abacd5 100644
--- a/packageset/testbuildbot/tunneldigger.txt
+++ b/packageset/testbuildbot/tunneldigger.txt
@@ -1,97 +1 @@
-#-wpad-mini
-#wpad
-
-# Defaults
-falter-berlin-dhcp-defaults
-falter-berlin-firewall-defaults
-falter-berlin-freifunk-defaults
-falter-berlin-migration
-falter-berlin-network-defaults
-falter-berlin-olsrd-defaults
-falter-berlin-statistics-defaults
-falter-berlin-system-defaults
-falter-berlin-uhttpd-defaults
-falter-profiles
-
-# Common
-mtr
-ip
-iperf3
-tmux
-vnstat
-ethtool
-#dnsmasq is already provided via dnsmasq-full
--dnsmasq
-qos-scripts
-firewall4
-iptables-nft
-iwinfo
-libiwinfo-lua
-tcpdump-mini
-
-# falter Common
-falter-common
-falter-common-olsr
-falter-policyrouting
-falter-profiles
-
-# GUI-basics
-uhttpd
-uhttpd-mod-ubus
-luci
-luci-ssl
-luci-app-ffwizard-falter
-luci-mod-falter
-luci-app-olsr
-luci-app-opkg
-luci-app-firewall
-luci-app-olsr-services
-luci-app-falter-owm
-luci-app-falter-owm-ant
-luci-app-falter-owm-cmd
-luci-app-falter-owm-gui
-luci-proto-ppp
-luci-theme-bootstrap
-
-# GUI translation stuff
-luci-i18n-base-de
-luci-i18n-firewall-de
-luci-i18n-olsr-de
-luci-i18n-opkg-de
-luci-i18n-statistics-de
-luci-i18n-falter-de
-luci-i18n-ffwizard-falter-de
-luci-i18n-falter-policyrouting-de
-
-# service registrar
-falter-berlin-service-registrar
-luci-app-falter-service-registrar
-luci-i18n-falter-service-registrar-de
-
-# OLSR
-olsrd
-olsrd-mod-arprefresh
-olsrd-mod-dyn-gw
-olsrd-mod-jsoninfo
-olsrd-mod-txtinfo
-olsrd-mod-nameservice
-olsrd-mod-watchdog
-kmod-ipip
-
-# Uplink
-falter-berlin-uplink-tunnelberlin
-
-# Statistics
-luci-app-statistics
-collectd
-collectd-mod-cpu
-collectd-mod-dhcpleases
-collectd-mod-interface
-collectd-mod-iwinfo
-collectd-mod-load
-collectd-mod-network
-collectd-mod-olsrd
-collectd-mod-rrdtool
-collectd-mod-ping
-collectd-mod-uptime
-collectd-mod-memory
+falter-standard