diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 8515c30..17cb5fd 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -1,7 +1,7 @@
 name: Bug Report
 description: File a bug report
 title: "[Bug]: "
-labels: ["1: bug", "2: tests"]
+labels: ["bug", "tests"]
 assignees:
   - octocat
 body:
diff --git a/.github/ISSUE_TEMPLATE/eda_request.yaml b/.github/ISSUE_TEMPLATE/eda_request.yaml
index 563bdf3..3000186 100644
--- a/.github/ISSUE_TEMPLATE/eda_request.yaml
+++ b/.github/ISSUE_TEMPLATE/eda_request.yaml
@@ -1,7 +1,7 @@
 name: EDA request
 description: Request an EDA request
 title: "[EDA]: "
-labels: ["1: eda"]
+labels: ["eda"]
 assignees:
   - octocat
 body:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
index c936b91..0449782 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -1,7 +1,7 @@
 name: Feature request
 description: Request a feature addition
 title: "[Feature]: "
-labels: ["1: feature", "2: tests"]
+labels: ["feature", "tests"]
 assignees:
   - octocat
 body:
diff --git a/.github/ISSUE_TEMPLATE/maintenance_request.yaml b/.github/ISSUE_TEMPLATE/maintenance_request.yaml
index 69e6460..07edf8f 100644
--- a/.github/ISSUE_TEMPLATE/maintenance_request.yaml
+++ b/.github/ISSUE_TEMPLATE/maintenance_request.yaml
@@ -1,7 +1,7 @@
 name: Maintenance request
 description: Describe the technical debt or runtime updates
 title: "[Maintenance]: "
-labels: ["1: maintenance"]
+labels: ["maintenance"]
 assignees:
   - octocat
 body:
diff --git a/.github/ISSUE_TEMPLATE/user_story.yaml b/.github/ISSUE_TEMPLATE/user_story.yaml
index ab3e87e..659ac6b 100644
--- a/.github/ISSUE_TEMPLATE/user_story.yaml
+++ b/.github/ISSUE_TEMPLATE/user_story.yaml
@@ -1,7 +1,7 @@
 name: User story
 description: A valuable increment of functionality, testable by the users
 title: "[User story]: "
-labels: ["1: story"]
+labels: ["story"]
 assignees:
   - octocat
 body:
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 9652cab..10650a1 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -12,6 +12,7 @@ Please select option(s) that are relevant.
 
 - [ ] Bug fix (non-breaking change which fixes an issue)
 - [ ] New feature (non-breaking change which adds functionality)
+- [ ] Maintenance requests
 - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
 - [ ] This change requires a documentation update