diff --git a/general/package/mavlink-router/files/mavlink.conf b/general/package/mavlink-router/files/mavlink_drone.conf
similarity index 88%
rename from general/package/mavlink-router/files/mavlink.conf
rename to general/package/mavlink-router/files/mavlink_drone.conf
index 19a183f7..520e5d50 100644
--- a/general/package/mavlink-router/files/mavlink.conf
+++ b/general/package/mavlink-router/files/mavlink_drone.conf
@@ -8,9 +8,9 @@ Baud = 115200
 [UdpEndpoint telemetry_tx]
 Mode = Normal
 Address = 127.0.0.1
-Port = 14650
+Port = 14550
 
 [UdpEndpoint telemetry_rx]
 Mode = Server
 Address = 0.0.0.0
-Port = 14651
+Port = 14551
diff --git a/general/package/mavlink-router/files/mavlink_gs.conf b/general/package/mavlink-router/files/mavlink_gs.conf
new file mode 100644
index 00000000..a8beb820
--- /dev/null
+++ b/general/package/mavlink-router/files/mavlink_gs.conf
@@ -0,0 +1,20 @@
+[General]
+TcpServerPort = 0
+DebugLogLevel = error
+
+[UdpEndpoint vdec]
+Mode = Server
+Address = 0.0.0.0
+Port = 14550
+
+[UdpEndpoint telemetry_tx]
+Group=wfb
+Mode = Normal
+Address = 127.0.0.1
+Port = 14650
+
+[UdpEndpoint telemetry_rx]
+Group=wfb
+Mode = Server
+Address = 127.0.0.1
+Port = 14651
diff --git a/general/package/mavlink-router/mavlink-router.mk b/general/package/mavlink-router/mavlink-router.mk
index a4c1b886..62b4323a 100644
--- a/general/package/mavlink-router/mavlink-router.mk
+++ b/general/package/mavlink-router/mavlink-router.mk
@@ -12,6 +12,11 @@ MAVLINK_ROUTER_LICENSE = ASF-2.0
 MAVLINK_ROUTER_DEPENDENCIES += host-meson host-pkgconf
 MAVLINK_ROUTER_GIT_SUBMODULES = YES
 
+MAVLINK_ROUTER_UNIT = drone
+ifeq ($(OPENIPC_SOC_FAMILY),hi3536dv100)
+	MAVLINK_ROUTER_UNIT = gs
+endif
+
 ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
 MAVLINK_ROUTER_LIBC = glibc
 else
@@ -38,7 +43,7 @@ define MAVLINK_ROUTER_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) ninja -C $(@D)/build install
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc
-	cp $(MAVLINK_ROUTER_PKGDIR)/files/mavlink.conf $(TARGET_DIR)/etc/mavlink.conf
+	cp $(MAVLINK_ROUTER_PKGDIR)/files/mavlink_$(MAVLINK_ROUTER_UNIT).conf $(TARGET_DIR)/etc/mavlink.conf
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
 	cp $(MAVLINK_ROUTER_PKGDIR)/files/S97mavlink $(TARGET_DIR)/etc/init.d