diff --git a/on-host/Cargo.lock b/on-host/Cargo.lock
index 855a08314b03155647e41fc1c3c331638d06705c..f2c02f31d901104fc90b410f3bbdc790de880555 100644
--- a/on-host/Cargo.lock
+++ b/on-host/Cargo.lock
@@ -400,7 +400,7 @@ dependencies = [
 [[package]]
 name = "mavlink-bindgen"
 version = "0.1.0"
-source = "git+https://github.com/mavlink/rust-mavlink.git?rev=ad39b2847e84ec2ec17fa5c1b551b8db05f28243#ad39b2847e84ec2ec17fa5c1b551b8db05f28243"
+source = "git+https://github.com/mavlink/rust-mavlink.git?rev=8d61f75ac4a5bf04cd9401d9073244118117db5f#8d61f75ac4a5bf04cd9401d9073244118117db5f"
 dependencies = [
  "crc-any",
  "lazy_static",
@@ -413,7 +413,7 @@ dependencies = [
 [[package]]
 name = "mavlink-core"
 version = "0.12.2"
-source = "git+https://github.com/mavlink/rust-mavlink.git?rev=ad39b2847e84ec2ec17fa5c1b551b8db05f28243#ad39b2847e84ec2ec17fa5c1b551b8db05f28243"
+source = "git+https://github.com/mavlink/rust-mavlink.git?rev=8d61f75ac4a5bf04cd9401d9073244118117db5f#8d61f75ac4a5bf04cd9401d9073244118117db5f"
 dependencies = [
  "byteorder",
  "crc-any",
@@ -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=rust#41efbf48be8f7cad475a00c66b7abe40b5a0866b"
+source = "git+https://git.skywarder.eu/avn/swd/mavlink/mavlink-skyward-lib.git?branch=main#b4c2b98d38a0d15049b7fc9afcfb615aea2403a1"
 dependencies = [
  "bitflags 2.5.0",
  "mavlink-bindgen",
diff --git a/on-host/Cargo.toml b/on-host/Cargo.toml
index 2706e7c08996ba4359331c81e9b1f3c1e71eee9d..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 = "rust"
+branch = "main"
 features = ["serde", "lyra"]
 
 [dependencies.tdl-core]