diff --git a/Cargo.lock b/Cargo.lock
index 15b1264..d59504a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -952,6 +952,7 @@ dependencies = [
 [[package]]
 name = "bevy_matchbox"
 version = "0.6.0"
+source = "git+https://github.com/alepez/matchbox?branch=bevy-0.11#c3eafcc3158f04c35240875ac6003249104611a3"
 dependencies = [
  "bevy",
  "cfg-if 1.0.0",
@@ -2885,6 +2886,7 @@ dependencies = [
 [[package]]
 name = "matchbox_protocol"
 version = "0.6.0"
+source = "git+https://github.com/alepez/matchbox?branch=bevy-0.11#c3eafcc3158f04c35240875ac6003249104611a3"
 dependencies = [
  "cfg-if 1.0.0",
  "derive_more",
@@ -2895,6 +2897,7 @@ dependencies = [
 [[package]]
 name = "matchbox_socket"
 version = "0.6.1"
+source = "git+https://github.com/alepez/matchbox?branch=bevy-0.11#c3eafcc3158f04c35240875ac6003249104611a3"
 dependencies = [
  "async-compat",
  "async-trait",
diff --git a/Cargo.toml b/Cargo.toml
index fe3cb2d..009283c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ rand = "0.8"
 itertools = "0.10"
 bevy_ggrs = { git = "https://github.com/gschup/bevy_ggrs" }
 bytemuck = {version = "1.7", features=["derive"]}
-bevy_matchbox = { path = "../forks/matchbox/bevy_matchbox", features = ["ggrs"] }
+bevy_matchbox = { git = "https://github.com/alepez/matchbox", branch = "bevy-0.11", features = ["ggrs"] }
 cfg-if = "1.0"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
@@ -44,3 +44,7 @@ bevy = { version = "0.11", default-features = false, features = [
 once_cell = "1.8.0"
 parking_lot = "0.12"
 wasm-bindgen = "0.2"
+
+[patch.crates-io]
+ggrs = { git = "https://github.com/gschup/ggrs" }
+bevy_ggrs = { git = "https://github.com/gschup/bevy_ggrs" }