diff --git a/target/linux/ramips/dts/mt7621_zte_e8820s.dts b/target/linux/ramips/dts/mt7621_zte_e8820s.dts
index 2e775a7c4..a29fe09b0 100644
--- a/target/linux/ramips/dts/mt7621_zte_e8820s.dts
+++ b/target/linux/ramips/dts/mt7621_zte_e8820s.dts
@@ -10,8 +10,8 @@
 	model = "ZTE E8820S";
 
 	aliases {
-		led-boot = &led_sys;
-		led-failsafe = &led_sys;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
 		led-running = &led_power;
 		led-upgrade = &led_power;
 		label-mac-device = &gmac0;
@@ -26,22 +26,12 @@
 
 		led_power: power {
 			label = "white:power";
-			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		led_sys: sys {
 			label = "white:sys";
-			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
-		};
-
-		wlan2g {
-			label = "white:wlan2g";
-			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-		};
-
-		wlan5g {
-			label = "white:wlan5g";
-			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 	};
 
@@ -66,22 +56,6 @@
 			linux,code = <KEY_RFKILL>;
 		};
 	};
-
-	ubi-concat {
-		compatible = "mtd-concat";
-		devices = <&ubipart0 &ubipart1>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			ubi@0 {
-				label = "ubi";
-				reg = <0x0 0x79c0000>;
-			};
-		};
-	};
 };
 
 &nand {
@@ -99,7 +73,7 @@
 		};
 
 		partition@80000 {
-			label = "debug";
+			label = "u-boot-env";
 			reg = <0x80000 0x80000>;
 			read-only;
 		};
@@ -115,20 +89,9 @@
 			reg = <0x140000 0x400000>;
 		};
 
-		ubipart0: partition@540000 {
-			label = "ubipart0";
-			reg = <0x540000 0x1c80000>;
-		};
-
-		partition@21c0000 {
-			label = "bdinfo";
-			reg = <0x21c0000 0x80000>;
-			read-only;
-		};
-
-		ubipart1: partition@2240000 {
-			label = "ubipart1";
-			reg = <0x2240000 0x5d40000>;
+		partition@540000 {
+			label = "ubi";
+			reg = <0x540000 0x7a40000>;
 		};
 	};
 };
@@ -143,6 +106,10 @@
 		reg = <0x0000 0 0 0 0>;
 		mediatek,mtd-eeprom = <&factory 0x0000>;
 		ieee80211-freq-limit = <2400000 2500000>;
+
+		led {
+			led-active-low;
+		};
 	};
 };
 
@@ -152,46 +119,44 @@
 		reg = <0x0000 0 0 0 0>;
 		mediatek,mtd-eeprom = <&factory 0x8000>;
 		ieee80211-freq-limit = <5000000 6000000>;
+
+		led {
+			led-sources = <2>;
+			led-active-low;
+		};
 	};
 };
 
 &gmac0 {
+	mtd-mac-address = <&factory 0xe000>;
+};
+
+&gmac1 {
 	mtd-mac-address = <&factory 0xe006>;
+	status = "okay";
+};
+
+&gsw {
+	mediatek,mdio = <&mdio>;
+	mediatek,portmap = "llllw";
+	status = "okay";
+};
+
+&hnat {
+	mtketh-wan = "eth1";
+	mtketh-ppd = "eth0";
+	mtketh-lan = "eth0";
+	mtketh-max-gmac = <2>;
+	/delete-property/ mtkdsa-wan-port;
 };
 
 &switch0 {
-	ports {
-		port@0 {
-			status = "okay";
-			label = "lan1";
-		};
-
-		port@1 {
-			status = "okay";
-			label = "lan2";
-		};
-
-		port@2 {
-			status = "okay";
-			label = "lan3";
-		};
-
-		port@3 {
-			status = "okay";
-			label = "lan4";
-		};
-
-		port@4 {
-			status = "okay";
-			label = "wan";
-			mtd-mac-address = <&factory 0xe000>;
-		};
-	};
+	status = "disabled";
 };
 
 &state_default {
 	gpio {
-		groups = "jtag", "uart2", "uart3", "wdt";
+		groups = "i2c", "jtag", "uart2", "uart3", "wdt";
 		function = "gpio";
 	};
 };
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index bc6a3ac05..dd4b87132 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -1973,7 +1973,7 @@ define Device/zte_e8820s
   PAGESIZE := 2048
   KERNEL_SIZE := 4096k
   UBINIZE_OPTS := -E 5
-  IMAGE_SIZE := 32768k
+  IMAGE_SIZE := 129280k
   IMAGES += factory.bin
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \
@@ -1981,6 +1981,6 @@ define Device/zte_e8820s
   DEVICE_VENDOR := ZTE
   DEVICE_MODEL := E8820S
   DEVICE_PACKAGES := kmod-mt7603e kmod-mt76x2e kmod-usb3 \
-	kmod-usb-ledtrig-usbport luci-app-mtwifi
+	kmod-usb-ledtrig-usbport luci-app-mtwifi -wpad-openssl
 endef
 TARGET_DEVICES += zte_e8820s
diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
index ffc57fa8e..0c4fd81fb 100644
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
@@ -132,10 +132,6 @@ xiaomi,redmi-router-ac2100)
 youhua,wr1200js)
 	ucidef_set_led_netdev "internet" "INTERNET" "green:wan" "wan"
 	;;
-zte,e8820s)
-	ucidef_set_led_netdev "wlan2g" "WiFi 2.4GHz" "white:wlan2g" "ra0"
-	ucidef_set_led_netdev "wlan5g" "WiFi 5GHz" "white:wlan5g" "rai0"
-	;;
 esac
 
 board_config_flush
diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
index 816e7c3dd..2ab027900 100644
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
@@ -82,7 +82,8 @@ ramips_setup_interfaces()
 	jcg,y2|\
 	phicomm,k2p|\
 	leigod,a7000|\
-	xiaoyu,xy-c5)
+	xiaoyu,xy-c5|\
+	zte,e8820s)
 		ucidef_add_switch "switch0" \
 			"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6u@eth0" "5u@eth1"
 		;;