diff --git a/Cargo.toml b/Cargo.toml
index 6bd9369..3d86dfa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,8 +3,8 @@ name = "edge-net"
 version = "0.8.0"
 authors = ["Ivan Markov <ivan.markov@gmail.com>"]
 edition = "2021"
-categories = ["embedded", "hardware-support"]
-keywords = ["embedded", "svc", "network"]
+categories = ["embedded", "hardware-support", "network-programming", "asynchronous"]
+keywords = ["embedded", "network"]
 description = "no_std and no-alloc async implementations of various network protocols."
 repository = "https://github.com/ivmarkov/edge-net"
 license = "MIT OR Apache-2.0"
diff --git a/edge-captive/Cargo.toml b/edge-captive/Cargo.toml
index 5d34224..150998c 100644
--- a/edge-captive/Cargo.toml
+++ b/edge-captive/Cargo.toml
@@ -9,10 +9,9 @@ readme = "README.md"
 license = "MIT OR Apache-2.0"
 categories = [
     "embedded",
-    "no-std",
+    "no-std::no-alloc",
     "asynchronous",
-    "networking",
-    "dns"
+    "network-programming",
 ]
 
 [features]
diff --git a/edge-dhcp/Cargo.toml b/edge-dhcp/Cargo.toml
index 8c8ce1a..511588f 100644
--- a/edge-dhcp/Cargo.toml
+++ b/edge-dhcp/Cargo.toml
@@ -9,10 +9,9 @@ readme = "README.md"
 license = "MIT OR Apache-2.0"
 categories = [
     "embedded",
-    "no-std",
+    "no-std::no-alloc",
     "asynchronous",
-    "networking",
-    "dhcp"
+    "network-programming",
 ]
 
 [features]
diff --git a/edge-http/Cargo.toml b/edge-http/Cargo.toml
index e9be75a..ff5f2ed 100644
--- a/edge-http/Cargo.toml
+++ b/edge-http/Cargo.toml
@@ -9,10 +9,11 @@ readme = "README.md"
 license = "MIT OR Apache-2.0"
 categories = [
     "embedded",
-    "no-std",
+    "no-std::no-alloc",
     "asynchronous",
-    "networking",
-    "http"
+    "network-programming",
+    "web-programming::http-client",
+    "web-programming::http-server",
 ]
 
 [features]
diff --git a/edge-mdns/Cargo.toml b/edge-mdns/Cargo.toml
index 456ed5f..ff5401e 100644
--- a/edge-mdns/Cargo.toml
+++ b/edge-mdns/Cargo.toml
@@ -8,10 +8,9 @@ readme = "README.md"
 license = "MIT OR Apache-2.0"
 categories = [
     "embedded",
-    "no-std",
+    "no-std::no-alloc",
     "asynchronous",
-    "networking",
-    "mdns"
+    "network-programming",
 ]
 
 [features]
diff --git a/edge-mqtt/Cargo.toml b/edge-mqtt/Cargo.toml
index 0a700b3..1dafc10 100644
--- a/edge-mqtt/Cargo.toml
+++ b/edge-mqtt/Cargo.toml
@@ -9,10 +9,8 @@ readme = "README.md"
 license = "MIT OR Apache-2.0"
 categories = [
     "embedded",
-    "no-std",
     "asynchronous",
-    "networking",
-    "mqtt"
+    "network-programming",
 ]
 
 [dependencies]
diff --git a/edge-nal-embassy/Cargo.toml b/edge-nal-embassy/Cargo.toml
index 4b05bf4..80c7f70 100644
--- a/edge-nal-embassy/Cargo.toml
+++ b/edge-nal-embassy/Cargo.toml
@@ -9,9 +9,9 @@ readme = "README.md"
 license = "MIT OR Apache-2.0"
 categories = [
     "embedded",
-    "no-std",
+    "no-std::no-alloc",
     "asynchronous",
-    "networking"
+    "network-programming"
 ]
 
 [dependencies]
diff --git a/edge-nal-std/Cargo.toml b/edge-nal-std/Cargo.toml
index af13a09..7ab18f5 100644
--- a/edge-nal-std/Cargo.toml
+++ b/edge-nal-std/Cargo.toml
@@ -9,9 +9,9 @@ readme = "README.md"
 license = "MIT OR Apache-2.0"
 categories = [
     "embedded",
-    "no-std",
+    "no-std::no-alloc",
     "asynchronous",
-    "networking"
+    "network-programming"
 ]
 
 [dependencies]
diff --git a/edge-nal/Cargo.toml b/edge-nal/Cargo.toml
index c803123..f9a864e 100644
--- a/edge-nal/Cargo.toml
+++ b/edge-nal/Cargo.toml
@@ -9,9 +9,9 @@ readme = "README.md"
 license = "MIT OR Apache-2.0"
 categories = [
     "embedded",
-    "no-std",
+    "no-std::no-alloc",
     "asynchronous",
-    "networking"
+    "network-programming"
 ]
 
 [dependencies]
diff --git a/edge-raw/Cargo.toml b/edge-raw/Cargo.toml
index 8e5b66f..6843277 100644
--- a/edge-raw/Cargo.toml
+++ b/edge-raw/Cargo.toml
@@ -9,9 +9,9 @@ readme = "README.md"
 license = "MIT OR Apache-2.0"
 categories = [
     "embedded",
-    "no-std",
+    "no-std::no-alloc",
     "asynchronous",
-    "networking",
+    "network-programming",
     "ip"
 ]
 
diff --git a/edge-ws/Cargo.toml b/edge-ws/Cargo.toml
index 9df6e9f..9c43623 100644
--- a/edge-ws/Cargo.toml
+++ b/edge-ws/Cargo.toml
@@ -9,10 +9,10 @@ readme = "README.md"
 license = "MIT OR Apache-2.0"
 categories = [
     "embedded",
-    "no-std",
+    "no-std::no-alloc",
     "asynchronous",
-    "networking",
-    "websockets"
+    "network-programming",
+    "web-programming::websocket"
 ]
 
 [features]