diff --git a/templates/gateways/etc/config/network b/templates/gateways/etc/config/network
index cc0825c..8cf49b2 100644
--- a/templates/gateways/etc/config/network
+++ b/templates/gateways/etc/config/network
@@ -12,11 +12,15 @@ config globals 'globals'
 config device 'switch'
         option name 'switch'
         option type 'bridge'
+        option vlan_filtering 1
         list ports 'eth0'
         list ports 'eth1'
         list ports 'eth2'
         list ports 'eth3'
         list ports 'eth4'
+        list ports 'eth5'
+        list ports 'eth6'
+        list ports 'eth7'
 
 config bridge-vlan 'mgmt_vlan'
         option vlan '1'
@@ -24,6 +28,9 @@ config bridge-vlan 'mgmt_vlan'
         list ports 'eth2:u*'
         list ports 'eth3:u*'
         list ports 'eth4:u*'
+        list ports 'eth5:u*'
+        list ports 'eth6:u*'
+        list ports 'eth7:u*'
 
 config bridge-vlan 'clients_vlan'
         option vlan '2'
@@ -31,6 +38,9 @@ config bridge-vlan 'clients_vlan'
         list ports 'eth2:t'
         list ports 'eth3:t'
         list ports 'eth4:t'
+        list ports 'eth5:t'
+        list ports 'eth6:t'
+        list ports 'eth7:t'
 
 config bridge-vlan 'wan_vlan'
         option vlan '3'
@@ -45,6 +55,9 @@ config bridge-vlan 'backoffice_vlan'
         list ports 'eth2:t'
         list ports 'eth3:t'
         list ports 'eth4:t'
+        list ports 'eth5:t'
+        list ports 'eth6:t'
+        list ports 'eth7:t'
 
 config interface 'mgmt'
         option device 'switch.1'
diff --git a/templates/gateways/etc/config/system b/templates/gateways/etc/config/system
index 8b8d2ee..1b1eac4 100644
--- a/templates/gateways/etc/config/system
+++ b/templates/gateways/etc/config/system
@@ -14,9 +14,3 @@ config timeserver 'ntp'
 	list server '1.openwrt.pool.ntp.org'
 	list server '2.openwrt.pool.ntp.org'
 	list server '3.openwrt.pool.ntp.org'
-
-config gpio_switch 'poe_passthrough'
-	option name 'PoE Passthrough'
-	option gpio_pin '480'
-	option value '0'
-