diff --git a/aquatic_http/Cargo.toml b/aquatic_http/Cargo.toml
index fa08ec1..4053c12 100644
--- a/aquatic_http/Cargo.toml
+++ b/aquatic_http/Cargo.toml
@@ -6,6 +6,7 @@ edition = "2021"
 license = "Apache-2.0"
 description = "Blazingly fast, multi-threaded HTTP BitTorrent tracker"
 repository = "https://github.com/greatest-ape/aquatic"
+keywords = ["http", "server", "peer-to-peer", "torrent", "bittorrent"]
 
 [lib]
 name = "aquatic_http"
diff --git a/aquatic_http_load_test/Cargo.toml b/aquatic_http_load_test/Cargo.toml
index 34352a6..f5413f8 100644
--- a/aquatic_http_load_test/Cargo.toml
+++ b/aquatic_http_load_test/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Joakim Frostegård <joakim.frostegard@gmail.com>"]
 edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/greatest-ape/aquatic"
+keywords = ["http", "benchmark", "peer-to-peer", "torrent", "bittorrent"]
 
 [[bin]]
 name = "aquatic_http_load_test"
diff --git a/aquatic_http_protocol/Cargo.toml b/aquatic_http_protocol/Cargo.toml
index 9bda1de..230f719 100644
--- a/aquatic_http_protocol/Cargo.toml
+++ b/aquatic_http_protocol/Cargo.toml
@@ -7,6 +7,7 @@ license = "Apache-2.0"
 repository = "https://github.com/greatest-ape/aquatic"
 description = "HTTP BitTorrent tracker protocol"
 exclude = ["target"]
+keywords = ["http", "protocol", "peer-to-peer", "torrent", "bittorrent"]
 
 [lib]
 name = "aquatic_http_protocol"
diff --git a/aquatic_toml_config/Cargo.toml b/aquatic_toml_config/Cargo.toml
index 68d17bf..3c9e9fb 100644
--- a/aquatic_toml_config/Cargo.toml
+++ b/aquatic_toml_config/Cargo.toml
@@ -4,9 +4,10 @@ version = "0.1.0"
 authors = ["Joakim Frostegård <joakim.frostegard@gmail.com>"]
 edition = "2021"
 license = "Apache-2.0"
-description = "WebTorrent tracker protocol"
+description = "Serialize toml with comments"
 repository = "https://github.com/greatest-ape/aquatic"
 exclude = ["target"]
+keywords = ["toml"]
 
 [lib]
 name = "aquatic_toml_config"
diff --git a/aquatic_toml_config_derive/Cargo.toml b/aquatic_toml_config_derive/Cargo.toml
index a3c1b3d..3e55d89 100644
--- a/aquatic_toml_config_derive/Cargo.toml
+++ b/aquatic_toml_config_derive/Cargo.toml
@@ -4,9 +4,10 @@ version = "0.1.0"
 authors = ["Joakim Frostegård <joakim.frostegard@gmail.com>"]
 edition = "2021"
 license = "Apache-2.0"
-description = "WebTorrent tracker protocol"
+description = "Serialize toml with comments"
 repository = "https://github.com/greatest-ape/aquatic"
 exclude = ["target"]
+keywords = ["toml"]
 
 [lib]
 proc-macro = true
diff --git a/aquatic_udp/Cargo.toml b/aquatic_udp/Cargo.toml
index 8ef1297..c986152 100644
--- a/aquatic_udp/Cargo.toml
+++ b/aquatic_udp/Cargo.toml
@@ -6,6 +6,7 @@ edition = "2021"
 license = "Apache-2.0"
 description = "Blazingly fast, multi-threaded UDP BitTorrent tracker"
 repository = "https://github.com/greatest-ape/aquatic"
+keywords = ["udp", "server", "peer-to-peer", "torrent", "bittorrent"]
 
 [lib]
 name = "aquatic_udp"
diff --git a/aquatic_udp_load_test/Cargo.toml b/aquatic_udp_load_test/Cargo.toml
index 5656069..ae803c2 100644
--- a/aquatic_udp_load_test/Cargo.toml
+++ b/aquatic_udp_load_test/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Joakim Frostegård <joakim.frostegard@gmail.com>"]
 edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/greatest-ape/aquatic"
+keywords = ["udp", "benchmark", "peer-to-peer", "torrent", "bittorrent"]
 
 [[bin]]
 name = "aquatic_udp_load_test"
diff --git a/aquatic_udp_protocol/Cargo.toml b/aquatic_udp_protocol/Cargo.toml
index 9ee5ca5..67dda3b 100644
--- a/aquatic_udp_protocol/Cargo.toml
+++ b/aquatic_udp_protocol/Cargo.toml
@@ -6,6 +6,7 @@ edition = "2021"
 license = "Apache-2.0"
 description = "UDP BitTorrent tracker protocol"
 repository = "https://github.com/greatest-ape/aquatic"
+keywords = ["udp", "protocol", "peer-to-peer", "torrent", "bittorrent"]
 
 [dependencies]
 byteorder = "1"
diff --git a/aquatic_ws/Cargo.toml b/aquatic_ws/Cargo.toml
index 3a4bc77..01665d6 100644
--- a/aquatic_ws/Cargo.toml
+++ b/aquatic_ws/Cargo.toml
@@ -6,6 +6,8 @@ edition = "2021"
 license = "Apache-2.0"
 description = "Blazingly fast, multi-threaded WebTorrent tracker"
 repository = "https://github.com/greatest-ape/aquatic"
+keywords = ["webtorrent", "websocket", "peer-to-peer", "torrent", "bittorrent"]
+
 
 [lib]
 name = "aquatic_ws"
diff --git a/aquatic_ws_load_test/Cargo.toml b/aquatic_ws_load_test/Cargo.toml
index b1c92e1..af0528e 100644
--- a/aquatic_ws_load_test/Cargo.toml
+++ b/aquatic_ws_load_test/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Joakim Frostegård <joakim.frostegard@gmail.com>"]
 edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/greatest-ape/aquatic"
+keywords = ["webtorrent", "websocket", "benchmark", "torrent", "bittorrent"]
 
 [[bin]]
 name = "aquatic_ws_load_test"
diff --git a/aquatic_ws_protocol/Cargo.toml b/aquatic_ws_protocol/Cargo.toml
index 18d4162..79be691 100644
--- a/aquatic_ws_protocol/Cargo.toml
+++ b/aquatic_ws_protocol/Cargo.toml
@@ -7,6 +7,7 @@ license = "Apache-2.0"
 description = "WebTorrent tracker protocol"
 repository = "https://github.com/greatest-ape/aquatic"
 exclude = ["target"]
+keywords = ["webtorrent", "protocol", "peer-to-peer", "torrent", "bittorrent"]
 
 [lib]
 name = "aquatic_ws_protocol"