diff --git a/Cargo.lock b/Cargo.lock
index 5a1c753..bd44e97 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -278,7 +278,7 @@ dependencies = [
  "arboard",
  "base64",
  "clap",
- "client",
+ "client 0.1.0 (git+https://github.com/logos-messaging/libchat?rev=39bf26756448dd16ddff89a6c0054f79236494aa)",
  "crossterm 0.29.0",
  "ratatui",
  "serde",
@@ -300,14 +300,26 @@ dependencies = [
 name = "chat-sqlite"
 version = "0.1.0"
 dependencies = [
- "crypto",
+ "crypto 0.1.0",
  "hex",
  "rusqlite",
- "storage",
+ "storage 0.1.0",
  "tempfile",
  "zeroize",
 ]
 
+[[package]]
+name = "chat-sqlite"
+version = "0.1.0"
+source = "git+https://github.com/logos-messaging/libchat?rev=39bf26756448dd16ddff89a6c0054f79236494aa#39bf26756448dd16ddff89a6c0054f79236494aa"
+dependencies = [
+ "crypto 0.1.0 (git+https://github.com/logos-messaging/libchat?rev=39bf26756448dd16ddff89a6c0054f79236494aa)",
+ "hex",
+ "rusqlite",
+ "storage 0.1.0 (git+https://github.com/logos-messaging/libchat?rev=39bf26756448dd16ddff89a6c0054f79236494aa)",
+ "zeroize",
+]
+
 [[package]]
 name = "cipher"
 version = "0.4.4"
@@ -363,19 +375,29 @@ checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
 name = "client"
 version = "0.1.0"
 dependencies = [
- "chat-sqlite",
+ "chat-sqlite 0.1.0",
  "components",
- "libchat",
+ "libchat 0.1.0",
  "tempfile",
  "thiserror",
 ]
 
+[[package]]
+name = "client"
+version = "0.1.0"
+source = "git+https://github.com/logos-messaging/libchat?rev=39bf26756448dd16ddff89a6c0054f79236494aa#39bf26756448dd16ddff89a6c0054f79236494aa"
+dependencies = [
+ "chat-sqlite 0.1.0 (git+https://github.com/logos-messaging/libchat?rev=39bf26756448dd16ddff89a6c0054f79236494aa)",
+ "libchat 0.1.0 (git+https://github.com/logos-messaging/libchat?rev=39bf26756448dd16ddff89a6c0054f79236494aa)",
+ "thiserror",
+]
+
 [[package]]
 name = "client-ffi"
 version = "0.1.0"
 dependencies = [
- "client",
- "libchat",
+ "client 0.1.0",
+ "libchat 0.1.0",
  "safer-ffi",
 ]
 
@@ -412,10 +434,10 @@ dependencies = [
 name = "components"
 version = "0.1.0"
 dependencies = [
- "crypto",
+ "crypto 0.1.0",
  "hex",
- "libchat",
- "storage",
+ "libchat 0.1.0",
+ "storage 0.1.0",
 ]
 
 [[package]]
@@ -551,6 +573,22 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "crypto"
+version = "0.1.0"
+source = "git+https://github.com/logos-messaging/libchat?rev=39bf26756448dd16ddff89a6c0054f79236494aa#39bf26756448dd16ddff89a6c0054f79236494aa"
+dependencies = [
+ "ed25519-dalek",
+ "generic-array 1.3.5",
+ "hkdf",
+ "rand_core 0.6.4",
+ "sha2",
+ "thiserror",
+ "x25519-dalek",
+ "xeddsa",
+ "zeroize",
+]
+
 [[package]]
 name = "crypto-bigint"
 version = "0.5.5"
@@ -725,18 +763,35 @@ version = "0.0.1"
 dependencies = [
  "blake2",
  "chacha20poly1305",
- "chat-sqlite",
+ "chat-sqlite 0.1.0",
  "hkdf",
  "rand 0.9.4",
  "rand_core 0.6.4",
  "serde",
- "storage",
+ "storage 0.1.0",
  "tempfile",
  "thiserror",
  "x25519-dalek",
  "zeroize",
 ]
 
+[[package]]
+name = "double-ratchets"
+version = "0.0.1"
+source = "git+https://github.com/logos-messaging/libchat?rev=39bf26756448dd16ddff89a6c0054f79236494aa#39bf26756448dd16ddff89a6c0054f79236494aa"
+dependencies = [
+ "blake2",
+ "chacha20poly1305",
+ "hkdf",
+ "rand 0.9.4",
+ "rand_core 0.6.4",
+ "serde",
+ "storage 0.1.0 (git+https://github.com/logos-messaging/libchat?rev=39bf26756448dd16ddff89a6c0054f79236494aa)",
+ "thiserror",
+ "x25519-dalek",
+ "zeroize",
+]
+
 [[package]]
 name = "ecdsa"
 version = "0.16.9"
@@ -1328,10 +1383,10 @@ dependencies = [
 name = "integration_tests_core"
 version = "0.1.0"
 dependencies = [
- "chat-sqlite",
+ "chat-sqlite 0.1.0",
  "components",
- "libchat",
- "storage",
+ "libchat 0.1.0",
+ "storage 0.1.0",
  "tempfile",
 ]
 
@@ -1419,10 +1474,10 @@ dependencies = [
  "base64",
  "blake2",
  "chat-proto",
- "chat-sqlite",
+ "chat-sqlite 0.1.0",
  "components",
- "crypto",
- "double-ratchets",
+ "crypto 0.1.0",
+ "double-ratchets 0.0.1",
  "hex",
  "openmls",
  "openmls_libcrux_crypto 0.3.1",
@@ -1430,12 +1485,34 @@ dependencies = [
  "prost",
  "rand_core 0.6.4",
  "safer-ffi",
- "storage",
+ "storage 0.1.0",
  "tempfile",
  "thiserror",
  "x25519-dalek",
 ]
 
+[[package]]
+name = "libchat"
+version = "0.1.0"
+source = "git+https://github.com/logos-messaging/libchat?rev=39bf26756448dd16ddff89a6c0054f79236494aa#39bf26756448dd16ddff89a6c0054f79236494aa"
+dependencies = [
+ "base64",
+ "blake2",
+ "chat-proto",
+ "chat-sqlite 0.1.0 (git+https://github.com/logos-messaging/libchat?rev=39bf26756448dd16ddff89a6c0054f79236494aa)",
+ "crypto 0.1.0 (git+https://github.com/logos-messaging/libchat?rev=39bf26756448dd16ddff89a6c0054f79236494aa)",
+ "double-ratchets 0.0.1 (git+https://github.com/logos-messaging/libchat?rev=39bf26756448dd16ddff89a6c0054f79236494aa)",
+ "hex",
+ "openmls",
+ "openmls_traits 0.5.0",
+ "prost",
+ "rand_core 0.6.4",
+ "safer-ffi",
+ "storage 0.1.0 (git+https://github.com/logos-messaging/libchat?rev=39bf26756448dd16ddff89a6c0054f79236494aa)",
+ "thiserror",
+ "x25519-dalek",
+]
+
 [[package]]
 name = "libcrux-aead"
 version = "0.0.6"
@@ -2919,7 +2996,16 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 name = "storage"
 version = "0.1.0"
 dependencies = [
- "crypto",
+ "crypto 0.1.0",
+ "thiserror",
+]
+
+[[package]]
+name = "storage"
+version = "0.1.0"
+source = "git+https://github.com/logos-messaging/libchat?rev=39bf26756448dd16ddff89a6c0054f79236494aa#39bf26756448dd16ddff89a6c0054f79236494aa"
+dependencies = [
+ "crypto 0.1.0 (git+https://github.com/logos-messaging/libchat?rev=39bf26756448dd16ddff89a6c0054f79236494aa)",
  "thiserror",
 ]
 
diff --git a/bin/chat-cli/Cargo.toml b/bin/chat-cli/Cargo.toml
index 8a7b784..3cfd90b 100644
--- a/bin/chat-cli/Cargo.toml
+++ b/bin/chat-cli/Cargo.toml
@@ -8,7 +8,8 @@ name = "chat-cli"
 path = "src/main.rs"
 
 [dependencies]
-client = { path = "../../crates/client" }
+# Reference a specific commit so updates to the Core does not break examples
+client = { git = "https://github.com/logos-messaging/libchat", rev = "39bf26756448dd16ddff89a6c0054f79236494aa" }
 
 ratatui = "0.29"
 crossterm = "0.29"