diff --git a/keyserver/addons/rust-node-addon/Cargo.toml b/keyserver/addons/rust-node-addon/Cargo.toml
index 2c7071fd9..2c66b9fc1 100644
--- a/keyserver/addons/rust-node-addon/Cargo.toml
+++ b/keyserver/addons/rust-node-addon/Cargo.toml
@@ -1,33 +1,34 @@
 [package]
-edition = "2021"
 name = "rust-node-addon"
 version = "0.1.0"
-license = "BSD-3-Clause"
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
 # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
 napi = { version = "2.10.1", default-features = false, features = [
   "napi4",
   "tokio_rt",
 ] }
 napi-derive = { version = "2.9.1", default-features = false }
 tonic = { version = "0.9.1", features = ["tls"]}
 tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
 tokio-stream = "0.1"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
 comm-opaque2 = {path = "../../../shared/comm-opaque2"}
 grpc_clients = { path = "../../../shared/grpc_clients" }
 lazy_static = "1.4"
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 
 [build-dependencies]
 napi-build = "2.0.1"
 regex = "1"
 
 [profile.release]
 lto = true
diff --git a/services/backup/Cargo.toml b/services/backup/Cargo.toml
index 557005e69..d0db40dfc 100644
--- a/services/backup/Cargo.toml
+++ b/services/backup/Cargo.toml
@@ -1,40 +1,40 @@
 [package]
 name = "backup"
 version = "0.1.0"
 description = "Backup service"
-homepage = "https://comm.app"
-license = "BSD-3-Clause"
-edition = "2021"
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
 
 [dependencies]
 anyhow = "1.0"
 async-stream = "0.3"
 aws-config = "0.55"
 aws-sdk-dynamodb = "0.27"
 aws-types = "0.55"
 chrono = "0.4.31"
 clap = { version = "4.0", features = ["derive", "env"] }
 comm-lib = { path = "../../shared/comm-lib", features = [
   "http",
   "blob-client",
   "aws",
   "grpc_clients",
 ] }
 once_cell = "1.17"
 tokio = { version = "1.24", features = ["rt-multi-thread", "macros"] }
 tokio-stream = "0.1"
 tracing = "0.1"
 tracing-futures = { version = "0.2", features = ["futures-03"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 uuid = { version = "1.2", features = ["v4"] }
 actix-web = "4.3"
 tracing-actix-web = "0.7.3"
 reqwest = "0.11.18"
 derive_more = "0.99"
 actix-multipart = "0.6"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0" }
 actix-web-actors = "4.2.0"
 actix = "0.13.1"
 actix-http = "3.4.0"
 bincode = "1.3.3"
diff --git a/services/blob/Cargo.toml b/services/blob/Cargo.toml
index e45854793..da2b71c44 100644
--- a/services/blob/Cargo.toml
+++ b/services/blob/Cargo.toml
@@ -1,37 +1,37 @@
 [package]
 name = "blob"
-description = "Blob service"
-homepage = "https://comm.app"
-license = "BSD-3-Clause"
 version = "1.0.0"
-edition = "2021"
+description = "Blob service"
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
 
 [dependencies]
 actix-multipart = "0.6"
 actix-web = "4.3"
 anyhow = "1.0"
 async-stream = "0.3"
 aws-config = "0.55"
 aws-sdk-dynamodb = "0.27"
 aws-sdk-s3 = "0.27"
 chrono = "0.4.31"
 clap = { version = "4.0", features = ["derive", "env"] }
 comm-lib = { path = "../../shared/comm-lib", features = [
   "http",
   "aws",
   "grpc_clients",
 ] }
 derive_more = "0.99"
 http = "0.2"
 once_cell = "1.17"
 prost = "0.11"
 regex = "1.10.3"
 serde = { version = "1.0", features = ["derive"] }
 tokio = { version = "1.24", features = ["rt-multi-thread"] }
 tokio-stream = "0.1"
 tonic = "0.8"
 tracing = "0.1"
 tracing-actix-web = "0.7.3"
 tracing-futures = { version = "0.2", features = ["futures-03"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 serde_json = "1.0.95"
diff --git a/services/commtest/Cargo.toml b/services/commtest/Cargo.toml
index f8528659c..f1d116605 100644
--- a/services/commtest/Cargo.toml
+++ b/services/commtest/Cargo.toml
@@ -1,35 +1,36 @@
 [package]
 name = "commtest"
 version = "0.1.0"
-edition = "2021"
-license = "BSD-3-Clause"
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
 
 [dependencies]
 comm-opaque2 = { path = "../../shared/comm-opaque2" }
 grpc_clients = { path = "../../shared/grpc_clients" }
 backup_client = { path = "../../shared/backup_client" }
 base64 = "0.21.2"
 ed25519-dalek = "1"
 tonic = "0.8"
 tokio = { version = "1.24", features = ["macros", "rt-multi-thread"] }
 prost = "0.11"
 async-stream = "0.3.2"
 derive_more = "0.99.16"
 bytesize = "1.1.0"
 lazy_static = "1.4.0"
 num_cpus = "1.13.1"
 sha2 = "0.10.2"
 hex = "0.4.3"
 tokio-tungstenite = "0.18.0"
 tunnelbroker_messages = { path = "../../shared/tunnelbroker_messages" }
 url = "2.3.1"
 futures-util = "0.3.28"
 serde_json = "1.0.96"
 rand = "0.7.3"
 reqwest = { version = "0.11", features = ["json", "multipart", "stream"] }
 serde = "1.0"
 comm-lib = { path = "../../shared/comm-lib" }
 uuid = { version = "1.2", features = ["v4"] }
 
 [build-dependencies]
 tonic-build = "0.8"
diff --git a/services/feature-flags/Cargo.toml b/services/feature-flags/Cargo.toml
index 70283cb4f..31f28c70a 100644
--- a/services/feature-flags/Cargo.toml
+++ b/services/feature-flags/Cargo.toml
@@ -1,25 +1,25 @@
 [package]
 name = "feature-flags"
-description = "Feature Flags service"
-homepage = "https://comm.app"
-license = "BSD-3-Clause"
 version = "0.1.0"
-edition = "2021"
+description = "Feature Flags service"
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
 
 [dependencies]
 actix-web = "4.3"
 anyhow = "1.0"
 aws-config = "0.55"
 aws-types = "0.55"
 aws-sdk-dynamodb = "0.27"
 clap = { version = "4.0", features = ["derive", "env"] }
 comm-lib = { path = "../../shared/comm-lib", features = [
   "aws",
   "grpc_clients",
 ] }
 http = "0.2"
 once_cell = "1.17"
 serde = { version = "1.0", features = ["derive"] }
 tokio = { version = "1.24", features = ["rt-multi-thread", "macros"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
diff --git a/services/identity/Cargo.toml b/services/identity/Cargo.toml
index 776961826..e26ce05e4 100644
--- a/services/identity/Cargo.toml
+++ b/services/identity/Cargo.toml
@@ -1,46 +1,47 @@
 [package]
 name = "identity"
 version = "0.1.0"
-edition = "2021"
-license = "BSD-3-Clause"
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
 
 [dependencies]
 tonic = "0.9.1"
 prost = "0.11"
 futures-util = "0.3"
 tokio = { version = "1.24", features = ["macros", "rt-multi-thread"] }
 ed25519-dalek = "1"
 clap = { version = "4.4", features = ["derive", "env"] }
 derive_more = "0.99"
 comm-lib = { path = "../../shared/comm-lib", features = [
   "aws",
   "grpc_clients",
 ] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
 chrono = "0.4.31"
 rand = "0.8"
 constant_time_eq = "0.2.2"
 siwe = "0.3"
 comm-opaque2 = { path = "../../shared/comm-opaque2" }
 grpc_clients = { path = "../../shared/grpc_clients" }
 hyper = "0.14"
 hyper-tungstenite = "0.11"
 once_cell = "1.17"
 hex = "0.4"
 tonic-web = "0.9.1"
 serde = { version = "1.0.159", features = ["derive"] }
 serde_json = "1.0.95"
 tunnelbroker_messages = { path = "../../shared/tunnelbroker_messages" }
 identity_search_messages = { path = "../../shared/identity_search_messages" }
 uuid = { version = "1.3", features = ["v4"] }
 base64 = "0.21.2"
 regex = "1"
 tower-http = { version = "0.4", features = ["cors"] }
 http = "0.2"
 reqwest = { version = "0.11", features = ["json"] }
 futures = "0.3.30"
 url = "2.5"
 
 [build-dependencies]
 tonic-build = "0.9.1"
diff --git a/services/reports/Cargo.toml b/services/reports/Cargo.toml
index f25361e0b..40616abc1 100644
--- a/services/reports/Cargo.toml
+++ b/services/reports/Cargo.toml
@@ -1,39 +1,39 @@
 [package]
 name = "reports"
-description = "reports service"
-homepage = "https://comm.app"
-license = "BSD-3-Clause"
 version = "0.1.0"
-edition = "2021"
+description = "reports service"
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
 
 [dependencies]
 actix-web = "4.3"
 anyhow = "1.0"
 aws-config = "0.55"
 aws-sdk-dynamodb = "0.27"
 chrono = { version = "0.4.31", features = ["serde"] }
 clap = { version = "4.0", features = ["derive", "env"] }
 comm-lib = { path = "../../shared/comm-lib", features = [
   "blob-client",
   "http",
   "crypto",
   "aws",
   "grpc_clients",
 ] }
 derive_more = "0.99"
 http = "0.2"
 maud = "0.25"
 num-traits = "0.2"
 num-derive = "0.4"
 once_cell = "1.17"
 postmark = { version = "0.8", features = ["reqwest"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_repr = "0.1"
 tokio = { version = "1.32", features = ["macros", "rt-multi-thread"] }
 tokio-stream = "0.1"
 tracing = "0.1"
 tracing-log = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 tracing-actix-web = "0.7.3"
 uuid = { version = "1.2", features = ["v4"] }
diff --git a/services/tunnelbroker/Cargo.toml b/services/tunnelbroker/Cargo.toml
index 6f6615cac..7f64ac746 100644
--- a/services/tunnelbroker/Cargo.toml
+++ b/services/tunnelbroker/Cargo.toml
@@ -1,35 +1,35 @@
 [package]
 name = "tunnelbroker"
-description = "Tunnelbroker server"
-homepage = "https://comm.app"
-license = "BSD-3-Clause"
 version = "0.5.0"
-edition = "2021"
 links = "tunnelbroker"
+description = "Tunnelbroker server"
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
 
 [dependencies]
 anyhow = "1.0"
 clap = { version = "4.2", features = ["derive", "env"] }
 comm-lib = { path = "../../shared/comm-lib", features = [
   "aws",
   "grpc_clients",
 ] }
 futures-util = "0.3"
 grpc_clients = { path = "../../shared/grpc_clients" }
 hyper = "0.14"
 hyper-tungstenite = "0.11"
 once_cell = "1.17"
 prost = "0.11"
 serde_json = "1.0"
 tokio = { version = "1.24", features = ["rt-multi-thread"] }
 tonic = "0.8"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
 tunnelbroker_messages = { path = "../../shared/tunnelbroker_messages" }
 derive_more = "0.99.17"
 lapin = "2.2.1"
 chrono = "0.4.31"
 uuid = { version = "1.2", features = ["v4"] }
 
 [build-dependencies]
 tonic-build = "0.8"
diff --git a/shared/backup_client/Cargo.toml b/shared/backup_client/Cargo.toml
index bce0391f2..64238c161 100644
--- a/shared/backup_client/Cargo.toml
+++ b/shared/backup_client/Cargo.toml
@@ -1,37 +1,39 @@
 [package]
 name = "backup_client"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
 
 [dependencies]
 comm-lib = { path = "../comm-lib" }
 reqwest = { version = "0.11", default-features = false, features = [
   "multipart",
   "stream",
 ] }
 url = "2.3.1"
 derive_more = "0.99"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0" }
 async-stream = "0.3.2"
 sha2 = "0.10"
 hex = "0.4.3"
 tokio-tungstenite-wasm = "0.2.1"
 futures-util = "0.3"
 bincode = "1.3.3"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 tokio = "1.24"
 tokio-tungstenite = "0.20.1"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 comm-lib = { path = "../comm-lib", features = ["web"] }
 wasm-bindgen = "0.2"
 wasm-bindgen-futures = "0.4.39"
 serde-wasm-bindgen = "0.6.3"
 web-sys = { version = "0.3.68", features = ["Window"] }
 
 [features]
 default = ["native-tls"]
 native-tls = ["reqwest/native-tls", "tokio-tungstenite/native-tls"]
 rustls-tls-webpki-roots = ["reqwest/rustls-tls-webpki-roots", "tokio-tungstenite/rustls-tls-webpki-roots"]
diff --git a/shared/comm-lib/Cargo.toml b/shared/comm-lib/Cargo.toml
index 932c98995..c74b13df9 100644
--- a/shared/comm-lib/Cargo.toml
+++ b/shared/comm-lib/Cargo.toml
@@ -1,67 +1,68 @@
 [package]
 name = "comm-lib"
 version = "0.1.0"
-edition = "2021"
-license = "BSD-3-Clause"
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
 
 [features]
 blob-client = [
   "dep:bytes",
   "dep:reqwest",
   "dep:futures-core",
   "dep:futures-util",
 ]
 http = [
   "dep:actix-cors",
   "dep:actix-web",
   "dep:actix-multipart",
   "dep:futures-core",
   "dep:futures-util",
   "dep:http",
   "dep:tokio-stream",
   "dep:actix-web-httpauth",
 ]
 crypto = ["dep:aead", "dep:aes-gcm", "dep:bytes"]
 aws = ["dep:aws-config", "dep:aws-sdk-dynamodb", "dep:aws-sdk-secretsmanager"]
 grpc_clients = ["dep:grpc_clients"]
 web = ["uuid/js"]
 
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 base64 = "0.21"
 chrono = "0.4.31"
 constant_time_eq = "0.3"
 derive_more = "0.99"
 grpc_clients = { path = "../grpc_clients", optional = true }
 rand = "0.8"
 tokio = "1.32"
 tracing = "0.1"
 anyhow = "1.0.74"
 hex = "0.4"
 uuid = { version = "1.2", features = ["v4"] }
 sha2 = "0.10"
 # aws dependencies
 aws-config = { version = "0.55", optional = true }
 aws-sdk-dynamodb = { version = "0.27", optional = true }
 aws-sdk-secretsmanager = { version = "0.27", optional = true }
 # blob client dependencies
 bytes = { version = "1.4", optional = true }
 futures-core = { version = "0.3", optional = true }
 futures-util = { version = "0.3", optional = true }
 reqwest = { version = "0.11", features = [
   "json",
   "multipart",
   "stream",
 ], optional = true }
 # http dependencies
 actix-cors = { version = "0.6", optional = true }
 actix-web = { version = "4.3", optional = true }
 http = { version = "0.2.9", optional = true }
 actix-web-httpauth = { version = "0.8.0", optional = true }
 actix-multipart = { version = "0.6", optional = true }
 tokio-stream = { version = "0.1.14", optional = true }
 # crypto dependencies
 aes-gcm = { version = "0.10", optional = true }
 aead = { version = "0.5", features = ["bytes"], optional = true }
 once_cell = "1.17"
diff --git a/shared/comm-opaque2/Cargo.toml b/shared/comm-opaque2/Cargo.toml
index 9de6a10de..73cc54c19 100644
--- a/shared/comm-opaque2/Cargo.toml
+++ b/shared/comm-opaque2/Cargo.toml
@@ -1,13 +1,15 @@
 [package]
 name = "comm-opaque2"
 version = "0.2.0"
-edition = "2021"
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
 
 [dependencies]
 argon2 = "0.4"
 log = "0.4"
 opaque-ke = { version = "2.0", features = [ "argon2" ] }
 rand = "0.8"
 tonic = { version = "0.9.1", default-features = false }
 wasm-bindgen = "0.2"
 serde = { version = "1.0.197", features = ["derive"] }
diff --git a/shared/grpc_clients/Cargo.toml b/shared/grpc_clients/Cargo.toml
index 50473a896..a6c56403f 100644
--- a/shared/grpc_clients/Cargo.toml
+++ b/shared/grpc_clients/Cargo.toml
@@ -1,15 +1,17 @@
 [package]
 name = "grpc_clients"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
 
 [dependencies]
 derive_more = "0.99"
 prost = "0.11"
 tonic = { version = "0.9.1", features = ["tls-webpki-roots"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
 serde = { version = "1.0", features = ["derive"] }
 
 [build-dependencies]
 tonic-build = "0.9.1"
diff --git a/shared/identity_search_messages/Cargo.toml b/shared/identity_search_messages/Cargo.toml
index f05f30f08..8fca41c74 100644
--- a/shared/identity_search_messages/Cargo.toml
+++ b/shared/identity_search_messages/Cargo.toml
@@ -1,11 +1,13 @@
 [package]
 name = "identity_search_messages"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 serde = { version = "1.0.159", features = ["derive"] }
 serde_json = "1.0.95"
 websocket_messages = { path = "../websocket_messages" }
diff --git a/shared/tunnelbroker_messages/Cargo.toml b/shared/tunnelbroker_messages/Cargo.toml
index 868adb36c..ef45f1285 100644
--- a/shared/tunnelbroker_messages/Cargo.toml
+++ b/shared/tunnelbroker_messages/Cargo.toml
@@ -1,11 +1,13 @@
 [package]
 name = "tunnelbroker_messages"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 serde = { version = "1.0.160", features = [ "derive" ] }
 serde_json = "1.0.96"
 websocket_messages = { path = "../websocket_messages" }
diff --git a/shared/websocket_messages/Cargo.toml b/shared/websocket_messages/Cargo.toml
index 9a7df73ff..a3003fc2e 100644
--- a/shared/websocket_messages/Cargo.toml
+++ b/shared/websocket_messages/Cargo.toml
@@ -1,10 +1,12 @@
 [package]
 name = "websocket_messages"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 serde = { version = "1.0.160", features = [ "derive" ] }
 serde_json = "1.0.96"