diff --git a/general/package/datalink/files/telemetry b/general/package/datalink/files/telemetry
index 7479eeee5..b073ca41b 100755
--- a/general/package/datalink/files/telemetry
+++ b/general/package/datalink/files/telemetry
@@ -43,7 +43,10 @@ case "$1" in
 		else
 			if [ "$router" -eq 2  ]; then
 				msposd --channels "$channels" --master "$serial" --baudrate "$baud"  \
-					--out 127.0.0.1:$(($port_tx + 1)) -osd -r "$fps" --ahi "$ahi" > /dev/null &
+					-osd -r "$fps" --ahi "$ahi" > /dev/null &
+			elif [ "$router" -eq 3 ]; then
+				msposd --channels "$channels" --master "$serial" --baudrate "$baud"  \
+					--out 10.5.0.1:$(($port_tx + 1)) -r "$fps" > /dev/null &
 			else
 				mavfwd --channels "$channels" --master "$serial" --baudrate "$baud" -p 100 -t -a "$aggregate" \
 					--out 127.0.0.1:$port_tx --in 127.0.0.1:$port_rx > /dev/null &
diff --git a/general/package/datalink/files/telemetry_drone.conf b/general/package/datalink/files/telemetry_drone.conf
index 14d2f7e45..391987e4d 100644
--- a/general/package/datalink/files/telemetry_drone.conf
+++ b/general/package/datalink/files/telemetry_drone.conf
@@ -4,7 +4,7 @@ unit=drone
 serial=/dev/ttyAMA0
 baud=115200
 
-### router: use simple mavfwd (0), classic mavlink-routerd (1) or msposd instead of mavfwd (2)
+### router: use simple mavfwd (0), classic mavlink-routerd (1) or msposd instead of mavfwd (2) or msposd on groundstation (3)
 router=0
 
 wlan=wlan0
diff --git a/general/package/wifibroadcast-ng/files/wfb.yaml b/general/package/wifibroadcast-ng/files/wfb.yaml
index e5d0cbde3..ed29ac774 100644
--- a/general/package/wifibroadcast-ng/files/wfb.yaml
+++ b/general/package/wifibroadcast-ng/files/wfb.yaml
@@ -13,3 +13,4 @@ telemetry:
   router: msposd
   serial: /dev/ttyS2
   osd_fps: 20
+  ahi: 0
diff --git a/general/package/wifibroadcast-ng/files/wifibroadcast b/general/package/wifibroadcast-ng/files/wifibroadcast
index 350acaf7b..6ec009c05 100755
--- a/general/package/wifibroadcast-ng/files/wifibroadcast
+++ b/general/package/wifibroadcast-ng/files/wifibroadcast
@@ -91,7 +91,11 @@ start_telemetry() {
 
 	if [ "$router" = "msposd" ]; then
 		echo "- Starting $router"
-		msposd --baudrate 115200 --channels 8 -osd --ahi 0 -r "$osd_fps" \
+		msposd --baudrate 115200 --channels 8 -osd --ahi "$ahi" -r "$osd_fps" \
+			--master "$serial" > /dev/null &
+	elif [ "$router" = "msposd_gs" ]; then
+		echo "- Starting $router"
+		msposd --baudrate 115200 --channels 8 -r "$osd_fps" \
 			--master "$serial" --out 10.5.0.1:14551 > /dev/null &
 	elif [ "$router" = "mavfwd" ]; then
 		echo "- Starting $router"