diff --git a/Cargo.lock b/Cargo.lock
index 706410f..7a04d9c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -122,7 +122,7 @@ dependencies = [
  "serde",
  "signal-hook",
  "slab",
- "socket2 0.4.9",
+ "socket2",
 ]
 
 [[package]]
@@ -166,7 +166,7 @@ dependencies = [
  "rustls",
  "serde",
  "signal-hook",
- "socket2 0.4.9",
+ "socket2",
  "sqlx",
  "tokio",
  "tokio-rustls",
@@ -243,7 +243,7 @@ dependencies = [
  "serde",
  "signal-hook",
  "slab",
- "socket2 0.4.9",
+ "socket2",
  "time",
  "tinytemplate",
 ]
@@ -282,7 +282,7 @@ dependencies = [
  "rand",
  "rand_distr",
  "serde",
- "socket2 0.4.9",
+ "socket2",
 ]
 
 [[package]]
@@ -324,7 +324,7 @@ dependencies = [
  "serde",
  "signal-hook",
  "slab",
- "socket2 0.4.9",
+ "socket2",
  "tungstenite",
 ]
 
@@ -1226,9 +1226,9 @@ dependencies = [
 
 [[package]]
 name = "glommio"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd6912e67cabcb397683537cadc80a38136fdea7702430ede1a43207940697a6"
+checksum = "ac1f09bf53139d5680da6325b4e79c6bc1518e94a65ab74df14b7e3693a8c78b"
 dependencies = [
  "ahash 0.7.6",
  "backtrace",
@@ -1246,7 +1246,6 @@ dependencies = [
  "libc",
  "lockfree",
  "log",
- "membarrier",
  "nix 0.23.2",
  "pin-project-lite",
  "rlimit",
@@ -1255,7 +1254,7 @@ dependencies = [
  "signal-hook",
  "sketches-ddsketch 0.1.3",
  "smallvec",
- "socket2 0.3.19",
+ "socket2",
  "tracing",
  "typenum",
 ]
@@ -1447,7 +1446,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.9",
+ "socket2",
  "tokio",
  "tower-service",
  "tracing",
@@ -1628,17 +1627,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb"
 
-[[package]]
-name = "membarrier"
-version = "0.2.2"
-source = "git+https://github.com/glommer/membarrier-rs.git?branch=issue-22#a79ea2d9b6e976b83b7fd709073cf977b1e47581"
-dependencies = [
- "cfg-if",
- "kernel32-sys",
- "lazy_static",
- "libc",
-]
-
 [[package]]
 name = "memchr"
 version = "2.5.0"
@@ -2613,17 +2601,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "socket2"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
-dependencies = [
- "cfg-if",
- "libc",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "socket2"
 version = "0.4.9"
@@ -2896,7 +2873,7 @@ dependencies = [
  "parking_lot 0.12.1",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.4.9",
+ "socket2",
  "tokio-macros",
  "windows-sys 0.45.0",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index e081fbd..46fbf51 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,9 +37,6 @@ aquatic_udp = { version = "0.2.0", path = "./aquatic_udp" }
 aquatic_ws_protocol = { version = "0.2.0", path = "./aquatic_ws_protocol" }
 aquatic_ws = { version = "0.2.0", path = "./aquatic_ws" }
 
-[patch.crates-io]
-membarrier = { git = "https://github.com/glommer/membarrier-rs.git", branch = "issue-22" }
-
 [profile.release]
 debug = false
 lto = "thin"
diff --git a/aquatic_common/Cargo.toml b/aquatic_common/Cargo.toml
index 2de3408..9998c38 100644
--- a/aquatic_common/Cargo.toml
+++ b/aquatic_common/Cargo.toml
@@ -35,7 +35,7 @@ simple_logger = { version = "4", features = ["stderr"] }
 toml = "0.5"
 
 # Optional
-glommio = { version = "0.7", optional = true }
+glommio = { version = "0.8", optional = true }
 hwloc = { version = "0.5", optional = true }
 rustls = { version = "0.20", optional = true }
 rustls-pemfile = { version = "1", optional = true }
diff --git a/aquatic_http/Cargo.toml b/aquatic_http/Cargo.toml
index 89be7df..daa5abe 100644
--- a/aquatic_http/Cargo.toml
+++ b/aquatic_http/Cargo.toml
@@ -32,7 +32,7 @@ either = "1"
 futures = "0.3"
 futures-lite = "1"
 futures-rustls = "0.22"
-glommio = "0.7"
+glommio = "0.8"
 itoa = "1"
 libc = "0.2"
 log = "0.4"
diff --git a/aquatic_http_load_test/Cargo.toml b/aquatic_http_load_test/Cargo.toml
index 5c0caf4..eb16d30 100644
--- a/aquatic_http_load_test/Cargo.toml
+++ b/aquatic_http_load_test/Cargo.toml
@@ -22,7 +22,7 @@ anyhow = "1"
 futures-lite = "1"
 futures-rustls = "0.22"
 hashbrown = "0.13"
-glommio = "0.7"
+glommio = "0.8"
 log = "0.4"
 mimalloc = { version = "0.1", default-features = false }
 rand = { version = "0.8", features = ["small_rng"] }
diff --git a/aquatic_ws/Cargo.toml b/aquatic_ws/Cargo.toml
index 6e35944..b13d1f4 100644
--- a/aquatic_ws/Cargo.toml
+++ b/aquatic_ws/Cargo.toml
@@ -32,7 +32,7 @@ cfg-if = "1"
 futures = "0.3"
 futures-lite = "1"
 futures-rustls = "0.22"
-glommio = "0.7"
+glommio = "0.8"
 hashbrown = { version = "0.13", features = ["serde"] }
 httparse = "1"
 log = "0.4"
diff --git a/aquatic_ws_load_test/Cargo.toml b/aquatic_ws_load_test/Cargo.toml
index 6fe7ead..8da34cd 100644
--- a/aquatic_ws_load_test/Cargo.toml
+++ b/aquatic_ws_load_test/Cargo.toml
@@ -22,7 +22,7 @@ anyhow = "1"
 async-tungstenite = "0.19"
 futures = "0.3"
 futures-rustls = "0.22"
-glommio = "0.7"
+glommio = "0.8"
 log = "0.4"
 mimalloc = { version = "0.1", default-features = false }
 rand = { version = "0.8", features = ["small_rng"] }