diff --git a/Cargo.lock b/Cargo.lock
index 495b0e9d..3f91cc56 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -767,19 +767,6 @@ dependencies = [
  "cmake",
 ]
 
-[[package]]
-name = "bugsalot"
-version = "0.2.2"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "bugsalot"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc12a55e9bd3840279c248c96ecf541d5ba98d6654e08869fe167121384a582c"
-
 [[package]]
 name = "bugsalot"
 version = "0.2.2"
@@ -1261,7 +1248,6 @@ dependencies = [
  "ciborium",
  "clap 3.2.25",
  "criterion-plot",
- "futures",
  "itertools",
  "lazy_static",
  "num-traits",
@@ -2883,7 +2869,6 @@ dependencies = [
 name = "keyvaluedb-web"
 version = "0.1.0"
 dependencies = [
- "async-lock",
  "console_log",
  "flume",
  "futures",
@@ -6049,7 +6034,7 @@ version = "0.1.0"
 dependencies = [
  "async-std",
  "async-tungstenite 0.8.0",
- "bugsalot 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bugsalot",
  "capnp",
  "capnp-rpc",
  "capnpc",
@@ -6091,7 +6076,7 @@ dependencies = [
  "async_executors",
  "backtrace",
  "blake3",
- "bugsalot 0.2.2 (git+https://github.com/crioux/bugsalot.git)",
+ "bugsalot",
  "capnp",
  "capnpc",
  "cfg-if 1.0.0",
@@ -6215,7 +6200,7 @@ dependencies = [
  "async-std",
  "async-tungstenite 0.22.1",
  "backtrace",
- "bugsalot 0.2.2",
+ "bugsalot",
  "capnp",
  "capnp-rpc",
  "capnpc",
diff --git a/external/keyvaluedb b/external/keyvaluedb
index 9bb05a54..3408e0b2 160000
--- a/external/keyvaluedb
+++ b/external/keyvaluedb
@@ -1 +1 @@
-Subproject commit 9bb05a54b4c0278a289841b2bf7c1749aa0fbd5d
+Subproject commit 3408e0b2ae3df0088e0714bc23fb33c82a58e22c
diff --git a/veilid-cli/Cargo.toml b/veilid-cli/Cargo.toml
index 3a9ad7b6..ce11242e 100644
--- a/veilid-cli/Cargo.toml
+++ b/veilid-cli/Cargo.toml
@@ -38,7 +38,7 @@ cfg-if = "^1"
 capnp = "^0"
 capnp-rpc = "^0"
 config = { version = "^0", features = ["yaml"] }
-bugsalot = "^0"
+bugsalot = { git = "https://github.com/crioux/bugsalot.git" }
 flexi_logger = { version = "^0", features = ["use_chrono_for_offset"] }
 thiserror = "^1"
 crossbeam-channel = "^0"
diff --git a/veilid-server/Cargo.toml b/veilid-server/Cargo.toml
index 11c54918..977e55a1 100644
--- a/veilid-server/Cargo.toml
+++ b/veilid-server/Cargo.toml
@@ -52,7 +52,7 @@ futures-util = { version = "^0", default_features = false, features = ["alloc"]
 url = "^2"
 ctrlc = "^3"
 lazy_static = "^1"
-bugsalot = { path = "../../bugsalot" }
+bugsalot = { git = "https://github.com/crioux/bugsalot.git" }
 flume = { version = "^0", features = ["async"] }
 rpassword = "^6"
 hostname = "^0"