diff --git a/on-device/libs/boardcore b/on-device/libs/boardcore
index be57486527b197af264399c62018b6534f6a4be6..cb5de30f6bfe9a6cd27fa6adedda167000a9244c 160000
--- a/on-device/libs/boardcore
+++ b/on-device/libs/boardcore
@@ -1 +1 @@
-Subproject commit be57486527b197af264399c62018b6534f6a4be6
+Subproject commit cb5de30f6bfe9a6cd27fa6adedda167000a9244c
diff --git a/on-host/Cargo.lock b/on-host/Cargo.lock
index 768579ed8f628560821b6bbcbfb028d82d25ffc2..a1406f828b8a76e60983545ecd419933e5142448 100644
--- a/on-host/Cargo.lock
+++ b/on-host/Cargo.lock
@@ -733,7 +733,7 @@ dependencies = [
 [[package]]
 name = "skyward_mavlink"
 version = "0.1.0"
-source = "git+https://git.skywarder.eu/avn/swd/mavlink/mavlink-skyward-lib.git?branch=lyra-gs#58f269163b0564db9e4f0b76662667e776df98c0"
+source = "git+https://git.skywarder.eu/avn/swd/mavlink/mavlink-skyward-lib.git?branch=main#ce83ce010ef39c922e040442f34c07fe5b484045"
 dependencies = [
  "bitflags 2.5.0",
  "mavlink-bindgen",
diff --git a/on-host/Cargo.toml b/on-host/Cargo.toml
index f5434052470c6e68ce6f1eefda34846cbceb8480..c114893e1a322b6da060c6cd9293f050acc32034 100644
--- a/on-host/Cargo.toml
+++ b/on-host/Cargo.toml
@@ -15,7 +15,7 @@ simple_logger = { version = "4.3.3", features = ["colors"] }
 
 [dependencies.skyward_mavlink]
 git = "https://git.skywarder.eu/avn/swd/mavlink/mavlink-skyward-lib.git"
-branch = "lyra-gs"
+branch = "main"
 features = ["serde", "lyra"]
 
 [dependencies.tdl-core]