diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 9635c806..a2fff181 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,14 +1,24 @@
-* xeus-cookiecutter version:
-* Operating System:
+# Checklist
+Before submitting an issue please confirm you have checked the follow
+- [ ] This issue is not a duplicate of one already open
+- [ ] The title of the issue is clear
+- [ ] This issue is not described in the documentation
 
-### Description
+# System information
+* xeus-cpp version:
+* Operating System:
+* CPU architecture (x86,arm,etc):
 
-Describe what you were trying to get done.
-Tell us what happened, what went wrong, and what you expected to happen.
+## Description of issue
+Please provide a description of the issue (fill out subsequent sections if your issue corresponds to a xeus-cpp not working as expected)
 
-### What I Did
+### Commands or code executed
 
 ```
-Paste the command(s) you ran and the output.
+Paste the command(s) or code you executed and the output.
 If there was a crash, please include the traceback here.
 ```
+
+### Expected Result
+
+### Any other information you believe is relevant
diff --git a/.github/workflows/auto_labeller_new_issue.yml b/.github/workflows/auto_labeller_new_issue.yml
new file mode 100644
index 00000000..c4ef910f
--- /dev/null
+++ b/.github/workflows/auto_labeller_new_issue.yml
@@ -0,0 +1,18 @@
+name: Label issues
+on:
+  issues:
+    types:
+      - reopened
+      - opened
+jobs:
+  label_issues:
+    runs-on: ubuntu-24.04
+    permissions:
+      issues: write
+    steps:
+      - run: gh issue edit "$NUMBER" --add-label "$LABELS"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          NUMBER: ${{ github.event.issue.number }}
+          LABELS: 'Needs triage'