diff --git a/triggers/issues.ts b/triggers/issues.ts
index 04a3553..17534b6 100644
--- a/triggers/issues.ts
+++ b/triggers/issues.ts
@@ -21,7 +21,7 @@ const IssuesTrigger: Trigger<typeof IssuesWorkflow.definition> = {
     filter: {
       version: 1,
       root: {
-        statement: "{{data.text}} CONTAINS issues",
+        statement: "{{data.text}} MATCHES '^<@[A-Z0-9]+>\\s+issues$'",
       },
     },
   },
diff --git a/triggers/ping.ts b/triggers/ping.ts
index 06164e9..5634199 100644
--- a/triggers/ping.ts
+++ b/triggers/ping.ts
@@ -18,7 +18,7 @@ const pingTrigger: Trigger<typeof PingWorkflow.definition> = {
     filter: {
       version: 1,
       root: {
-        statement: "{{data.text}} CONTAINS ping",
+        statement: "{{data.text}} MATCHES '^<@[A-Z0-9]+>\\s+issues$'",
       },
     },
   },