diff --git a/.github/workflows/advanced-issue-labeler.yml b/.github/workflows/advanced-issue-labeler.yml
index ab6c635..f7b61be 100644
--- a/.github/workflows/advanced-issue-labeler.yml
+++ b/.github/workflows/advanced-issue-labeler.yml
@@ -50,5 +50,5 @@ jobs:
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: "Heads up @WordPress/community-triage, we have a new issue openned by @{{ issue.user.login }}. Time to triage."
+              body: "Heads up @WordPress/community-triage, we have a new issue openned by @${{ github.event.issue.user.login }}. Time to triage."
             })
diff --git a/.github/workflows/comment-with-checklist.yml b/.github/workflows/comment-with-checklist.yml
index 88c257a..9cc1413 100644
--- a/.github/workflows/comment-with-checklist.yml
+++ b/.github/workflows/comment-with-checklist.yml
@@ -14,26 +14,27 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: peter-evans/create-or-update-comment@v3
+      - uses: peter-evans/create-or-update-comment@v4
         if: contains(inputs.content-type, 'event-application')
         with:
           issue-number: ${{ github.event.issue.number }}
           body: |
-          Thank you for creating this issue. @{{ issue.user.login }}  
-          ## Next steps
+            @${{ github.event.issue.user.login }} thank you for creating this event tracking issue.
 
-              - [ ] Please assign the issue to the team member and make sure to mark the issue ```To Do```
-              - [ ] Assignee (Team Member) will mark the issue as ```In Progress``` and perform the vetting taks on the tracker and HS as indicated on the handbook
-              - [ ] Once the vetting is completed mark the issue as ```In Review```
+            ## Next steps
+
+            - [ ] Please assign the issue to the team member and make sure to mark the issue ```To Do```
+            - [ ] Assignee (Team Member) will mark the issue as ```In Progress``` and perform the vetting taks on the tracker and HS as indicated on the handbook
+            - [ ] Once the vetting is completed mark the issue as ```In Review```
 
             ## Public vs Private
 
-              - Use comments for questions about the process and changes or to indicate delays, holding situation.
-              - Avoid discussing the community or the organiser in comments on Github. Even if there are doubts about some applications.
-              - We do not post vetting notes publicly and ensure such notes are strictly in the tracker or HelpScout.
+            - Use comments for questions about the process and changes or to indicate delays, holding situation.
+            - Avoid discussing the community or the organiser in comments on Github. Even if there are doubts about some applications.
+            - We do not post vetting notes publicly and ensure such notes are strictly in the tracker or HelpScout.
 
             ## Useful Resources
 
-              - [Application Review](https://make.wordpress.org/community/handbook/community-deputy/resources-and-tools/application-review/)
-              - [Most Common Cases](https://make.wordpress.org/community/handbook/community-deputy/resources-and-tools/application-review/#most-common-cases-quick-step-by-step-guide)
-              - [Video tutorials](https://make.wordpress.org/community/handbook/community-deputy/resources-and-tools/application-review/#quick-step-by-step-video-tutorial-for-application-review)
+            - [Application Review](https://make.wordpress.org/community/handbook/community-deputy/resources-and-tools/application-review/)
+            - [Most Common Cases](https://make.wordpress.org/community/handbook/community-deputy/resources-and-tools/application-review/#most-common-cases-quick-step-by-step-guide)
+            - [Video tutorials](https://make.wordpress.org/community/handbook/community-deputy/resources-and-tools/application-review/#quick-step-by-step-video-tutorial-for-application-review)