diff --git a/Cargo.toml b/Cargo.toml
index 215ee237..2fbe7c22 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,8 +26,8 @@ license = "MIT OR Apache-2.0"
 edition = "2021"
 repository = "https://github.com/plabayo/rama"
 homepage = "https://ramaproxy.org"
-keywords = ["io", "async", "non-blocking", "futures"]
-categories = ["asynchronous", "network-programming"]
+keywords = ["io", "async", "non-blocking", "futures", "service", "rama"]
+categories = ["asynchronous", "network-programming", "web-programming"]
 authors = ["Glen De Cauwsemaecker <glen@plabayo.tech>"]
 rust-version = "1.80.0"
 
diff --git a/rama-error/Cargo.toml b/rama-error/Cargo.toml
index bd716a24..0c5d9244 100644
--- a/rama-error/Cargo.toml
+++ b/rama-error/Cargo.toml
@@ -5,8 +5,8 @@ version = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 repository = { workspace = true }
-keywords = { workspace = true }
-categories = { workspace = true }
+keywords = ["error", "error-handling", "rama"]
+categories = ["Rust patterns"]
 authors = { workspace = true }
 rust-version = { workspace = true }
 
diff --git a/rama-haproxy/Cargo.toml b/rama-haproxy/Cargo.toml
index bba6214b..734a61ee 100644
--- a/rama-haproxy/Cargo.toml
+++ b/rama-haproxy/Cargo.toml
@@ -5,8 +5,8 @@ version = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 repository = { workspace = true }
-keywords = { workspace = true }
-categories = { workspace = true }
+keywords = ["io", "async", "non-blocking", "proxy", "server", "client", "haproxy", "rama"]
+categories = ["asynchronous", "network-programming", "web-programming"]
 authors = { workspace = true }
 rust-version = { workspace = true }
 
diff --git a/rama-http-backend/Cargo.toml b/rama-http-backend/Cargo.toml
index 770efe4c..d20d7be6 100644
--- a/rama-http-backend/Cargo.toml
+++ b/rama-http-backend/Cargo.toml
@@ -5,8 +5,8 @@ version = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 repository = { workspace = true }
-keywords = { workspace = true }
-categories = { workspace = true }
+keywords = ["io", "async", "non-blocking", "service", "http", "rama"]
+categories = ["asynchronous", "network-programming", "HTTP client", "HTTP server"]
 authors = { workspace = true }
 rust-version = { workspace = true }
 
diff --git a/rama-http-types/Cargo.toml b/rama-http-types/Cargo.toml
index 2bdcbecf..a682f199 100644
--- a/rama-http-types/Cargo.toml
+++ b/rama-http-types/Cargo.toml
@@ -5,8 +5,8 @@ version = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 repository = { workspace = true }
-keywords = { workspace = true }
-categories = { workspace = true }
+keywords = ["http", "headers", "mime", "rama"]
+categories = ["web-programming"]
 authors = { workspace = true }
 rust-version = { workspace = true }
 
diff --git a/rama-http/Cargo.toml b/rama-http/Cargo.toml
index 9aa2fda3..907a4efe 100644
--- a/rama-http/Cargo.toml
+++ b/rama-http/Cargo.toml
@@ -5,8 +5,8 @@ version = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 repository = { workspace = true }
-keywords = { workspace = true }
-categories = { workspace = true }
+keywords = ["io", "async", "non-blocking", "proxy", "server", "client", "middleware", "service", "http", "rama"]
+categories = ["asynchronous", "network-programming", "web-programming"]
 authors = { workspace = true }
 rust-version = { workspace = true }
 
diff --git a/rama-macros/Cargo.toml b/rama-macros/Cargo.toml
index 3afb3edc..7eeadc62 100644
--- a/rama-macros/Cargo.toml
+++ b/rama-macros/Cargo.toml
@@ -5,8 +5,8 @@ version = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 repository = { workspace = true }
-keywords = { workspace = true }
-categories = { workspace = true }
+keywords = ["rama"]
+categories = ["asynchronous", "network-programming", "web-programming"]
 authors = { workspace = true }
 rust-version = { workspace = true }
 
diff --git a/rama-net/Cargo.toml b/rama-net/Cargo.toml
index c383550c..364c0b72 100644
--- a/rama-net/Cargo.toml
+++ b/rama-net/Cargo.toml
@@ -5,8 +5,8 @@ version = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 repository = { workspace = true }
-keywords = { workspace = true }
-categories = { workspace = true }
+keywords = ["io", "async", "non-blocking", "futures", "network", "rama"]
+categories = ["asynchronous", "network-programming", "web-programming"]
 authors = { workspace = true }
 rust-version = { workspace = true }
 
diff --git a/rama-proxy/Cargo.toml b/rama-proxy/Cargo.toml
index 189cbf33..68dba3e7 100644
--- a/rama-proxy/Cargo.toml
+++ b/rama-proxy/Cargo.toml
@@ -5,8 +5,8 @@ version = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 repository = { workspace = true }
-keywords = { workspace = true }
-categories = { workspace = true }
+keywords = ["io", "async", "non-blocking", "futures", "proxy", "db", "rama"]
+categories = ["asynchronous", "network-programming", "web-programming"]
 authors = { workspace = true }
 rust-version = { workspace = true }
 
diff --git a/rama-socks5/Cargo.toml b/rama-socks5/Cargo.toml
index fa899666..56f37ab8 100644
--- a/rama-socks5/Cargo.toml
+++ b/rama-socks5/Cargo.toml
@@ -5,8 +5,8 @@ version = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 repository = { workspace = true }
-keywords = { workspace = true }
-categories = { workspace = true }
+keywords = ["io", "async", "non-blocking", "futures", "socks", "socks5", "network", "rama"]
+categories = ["asynchronous", "network-programming", "web-programming"]
 authors = { workspace = true }
 rust-version = { workspace = true }
 
diff --git a/rama-tcp/Cargo.toml b/rama-tcp/Cargo.toml
index 112c86c7..020e35b8 100644
--- a/rama-tcp/Cargo.toml
+++ b/rama-tcp/Cargo.toml
@@ -5,8 +5,8 @@ version = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 repository = { workspace = true }
-keywords = { workspace = true }
-categories = { workspace = true }
+keywords = ["io", "async", "non-blocking", "futures", "tcp", "network", "rama"]
+categories = ["asynchronous", "network-programming", "web-programming"]
 authors = { workspace = true }
 rust-version = { workspace = true }
 
diff --git a/rama-tls/Cargo.toml b/rama-tls/Cargo.toml
index abfec32f..2fa13f8e 100644
--- a/rama-tls/Cargo.toml
+++ b/rama-tls/Cargo.toml
@@ -5,8 +5,8 @@ version = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 repository = { workspace = true }
-keywords = { workspace = true }
-categories = { workspace = true }
+keywords = ["io", "async", "non-blocking", "futures", "tls", "network", "rama"]
+categories = ["asynchronous", "network-programming", "cryptography", "web-programming"]
 authors = { workspace = true }
 rust-version = { workspace = true }
 
diff --git a/rama-ua/Cargo.toml b/rama-ua/Cargo.toml
index ca8ffa20..d5cf25a2 100644
--- a/rama-ua/Cargo.toml
+++ b/rama-ua/Cargo.toml
@@ -5,8 +5,8 @@ version = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 repository = { workspace = true }
-keywords = { workspace = true }
-categories = { workspace = true }
+keywords = ["useragent", "user-agent", "rama"]
+categories = ["parser-implementations", "web-programming"]
 authors = { workspace = true }
 rust-version = { workspace = true }
 
diff --git a/rama-udp/Cargo.toml b/rama-udp/Cargo.toml
index b0fd4af6..f81c6375 100644
--- a/rama-udp/Cargo.toml
+++ b/rama-udp/Cargo.toml
@@ -5,8 +5,8 @@ version = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 repository = { workspace = true }
-keywords = { workspace = true }
-categories = { workspace = true }
+keywords = ["io", "async", "non-blocking", "futures", "udp", "network", "rama"]
+categories = ["asynchronous", "network-programming", "web-programming"]
 authors = { workspace = true }
 rust-version = { workspace = true }
 
diff --git a/rama-utils/Cargo.toml b/rama-utils/Cargo.toml
index 8bada8fa..08fd20cd 100644
--- a/rama-utils/Cargo.toml
+++ b/rama-utils/Cargo.toml
@@ -5,8 +5,8 @@ version = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 repository = { workspace = true }
-keywords = { workspace = true }
-categories = { workspace = true }
+keywords = ["rama"]
+categories = ["asynchronous", "network-programming", "web-programming"]
 authors = { workspace = true }
 rust-version = { workspace = true }