diff --git a/.github/DISCUSSION_TEMPLATE/questions.yml b/.github/DISCUSSION_TEMPLATE/questions.yml
index 5891fa048..5e956b504 100644
--- a/.github/DISCUSSION_TEMPLATE/questions.yml
+++ b/.github/DISCUSSION_TEMPLATE/questions.yml
@@ -1,5 +1,4 @@
-name: "[Questions] Questions and/or support"
-description: Ask for help from the developers
+title: "[Questions] "
 labels: [ "support" ]
 
 body:
diff --git a/.github/DISCUSSION_TEMPLATE/translations.yml b/.github/DISCUSSION_TEMPLATE/translations.yml
index 10a712fca..efc4ed578 100644
--- a/.github/DISCUSSION_TEMPLATE/translations.yml
+++ b/.github/DISCUSSION_TEMPLATE/translations.yml
@@ -1,5 +1,4 @@
-name: "[Translations] Translation request/coordination"
-description: Coordinate translations of the Xclim documentation
+title: "[Translations] "
 labels: [ "docs" ]
 
 body:
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 006bae551..0d632792c 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -30,6 +30,8 @@
       - 'docs/**/*'
       - 'AUTHORS.rst'
       - 'CONTRIBUTING.rst'
+      - 'CODE_OF_CONDUCT.md'
+      - 'DISCUSSION_TEMPLATE/**/*'
       - 'ISSUE_TEMPLATE/**/*'
       - 'ISSUE_TEMPLATE.md'
       - 'PULL_REQUEST_TEMPLATE.md'