diff --git a/core/services/ardupilot_manager/mavlink_proxy/MAVLinkServer.py b/core/services/ardupilot_manager/mavlink_proxy/MAVLinkServer.py
index df60c096fb..ac26e93452 100644
--- a/core/services/ardupilot_manager/mavlink_proxy/MAVLinkServer.py
+++ b/core/services/ardupilot_manager/mavlink_proxy/MAVLinkServer.py
@@ -1,3 +1,4 @@
+import os
 import re
 import subprocess
 from typing import Optional
@@ -10,6 +11,8 @@ class MAVLinkServer(AbstractRouter):
     def __init__(self) -> None:
         super().__init__()
         self.log_path: Optional[str] = None
+        self.mavlink_system_id: Optional[int] = None
+        self.mavlink_component_id: Optional[int] = None
 
     def _get_version(self) -> Optional[str]:
         binary = self.binary()
@@ -43,8 +46,12 @@ def convert_endpoint(endpoint: Endpoint) -> str:
 
         if not self.log_path:
             self.log_path = "/var/logs/blueos/services/mavlink-server/"
+        if not self.mavlink_system_id:
+            self.mavlink_system_id = int(os.environ.get("MAV_SYSTEM_ID", 1))
+        if not self.mavlink_component_id:
+            self.mavlink_component_id = int(os.environ.get("MAV_COMPONENT_ID_ONBOARD_COMPUTER", 191))
 
-        return f"{self.binary()} {endpoints} --log-path={self.log_path}"
+        return f"{self.binary()} {endpoints} --mavlink-system-id={self.mavlink_system_id} --mavlink-component-id={self.mavlink_component_id} --log-path={self.log_path}"
 
     @staticmethod
     def name() -> str: