diff --git a/esp-wifi/Cargo.toml b/esp-wifi/Cargo.toml
index 82baeaf3..4fcfc39a 100644
--- a/esp-wifi/Cargo.toml
+++ b/esp-wifi/Cargo.toml
@@ -70,6 +70,22 @@ ps-min-modem = []
 esp-now = [ "wifi" ]
 big-heap = []
 ipv6 = ["smoltcp?/proto-ipv6"]
-defmt = ["dep:defmt", "smoltcp?/defmt"]
-log-defmt = ["defmt"]
-log = ["dep:log"]
+defmt = [
+  "dep:defmt",
+  "smoltcp?/defmt",
+  "esp32c3-hal?/defmt",
+  "esp32c2-hal?/defmt",
+  "esp32c6-hal?/defmt",
+  "esp32-hal?/defmt",
+  "esp32s2-hal?/defmt",
+  "esp32s3-hal?/defmt",
+]
+log = [
+  "dep:log",
+  "esp32c3-hal?/log",
+  "esp32c2-hal?/log",
+  "esp32c6-hal?/log",
+  "esp32-hal?/log",
+  "esp32s2-hal?/log",
+  "esp32s3-hal?/log",
+]
diff --git a/examples-esp32/Cargo.toml b/examples-esp32/Cargo.toml
index da69050e..7f040057 100644
--- a/examples-esp32/Cargo.toml
+++ b/examples-esp32/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 embedded-svc.workspace = true
 bleps.workspace = true
-embassy-executor.workspace = true
+embassy-executor = { workspace = true, optional = true }
 embassy-time.workspace = true
 embassy-futures.workspace = true
 futures-util.workspace = true
@@ -20,15 +20,17 @@ embassy-net = { workspace = true, optional = true }
 
 esp32-hal.workspace = true
 examples-util = { path = "../examples-util", features = ["esp32"] }
-esp-println = { workspace = true, features = [ "esp32" ] }
 esp-backtrace = { workspace = true, features = ["esp32"] }
 esp-wifi = { path = "../esp-wifi", features = ["esp32"] }
 embedded-hal-async = { workspace = true, optional = true }
 
+[dev-dependencies]
+esp-println = { workspace = true, features = ["esp32", "log"] }
+
 [features]
-default = ["esp32"]
-esp32 = ["embassy-executor/arch-xtensa"]
-async = ["esp-wifi/async", "bleps/async", "dep:embedded-hal-async", "esp32-hal/async", "esp32-hal/embassy-time-timg0"]
+default = ["esp32", "log"]
+esp32 = []
+async = ["esp-wifi/async", "bleps/async", "dep:embedded-hal-async", "esp32-hal/async", "esp32-hal/embassy-time-timg0", "dep:embassy-executor", "embassy-executor?/arch-xtensa"]
 embassy-net = ["esp-wifi/embassy-net","dep:embassy-net"]
 wifi-logs = ["esp-wifi/wifi-logs"]
 dump-packets = ["esp-wifi/dump-packets"]
@@ -42,5 +44,5 @@ ps-min-modem = ["esp-wifi/ps-min-modem"]
 esp-now = ["esp-wifi/esp-now"]
 ipv6 = ["esp-wifi/ipv6"]
 coex = ["esp-wifi/coex"]
-log = ["esp-println/log", "esp-wifi/log", "dep:log"]
-log-defmt = ["esp-wifi/log-defmt"]
+log = ["esp-wifi/log", "dep:log"]
+defmt = ["esp-wifi/defmt"]
diff --git a/examples-esp32c2/Cargo.toml b/examples-esp32c2/Cargo.toml
index c7b42ab1..973592f8 100644
--- a/examples-esp32c2/Cargo.toml
+++ b/examples-esp32c2/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 embedded-svc.workspace = true
 bleps.workspace = true
-embassy-executor.workspace = true
+embassy-executor = { workspace = true, optional = true }
 embassy-time.workspace = true
 embassy-futures.workspace = true
 futures-util.workspace = true
@@ -20,15 +20,17 @@ embassy-net = { workspace = true, optional = true }
 
 esp32c2-hal.workspace = true
 examples-util = { path = "../examples-util", features = ["esp32c2"] }
-esp-println = { workspace = true, features = [ "esp32c2" ] }
 esp-backtrace = { workspace = true, features = ["esp32c2"] }
 esp-wifi = { path = "../esp-wifi", features = ["esp32c2"] }
 embedded-hal-async = { workspace = true, optional = true }
 
+[dev-dependencies]
+esp-println = { workspace = true, features = [ "esp32c2", "log" ] }
+
 [features]
-default = ["esp32c2"]
-esp32c2 = ["embassy-executor/arch-riscv32"]
-async = ["esp-wifi/async", "bleps/async", "dep:embedded-hal-async", "esp32c2-hal/async", "esp32c2-hal/embassy-time-timg0"]
+default = ["esp32c2", "log"]
+esp32c2 = []
+async = ["esp-wifi/async", "bleps/async", "dep:embedded-hal-async", "esp32c2-hal/async", "esp32c2-hal/embassy-time-timg0", "dep:embassy-executor", "embassy-executor?/arch-riscv32"]
 embassy-net = ["esp-wifi/embassy-net","dep:embassy-net"]
 wifi-logs = ["esp-wifi/wifi-logs"]
 dump-packets = ["esp-wifi/dump-packets"]
@@ -43,5 +45,5 @@ ps-min-modem = ["esp-wifi/ps-min-modem"]
 esp-now = ["esp-wifi/esp-now"]
 ipv6 = ["esp-wifi/ipv6"]
 #coex = ["esp-wifi/coex"]
-log = ["esp-println/log", "esp-wifi/log", "dep:log"]
-log-defmt = ["esp-wifi/log-defmt"]
+log = ["esp-wifi/log", "dep:log"]
+defmt = ["esp-wifi/defmt"]
diff --git a/examples-esp32c3/Cargo.toml b/examples-esp32c3/Cargo.toml
index 493a2a7c..796347a9 100644
--- a/examples-esp32c3/Cargo.toml
+++ b/examples-esp32c3/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 embedded-svc.workspace = true
 bleps.workspace = true
-embassy-executor.workspace = true
+embassy-executor = { workspace = true, optional = true }
 embassy-time.workspace = true
 embassy-futures.workspace = true
 futures-util.workspace = true
@@ -20,15 +20,17 @@ embassy-net = { workspace = true, optional = true }
 
 esp32c3-hal.workspace = true
 examples-util = { path = "../examples-util", features = ["esp32c3"] }
-esp-println = { workspace = true, features = [ "esp32c3" ] }
 esp-backtrace = { workspace = true, features = ["esp32c3"] }
 esp-wifi = { path = "../esp-wifi", features = ["esp32c3"] }
 embedded-hal-async = { workspace = true, optional = true }
 
+[dev-dependencies]
+esp-println = { workspace = true, features = [ "esp32c3", "log" ] }
+
 [features]
-default = ["esp32c3"]
-esp32c3 = ["embassy-executor/arch-riscv32"]
-async = ["esp-wifi/async", "bleps/async", "dep:embedded-hal-async", "esp32c3-hal/async", "esp32c3-hal/embassy-time-timg0"]
+default = ["esp32c3", "log"]
+esp32c3 = []
+async = ["esp-wifi/async", "bleps/async", "dep:embedded-hal-async", "esp32c3-hal/async", "esp32c3-hal/embassy-time-timg0", "dep:embassy-executor", "embassy-executor?/arch-riscv32"]
 embassy-net = ["esp-wifi/embassy-net","dep:embassy-net"]
 wifi-logs = ["esp-wifi/wifi-logs"]
 dump-packets = ["esp-wifi/dump-packets"]
@@ -43,5 +45,5 @@ ps-min-modem = ["esp-wifi/ps-min-modem"]
 esp-now = ["esp-wifi/esp-now"]
 ipv6 = ["esp-wifi/ipv6"]
 coex = ["esp-wifi/coex"]
-log = ["esp-println/log", "esp-wifi/log", "dep:log"]
-log-defmt = ["esp-wifi/log-defmt"]
+log = ["esp-wifi/log", "dep:log"]
+defmt = ["esp-wifi/defmt"]
diff --git a/examples-esp32c6/Cargo.toml b/examples-esp32c6/Cargo.toml
index 34425c5f..2b8bab11 100644
--- a/examples-esp32c6/Cargo.toml
+++ b/examples-esp32c6/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 embedded-svc.workspace = true
 bleps.workspace = true
-embassy-executor.workspace = true
+embassy-executor = { workspace = true, optional = true }
 embassy-time.workspace = true
 embassy-futures.workspace = true
 futures-util.workspace = true
@@ -20,14 +20,16 @@ embassy-net = { workspace = true, optional = true }
 
 esp32c6-hal.workspace = true
 examples-util = { path = "../examples-util", features = ["esp32c6"] }
-esp-println = { workspace = true, features = [ "esp32c6" ] }
 esp-backtrace = { workspace = true, features = ["esp32c6"] }
 esp-wifi = { path = "../esp-wifi", features = ["esp32c6"] }
 
+[dev-dependencies]
+esp-println = { workspace = true, features = [ "esp32c6", "log" ] }
+
 [features]
-default = ["esp32c6"]
-esp32c6 = ["embassy-executor/arch-riscv32"]
-async = ["esp-wifi/async", "esp32c6-hal/embassy-time-timg0"]
+default = ["esp32c6", "log"]
+esp32c6 = []
+async = ["esp-wifi/async", "esp32c6-hal/embassy-time-timg0", "dep:embassy-executor", "embassy-executor?/arch-riscv32"]
 embassy-net = ["esp-wifi/embassy-net", "dep:embassy-net"]
 wifi-logs = ["esp-wifi/wifi-logs"]
 dump-packets = ["esp-wifi/dump-packets"]
@@ -42,5 +44,5 @@ ps-min-modem = ["esp-wifi/ps-min-modem"]
 esp-now = ["esp-wifi/esp-now"]
 ipv6 = ["esp-wifi/ipv6"]
 #coex = ["esp-wifi/coex"]
-log = ["esp-println/log", "esp-wifi/log", "dep:log"]
-log-defmt = ["esp-wifi/log-defmt"]
+log = ["esp-wifi/log", "dep:log"]
+defmt = ["esp-wifi/defmt"]
diff --git a/examples-esp32s2/Cargo.toml b/examples-esp32s2/Cargo.toml
index a6e4f12e..93ce8d01 100644
--- a/examples-esp32s2/Cargo.toml
+++ b/examples-esp32s2/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 embedded-svc.workspace = true
 bleps.workspace = true
-embassy-executor.workspace = true
+embassy-executor = { workspace = true, optional = true }
 embassy-time.workspace = true
 embassy-futures.workspace = true
 futures-util.workspace = true
@@ -20,14 +20,16 @@ embassy-net = { workspace = true, optional = true }
 
 esp32s2-hal.workspace = true
 examples-util = { path = "../examples-util", features = ["esp32s2"] }
-esp-println = { workspace = true, features = [ "esp32s2" ] }
 esp-backtrace = { workspace = true, features = ["esp32s2"] }
 esp-wifi = { path = "../esp-wifi", features = ["esp32s2"] }
 
+[dev-dependencies]
+esp-println = { workspace = true, features = [ "esp32s2", "log" ] }
+
 [features]
-default = ["esp32s2"]
-esp32s2 = ["embassy-executor/arch-xtensa"]
-async = ["esp-wifi/async", "esp32s2-hal/embassy-time-timg0"]
+default = ["esp32s2", "log"]
+esp32s2 = []
+async = ["esp-wifi/async", "esp32s2-hal/embassy-time-timg0", "dep:embassy-executor", "embassy-executor?/arch-xtensa"]
 embassy-net = ["esp-wifi/embassy-net","dep:embassy-net"]
 wifi-logs = ["esp-wifi/wifi-logs"]
 dump-packets = ["esp-wifi/dump-packets"]
@@ -40,4 +42,5 @@ phy-enable-usb = ["esp-wifi/phy-enable-usb"]
 ps-min-modem = ["esp-wifi/ps-min-modem"]
 esp-now = ["esp-wifi/esp-now"]
 ipv6 = ["esp-wifi/ipv6"]
-log = ["esp-println/log", "esp-wifi/log", "dep:log"]
+log = ["esp-wifi/log", "dep:log"]
+defmt = ["esp-wifi/defmt"]
diff --git a/examples-esp32s3/Cargo.toml b/examples-esp32s3/Cargo.toml
index a82e6673..f9b9cdaa 100644
--- a/examples-esp32s3/Cargo.toml
+++ b/examples-esp32s3/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 embedded-svc.workspace = true
 bleps.workspace = true
-embassy-executor.workspace = true
+embassy-executor = { workspace = true, optional = true }
 embassy-time.workspace = true
 embassy-futures.workspace = true
 futures-util.workspace = true
@@ -20,15 +20,17 @@ embassy-net = { workspace = true, optional = true }
 
 esp32s3-hal.workspace = true
 examples-util = { path = "../examples-util", features = ["esp32s3"] }
-esp-println = { workspace = true, features = [ "esp32s3" ] }
 esp-backtrace = { workspace = true, features = ["esp32s3"] }
 esp-wifi = { path = "../esp-wifi", features = ["esp32s3"] }
 embedded-hal-async = { workspace = true, optional = true }
 
+[dev-dependencies]
+esp-println = { workspace = true, features = [ "esp32s3", "log" ] }
+
 [features]
-default = ["esp32s3"]
-esp32s3 = ["embassy-executor/arch-xtensa"]
-async = ["esp-wifi/async", "bleps/async", "dep:embedded-hal-async", "esp32s3-hal/async", "esp32s3-hal/embassy-time-timg0"]
+default = ["esp32s3", "log"]
+esp32s3 = []
+async = ["esp-wifi/async", "bleps/async", "dep:embedded-hal-async", "esp32s3-hal/async", "esp32s3-hal/embassy-time-timg0", "dep:embassy-executor", "embassy-executor?/arch-xtensa"]
 embassy-net = ["esp-wifi/embassy-net","dep:embassy-net"]
 wifi-logs = ["esp-wifi/wifi-logs"]
 dump-packets = ["esp-wifi/dump-packets"]
@@ -43,5 +45,5 @@ ps-min-modem = ["esp-wifi/ps-min-modem"]
 esp-now = ["esp-wifi/esp-now"]
 ipv6 = ["esp-wifi/ipv6"]
 coex = ["esp-wifi/coex"]
-log = ["esp-println/log", "esp-wifi/log", "dep:log"]
-log-defmt = ["esp-wifi/log-defmt"]
+log = ["esp-wifi/log", "dep:log"]
+defmt = ["esp-wifi/defmt"]