diff --git a/feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-xunison-d50-5g.dts b/feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-xunison-d50-5g.dts
index 59023bf6d..f89ab5a6d 100755
--- a/feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-xunison-d50-5g.dts
+++ b/feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-xunison-d50-5g.dts
@@ -524,6 +524,80 @@
 	thermal-zones {
 		status = "ok";
 	};
+
+	gpio_keys {
+		compatible = "gpio-keys-polled";
+		pinctrl-0 = <&button_pins>;
+		pinctrl-names = "default";
+		poll-interval = <100>;
+
+		button@0 {
+			label = "reset";
+			linux,code = <KEY_RESTART>;
+			gpios = <&tlmm 22 GPIO_ACTIVE_LOW>;
+			linux,input-type = <1>;
+			debounce-interval = <60>;
+		};
+		button@1 {
+			label = "wps";
+			linux,code = <KEY_WPS_BUTTON>;
+			gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
+			linux,input-type = <1>;
+			debounce-interval = <60>;
+		};
+		
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		pinctrl-0 = <&leds_pins>;
+		pinctrl-names = "default";
+
+		led@35 {
+			label = "green:4g";
+			gpios = <&tlmm 35 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "led_5g_wifi";
+			default-state = "off";
+		};
+		led@30 {
+			label = "green:wifi";
+			gpios = <&tlmm 30 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "led_2g_wifi";
+			default-state = "off";
+		};
+		led@1 {
+			label = "green:internet";
+			gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "led_voice";
+			default-state = "off";
+		};
+		led@33 {
+			label = "green:lte";
+			gpios = <&tlmm 33 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "led_lte_g";
+			default-state = "off";
+		};		
+		led@34 {
+			label = "red:lte";
+			gpios = <&tlmm 34 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "led_lte_r";
+			default-state = "off";
+		};	
+		led@27 {
+			label = "green:mesh";
+			gpios = <&tlmm 27 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "led_nr_g";
+			default-state = "off";
+		};
+		led@28 {
+			label = "red:mesh";
+			gpios = <&tlmm 28 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "led_nr_r";
+			default-state = "off";
+		};
+	};
+
+
 };
 
 &tlmm {
@@ -636,12 +710,65 @@
 	};
 
 	button_pins: button_pins {
+		reset_button{
+			pins = "gpio22";
+			function = "gpio";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+		
 		wps_button {
 			pins = "gpio38";
 			function = "gpio";
 			drive-strength = <8>;
 			bias-pull-up;
 		};
+		
+	};
+	
+	leds_pins: leds_pins {
+		led_5g_wifi {
+			pins = "gpio35";
+			function = "gpio";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+		led_2g_wifi {
+			pins = "gpio30";
+			function = "gpio";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+		led_lte_g {
+			pins = "gpio33";
+			function = "gpio";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+		led_lte_r {
+			pins = "gpio34";
+			function = "gpio";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+		led_nr_g {
+			pins = "gpio27";
+			function = "gpio";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+		led_nr_r {
+			pins = "gpio28";
+			function = "gpio";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+		led_voice {
+			pins = "gpio1";
+			function = "gpio";
+			drive-strength = <8>;
+			bias-pull-down;
+		};	
 	};
 
 	audio_pins: audio_pinmux {
@@ -697,22 +824,6 @@
 
 };
 
-&soc {
-	gpio_keys {
-		compatible = "gpio-keys";
-		pinctrl-0 = <&button_pins>;
-		pinctrl-names = "default";
-
-		button@1 {
-			label = "wps";
-			linux,code = <KEY_WPS_BUTTON>;
-			gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
-			linux,input-type = <1>;
-			debounce-interval = <60>;
-		};
-	};
-};
-
 &usb3 {
 	qcom,multiplexed-phy;
 	qcom,phy-mux-regs = <&tcsr_q6_block 0x2540>;
diff --git a/feeds/ipq807x/ipq807x/image/ipq50xx.mk b/feeds/ipq807x/ipq807x/image/ipq50xx.mk
index 0aec36e34..67d22c570 100644
--- a/feeds/ipq807x/ipq807x/image/ipq50xx.mk
+++ b/feeds/ipq807x/ipq807x/image/ipq50xx.mk
@@ -134,7 +134,7 @@ define Device/xunison_d50-5g
   DEVICE_TITLE := Xunison D50-5G
   DEVICE_DTS := qcom-ipq5018-xunison-d50-5g
   SUPPORTED_DEVICES := xunison,d50_5g
-  DEVICE_PACKAGES := ath11k-wifi-xunison-d50 ath11k-firmware-ipq50xx ath11k-firmware-qcn9000 ath11k-wifi-qcom-ipq5018
+  DEVICE_PACKAGES := ath11k-wifi-xunison-d50 ath11k-firmware-ipq50xx ath11k-firmware-qcn9000 
   DEVICE_DTS_CONFIG := config@mp03.1
   IMAGES := sysupgrade.tar nand-factory.bin nand-factory.ubi
   IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata