diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index a6f131479..3c477eda9 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -1,7 +1,7 @@
 name: Bug Report
 description: File a bug report
 title: "bug: <title>"
-type: Bug
+type: Fix
 assignees:
   - edgarrmondragon
 
diff --git a/.github/ISSUE_TEMPLATE/docs.yml b/.github/ISSUE_TEMPLATE/docs.yml
index de84539e0..b47a9909d 100644
--- a/.github/ISSUE_TEMPLATE/docs.yml
+++ b/.github/ISSUE_TEMPLATE/docs.yml
@@ -1,6 +1,7 @@
 name: Documentation change
 description: Request a documentation change
 title: "docs: <title>"
+type: Docs
 labels: ["Documentation", "valuestream/SDK"]
 assignees:
   - edgarrmondragon
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
index 4715db963..bf435a43d 100644
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -2,7 +2,7 @@ name: Feature request
 description: Request a new feature
 title: "feat: <title>"
 labels: ["kind/Feature", "valuestream/SDK"]
-type: Enhancement
+type: Feat
 assignees:
   - edgarrmondragon