diff --git a/.github/workflows/issue-pr-interceptor.yml b/.github/workflows/issue-pr-interceptor.yml
index 39963c5..ee5349a 100644
--- a/.github/workflows/issue-pr-interceptor.yml
+++ b/.github/workflows/issue-pr-interceptor.yml
@@ -1,16 +1,20 @@
 name: "Intercept bad issue/PRs"
 
-on: [issues, pull_request]
+on:
+  issues:
+    types: opened
+  pull_request:
+    types: opened
 
 jobs:
   autoclose:
     runs-on: ubuntu-latest
     steps:
-    - name: Autoclose issues that did not follow issue template
+    - name: Auto close issues/pr that did not follow template
       uses: roots/issue-closer@v1.1
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         issue-pattern: "\\[x\\] I have read"
-        issue-close-message: "Hi @${issue.user.login} :wave:,\n\nThis issue is being automatically closed because it does not follow the issue template."
+        issue-close-message: ":wave: Hi @${issue.user.login},\n\nThis issue is being automatically closed because it does not follow the issue template."
         pr-pattern: "\\[x\\] Bug|\\[x\\] New feat|\\[x\\] Break|\\[x\\] Doc"
-        pr-close-message: "Hi @${pull_request.user.login} :wave:,\n\nThis PR is being automatically closed because it does not follow the PR template."
+        pr-close-message: ":wave: Hi @${pull_request.user.login},\n\nThis PR is being automatically closed because it does not follow the PR template."