diff --git a/services/identity/Cargo.lock b/services/identity/Cargo.lock
--- a/services/identity/Cargo.lock
+++ b/services/identity/Cargo.lock
@@ -4507,6 +4507,7 @@
 dependencies = [
  "serde",
  "serde_json",
+ "websocket_messages",
 ]
 
 [[package]]
@@ -4829,6 +4830,14 @@
  "rustls-webpki 0.100.3",
 ]
 
+[[package]]
+name = "websocket_messages"
+version = "0.1.0"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "which"
 version = "4.4.2"
diff --git a/services/tunnelbroker/Cargo.lock b/services/tunnelbroker/Cargo.lock
--- a/services/tunnelbroker/Cargo.lock
+++ b/services/tunnelbroker/Cargo.lock
@@ -2781,6 +2781,7 @@
 dependencies = [
  "serde",
  "serde_json",
+ "websocket_messages",
 ]
 
 [[package]]
@@ -2983,6 +2984,14 @@
  "rustls-webpki",
 ]
 
+[[package]]
+name = "websocket_messages"
+version = "0.1.0"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "which"
 version = "4.4.0"
diff --git a/shared/tunnelbroker_messages/Cargo.lock b/shared/tunnelbroker_messages/Cargo.lock
--- a/shared/tunnelbroker_messages/Cargo.lock
+++ b/shared/tunnelbroker_messages/Cargo.lock
@@ -80,6 +80,7 @@
 dependencies = [
  "serde",
  "serde_json",
+ "websocket_messages",
 ]
 
 [[package]]
@@ -87,3 +88,11 @@
 version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+
+[[package]]
+name = "websocket_messages"
+version = "0.1.0"
+dependencies = [
+ "serde",
+ "serde_json",
+]
diff --git a/shared/tunnelbroker_messages/Cargo.toml b/shared/tunnelbroker_messages/Cargo.toml
--- a/shared/tunnelbroker_messages/Cargo.toml
+++ b/shared/tunnelbroker_messages/Cargo.toml
@@ -8,3 +8,4 @@
 [dependencies]
 serde = { version = "1.0.160", features = [ "derive" ] }
 serde_json = "1.0.96"
+websocket_messages = { path = "../websocket_messages" }
diff --git a/shared/tunnelbroker_messages/src/messages/mod.rs b/shared/tunnelbroker_messages/src/messages/mod.rs
--- a/shared/tunnelbroker_messages/src/messages/mod.rs
+++ b/shared/tunnelbroker_messages/src/messages/mod.rs
@@ -1,7 +1,5 @@
 //! Messages sent between Tunnelbroker and a device.
 
-pub mod connection_initialization_response;
-pub mod heartbeat;
 pub mod keys;
 pub mod message_receive_confirmation;
 pub mod message_to_device;
@@ -9,14 +7,15 @@
 pub mod message_to_device_request_status;
 pub mod session;
 
-pub use connection_initialization_response::*;
-pub use heartbeat::*;
 pub use keys::*;
 pub use message_receive_confirmation::*;
 pub use message_to_device::*;
 pub use message_to_device_request::*;
 pub use message_to_device_request_status::*;
 pub use session::*;
+pub use websocket_messages::{
+  ConnectionInitializationResponse, ConnectionInitializationStatus, Heartbeat,
+};
 
 use serde::{Deserialize, Serialize};
 
diff --git a/shared/websocket_messages/.gitignore b/shared/websocket_messages/.gitignore
new file mode 100644
--- /dev/null
+++ b/shared/websocket_messages/.gitignore
@@ -0,0 +1 @@
+target/
diff --git a/shared/tunnelbroker_messages/Cargo.lock b/shared/websocket_messages/Cargo.lock
copy from shared/tunnelbroker_messages/Cargo.lock
copy to shared/websocket_messages/Cargo.lock
--- a/shared/tunnelbroker_messages/Cargo.lock
+++ b/shared/websocket_messages/Cargo.lock
@@ -4,48 +4,48 @@
 
 [[package]]
 name = "itoa"
-version = "1.0.6"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.56"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.26"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.13"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
 
 [[package]]
 name = "serde"
-version = "1.0.160"
+version = "1.0.195"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
+checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.160"
+version = "1.0.195"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
+checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -54,9 +54,9 @@
 
 [[package]]
 name = "serde_json"
-version = "1.0.96"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"
 dependencies = [
  "itoa",
  "ryu",
@@ -65,9 +65,9 @@
 
 [[package]]
 name = "syn"
-version = "2.0.15"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -75,15 +75,15 @@
 ]
 
 [[package]]
-name = "tunnelbroker_messages"
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "websocket_messages"
 version = "0.1.0"
 dependencies = [
  "serde",
  "serde_json",
 ]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
diff --git a/shared/tunnelbroker_messages/Cargo.toml b/shared/websocket_messages/Cargo.toml
copy from shared/tunnelbroker_messages/Cargo.toml
copy to shared/websocket_messages/Cargo.toml
--- a/shared/tunnelbroker_messages/Cargo.toml
+++ b/shared/websocket_messages/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "tunnelbroker_messages"
+name = "websocket_messages"
 version = "0.1.0"
 edition = "2021"
 
diff --git a/shared/websocket_messages/src/lib.rs b/shared/websocket_messages/src/lib.rs
new file mode 100644
--- /dev/null
+++ b/shared/websocket_messages/src/lib.rs
@@ -0,0 +1,3 @@
+pub mod messages;
+
+pub use messages::*;
diff --git a/shared/tunnelbroker_messages/src/messages/connection_initialization_response.rs b/shared/websocket_messages/src/messages/connection_initialization_response.rs
rename from shared/tunnelbroker_messages/src/messages/connection_initialization_response.rs
rename to shared/websocket_messages/src/messages/connection_initialization_response.rs
diff --git a/shared/tunnelbroker_messages/src/messages/heartbeat.rs b/shared/websocket_messages/src/messages/heartbeat.rs
rename from shared/tunnelbroker_messages/src/messages/heartbeat.rs
rename to shared/websocket_messages/src/messages/heartbeat.rs
diff --git a/shared/websocket_messages/src/messages/mod.rs b/shared/websocket_messages/src/messages/mod.rs
new file mode 100644
--- /dev/null
+++ b/shared/websocket_messages/src/messages/mod.rs
@@ -0,0 +1,5 @@
+pub mod connection_initialization_response;
+pub mod heartbeat;
+
+pub use connection_initialization_response::*;
+pub use heartbeat::*;