diff --git a/install/bananapi.mk b/install/bananapi.mk
new file mode 100644
index 0000000..b49c197
--- /dev/null
+++ b/install/bananapi.mk
@@ -0,0 +1,5 @@
+install-bpi-r3-network-config:
+	mkdir -p files/etc/config
+	cp misc/bpi-r3/uci/network files/etc/config/network
+	cp misc/bpi-r3/uci/wireless files/etc/config/wireless
+	cp misc/bpi-r3/uci/system files/etc/config/system
\ No newline at end of file
diff --git a/misc/bpi-r3/uci/network b/misc/bpi-r3/uci/network
new file mode 100644
index 0000000..f975deb
--- /dev/null
+++ b/misc/bpi-r3/uci/network
@@ -0,0 +1,47 @@
+config device
+	config interface 'loopback'
+	option device 'lo'
+	option proto 'static'
+	option ipaddr '127.0.0.1'
+	option netmask '255.0.0.0'
+
+config globals 'globals'
+	option ula_prefix 'fd78:1aa3:8b15::/48'
+
+config device
+	option name 'br-lan'
+	option type 'bridge'
+	list ports 'lan1'
+	list ports 'lan2'
+	list ports 'lan3'
+	list ports 'lan4'
+	list ports 'sfp2'
+
+config interface 'lan'
+	option device 'br-lan'
+	option proto 'static'
+	option ipaddr '192.168.1.1'
+	option netmask '255.255.255.0'
+	option ip6assign '60'
+
+config device
+	option name 'br-wan'
+	option type 'bridge'
+	list ports 'eth1'
+	list ports 'wan'
+
+config device
+	option name 'eth1'
+	option macaddr '96:37:22:3f:67:af'
+
+config device
+	option name 'wan'
+	option macaddr '96:37:22:3f:67:af'
+
+config interface 'wan'
+	option device 'br-wan'
+	option proto 'dhcp'
+
+config interface 'wan6'
+	option device 'br-wan'
+	option proto 'dhcpv6'
\ No newline at end of file
diff --git a/misc/bpi-r3/uci/system b/misc/bpi-r3/uci/system
new file mode 100644
index 0000000..35089e6
--- /dev/null
+++ b/misc/bpi-r3/uci/system
@@ -0,0 +1,15 @@
+config system
+	option hostname 'OpenWrt'
+	option timezone 'UTC'
+	option ttylogin '0'
+	option log_size '64'
+	option urandom_seed '0'
+	option compat_version '1.1'
+
+config timeserver 'ntp'
+	option enabled '1'
+	option enable_server '0'
+	list server '0.openwrt.pool.ntp.org'
+	list server '1.openwrt.pool.ntp.org'
+	list server '2.openwrt.pool.ntp.org'
+	list server '3.openwrt.pool.ntp.org'
diff --git a/misc/bpi-r3/uci/wireless b/misc/bpi-r3/uci/wireless
new file mode 100644
index 0000000..3c3f79b
--- /dev/null
+++ b/misc/bpi-r3/uci/wireless
@@ -0,0 +1,29 @@
+config wifi-device 'radio0'
+	option type 'mac80211'
+	option path 'platform/soc/18000000.wifi'
+	option channel '1'
+	option band '2g'
+	option htmode 'HE20'
+	option disabled '1'
+
+config wifi-iface 'default_radio0'
+	option device 'radio0'
+	option network 'lan'
+	option mode 'ap'
+	option ssid 'OpenWrt'
+	option encryption 'none'
+
+config wifi-device 'radio1'
+	option type 'mac80211'
+	option path 'platform/soc/18000000.wifi+1'
+	option channel '36'
+	option band '5g'
+	option htmode 'HE80'
+	option disabled '1'
+
+config wifi-iface 'default_radio1'
+	option device 'radio1'
+	option network 'lan'
+	option mode 'ap'
+	option ssid 'OpenWrt'
+	option encryption 'none'
diff --git a/misc/rpi/uci/network b/misc/rpi/uci/network
index 8f6834d..08852f4 100644
--- a/misc/rpi/uci/network
+++ b/misc/rpi/uci/network
@@ -1,9 +1,47 @@
-config interface 'loopback'
-	option ifname 'lo'
+config device
+	config interface 'loopback'
+	option device 'lo'
 	option proto 'static'
 	option ipaddr '127.0.0.1'
 	option netmask '255.0.0.0'
 
+config globals 'globals'
+	option ula_prefix 'fd78:1aa3:8b15::/48'
+
+config device
+	option name 'br-lan'
+	option type 'bridge'
+	list ports 'lan1'
+	list ports 'lan2'
+	list ports 'lan3'
+	list ports 'lan4'
+	list ports 'sfp2'
+
+config interface 'lan'
+	option device 'br-lan'
+	option proto 'static'
+	option ipaddr '192.168.1.1'
+	option netmask '255.255.255.0'
+	option ip6assign '60'
+
+config device
+	option name 'br-wan'
+	option type 'bridge'
+	list ports 'eth1'
+	list ports 'wan'
+
+config device
+	option name 'eth1'
+	option macaddr '96:37:22:3f:67:af'
+
+config device
+	option name 'wan'
+	option macaddr '96:37:22:3f:67:af'
+
 config interface 'wan'
-	option ifname 'eth0'
-	option proto 'dhcp'
\ No newline at end of file
+	option device 'br-wan'
+	option proto 'dhcp'
+
+config interface 'wan6'
+	option device 'br-wan'
+	option proto 'dhcpv6'
diff --git a/targets/bananapi.mk b/targets/bananapi.mk
index 611d799..f6e2c4b 100644
--- a/targets/bananapi.mk
+++ b/targets/bananapi.mk
@@ -4,8 +4,9 @@ bpi-r3:
 	$(MAKE) \
 		OPENWRT_VERSION="snapshot" \
 		IMAGEBUILDER_URL=https://downloads.openwrt.org/snapshots/targets/mediatek/filogic/openwrt-imagebuilder-mediatek-filogic.Linux-x86_64.tar.xz \
-		ADDITIONAL_INSTALL="" \
+		ADDITIONAL_INSTALL="install-bpi-r3-network-config" \
+		ADDITIONAL_OPENWRT_PACKAGES="block-mount kmod-fs-ext4 kmod-usb-storage kmod-usb2" \
 		OPENWRT_TARGET="mediatek/filogic" \
 		EMISSARY_ARCH="arm64" \
 		OPENWRT_PROFILE="bananapi_bpi-r3" \
-		build
\ No newline at end of file
+		build