diff --git a/kubernetes/apps/database/emqx/cluster/resources/acl.conf b/kubernetes/apps/database/emqx/cluster/resources/acl.conf
index 17d280ac..25d9ac55 100644
--- a/kubernetes/apps/database/emqx/cluster/resources/acl.conf
+++ b/kubernetes/apps/database/emqx/cluster/resources/acl.conf
@@ -3,6 +3,6 @@
 %% https://docs.emqx.com/en/emqx/latest/access-control/authz/file.html %%
 
 {allow, {user, "jahanson"}, all, ["#"]}.
-{allow, {user, "tasmota"}, all, ["tasmota/discovery/#", "tele/tasmota_[A-F0-9]+/#", "cmnd/tasmota_[A-F0-9]+/#"]}.
-{allow, {user, "homeassistant"}, subscribe, ["stat/tasmota_[A-F0-9]+/#", "tele/tasmota_[A-F0-9]+/#"]}.
+{allow, {user, "tasmota"}, all, ["tasmota/discovery/#", "tele/tasmota_[A-F0-9]+/[A-Za-z0-9_]+", "cmnd/tasmota_[A-F0-9]+/[A-Za-z0-9_]+"]}.
+{allow, {user, "homeassistant"}, subscribe, ["stat/tasmota_[A-F0-9]+/[A-Za-z0-9_]+", "tele/tasmota_[A-F0-9]+/[A-Za-z0-9_]+"]}.
 {deny, all}.