diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 00970a6cbd..b07001fe43 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: bug
+labels: 'kind: bug'
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 994a4d2876..0e0664e5da 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest a feature or improvement for AMUSE
 title: ''
-labels: feature request
+labels: 'kind: feature request'
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 38c24dbb47..564faf8007 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -2,7 +2,7 @@
 name: Question
 about: Ask an AMUSE-related question
 title: ''
-labels: question
+labels: 'kind: question'
 assignees: ''
 
 ---
diff --git a/.github/stale.yml b/.github/stale.yml
index 1b34568eb5..9b97c29378 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -4,13 +4,13 @@ daysUntilStale: 365
 daysUntilClose: 365
 # Issues with these labels will never be considered stale
 exemptLabels:
-  - pinned
-  - security
-  - feature request
-  - keep-open
-  - bug
+  - 'status: pinned'
+  - 'kind: security'
+  - 'kind: feature request'
+  - 'status: keep-open'
+  - 'kind: bug'
 # Label to use when marking an issue as stale
-staleLabel: stale
+staleLabel: 'status: stale'
 # Comment to post when marking an issue as stale. Set to `false` to disable
 markComment: >
   This issue has been automatically marked as stale because it has not had