diff --git a/client/Cargo.lock b/client/Cargo.lock
index 282f86ca..d548e1fb 100644
--- a/client/Cargo.lock
+++ b/client/Cargo.lock
@@ -994,7 +994,8 @@ dependencies = [
 [[package]]
 name = "bevy_ggrs"
 version = "0.17.0"
-source = "git+https://github.com/johanhelsing/bevy_ggrs.git?branch=bevy-0.15#80dd3a51ca57fce594c9704fe50ce5eafc09949e"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03bffc1632fc3b2256f057804e97e027cc7ce7c28ecd90505c00cb36ae2caedd"
 dependencies = [
  "bevy",
  "disqualified",
@@ -1214,7 +1215,8 @@ dependencies = [
 [[package]]
 name = "bevy_matchbox"
 version = "0.11.0"
-source = "git+https://github.com/haihala/matchbox.git#d9e3d42233a1c6104e32e8ad1f5a52201db75a24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5249643ec4d454678835d626b75a063a3a69f853fc5cbcc2f48b9d6d80e133a7"
 dependencies = [
  "bevy",
  "cfg-if",
@@ -3036,8 +3038,9 @@ dependencies = [
 
 [[package]]
 name = "ggrs"
-version = "0.10.2"
-source = "git+https://github.com/gschup/ggrs#0b02389eb8d1039f6c14a2b699855808a89b888c"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6961c572ec0692fd73a31f335db5e8b92b165c4d43e180ae0aaa64411d9baeb9"
 dependencies = [
  "bincode",
  "bitfield-rle",
@@ -3047,6 +3050,7 @@ dependencies = [
  "parking_lot",
  "rand",
  "serde",
+ "tracing",
 ]
 
 [[package]]
@@ -3867,8 +3871,9 @@ dependencies = [
 
 [[package]]
 name = "matchbox_protocol"
-version = "0.10.0"
-source = "git+https://github.com/haihala/matchbox.git#d9e3d42233a1c6104e32e8ad1f5a52201db75a24"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f041eb5118e0b41b24d2d77c7054f78bd71cd5989c1acde26a147a1528719714"
 dependencies = [
  "cfg-if",
  "derive_more",
@@ -3878,8 +3883,9 @@ dependencies = [
 
 [[package]]
 name = "matchbox_socket"
-version = "0.10.0"
-source = "git+https://github.com/haihala/matchbox.git#d9e3d42233a1c6104e32e8ad1f5a52201db75a24"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbe6e951ae32d3c7f6d137babb3f7ff00a1756943b1fc566575aac55a63c7cbd"
 dependencies = [
  "async-compat",
  "async-trait",
@@ -3901,6 +3907,7 @@ dependencies = [
  "serde-wasm-bindgen",
  "serde_json",
  "thiserror 2.0.7",
+ "tokio-util",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -5960,6 +5967,7 @@ checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
 dependencies = [
  "bytes",
  "futures-core",
+ "futures-io",
  "futures-sink",
  "pin-project-lite",
  "tokio",
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 5b867502..6b6b9f4b 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -1,12 +1,12 @@
 [workspace]
 resolver = "2"
 members = [
-    "characters",
-    "input_parsing",
-    "lib",
-    "main",
-    "player_state",
-    "foundation",
+  "characters",
+  "input_parsing",
+  "lib",
+  "main",
+  "player_state",
+  "foundation",
 ]
 
 [profile.dev]
@@ -19,10 +19,8 @@ opt-level = 3
 [workspace.dependencies]
 bevy = "0.15"
 bevy-inspector-egui = "0.28"
-bevy_matchbox = { git = "https://github.com/haihala/matchbox.git", features = [
-    "ggrs",
-] }
-bevy_ggrs = { git = "https://github.com/johanhelsing/bevy_ggrs.git", branch = "bevy-0.15" }
+bevy_matchbox = { version = "0.11", features = ["ggrs"] }
+bevy_ggrs = "0.17"
 
 rand = "0.8"
 strum = "0.26"
diff --git a/client/lib/src/networking.rs b/client/lib/src/networking.rs
index ad2f9412..ff202b88 100644
--- a/client/lib/src/networking.rs
+++ b/client/lib/src/networking.rs
@@ -155,13 +155,12 @@ fn setup_socket(mut commands: Commands) {
     info!("connecting to matchbox server: {room_url}");
     let sock = WebRtcSocketBuilder::new(room_url)
         .add_reliable_channel()
-        .add_ggrs_channel()
         .build();
     commands.insert_resource(MatchboxSocket::from(sock));
 }
 
 fn teardown(mut commands: Commands) {
-    commands.remove_resource::<MatchboxSocket<MultipleChannels>>();
+    commands.remove_resource::<MatchboxSocket>();
     commands.remove_resource::<bevy_ggrs::Session<Config>>();
     commands.remove_resource::<bevy_ggrs::LocalInputs<Config>>();
 
@@ -183,7 +182,7 @@ enum ConnectionState {
 fn wait_for_players(
     mut commands: Commands,
     mut connection_state: Local<ConnectionState>,
-    mut socket: ResMut<MatchboxSocket<MultipleChannels>>,
+    mut socket: ResMut<MatchboxSocket>,
     local_character: Res<LocalCharacter>,
     local_controls: Res<LocalController>,
     args: Res<WagArgs>,