diff --git a/src/boards/Groundstation/Common/Config/GeneralConfig.h b/src/boards/Groundstation/Common/Config/GeneralConfig.h
index b7c8b8d3fe845fc9ad13a9ec2a3226f201273bd6..9d031417031489ba3a48ab44f4ecebd4e79b511c 100644
--- a/src/boards/Groundstation/Common/Config/GeneralConfig.h
+++ b/src/boards/Groundstation/Common/Config/GeneralConfig.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2023 Skyward Experimental Rocketry
- * Author: Davide Mor
+/* Copyright (c) 2023-2024 Skyward Experimental Rocketry
+ * Authors: Davide Mor, Nicolò Caruso
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,12 +22,14 @@
 
 #pragma once
 
-#include <cstdint>
+#include <common/Mavlink.h>
 
+#include <cstdint>
 namespace Groundstation
 {
-
+constexpr uint8_t GS_SYSTEM_ID    = SysIDs::MAV_SYSID_GS;
 constexpr uint8_t GS_COMPONENT_ID = 1;
-constexpr uint8_t GS_SYSTEM_ID    = 1;
 
+constexpr uint8_t ARP_SYSTEM_ID    = SysIDs::MAV_SYSID_ARP;
+constexpr uint8_t ARP_COMPONENT_ID = 1;
 }  // namespace Groundstation
\ No newline at end of file
diff --git a/src/boards/Groundstation/LyraGS/BoardStatus.cpp b/src/boards/Groundstation/LyraGS/BoardStatus.cpp
index b65ce88af2beed8715fa5a217070f6e66152db20..03038a32f65fdfd7df05d9fb57ecbaefea3e996a 100644
--- a/src/boards/Groundstation/LyraGS/BoardStatus.cpp
+++ b/src/boards/Groundstation/LyraGS/BoardStatus.cpp
@@ -123,8 +123,8 @@ void BoardStatus::arpRoutine()
     }
 
     mavlink_message_t msg;
-    mavlink_msg_arp_tm_encode(SysIDs::MAV_SYSID_ARP,
-                              Groundstation::GS_COMPONENT_ID, &msg, &tm);
+    mavlink_msg_arp_tm_encode(Groundstation::ARP_SYSTEM_ID,
+                              Groundstation::ARP_COMPONENT_ID, &msg, &tm);
 
     getModule<HubBase>()->dispatchIncomingMsg(msg);
 }
@@ -181,7 +181,8 @@ void BoardStatus::GSRoutine()
     }
 
     mavlink_message_t msg;
-    mavlink_msg_arp_tm_encode(GS_SYSTEM_ID, GS_COMPONENT_ID, &msg, &tm);
+    mavlink_msg_arp_tm_encode(Groundstation::GS_SYSTEM_ID, GS_COMPONENT_ID,
+                              &msg, &tm);
 
     getModule<HubBase>()->dispatchIncomingMsg(msg);
 }