diff --git a/.github/DISCUSSION_TEMPLATE/ideas.yml b/.github/DISCUSSION_TEMPLATE/ideas.yml
index e3bc6e46374..960289119cc 100644
--- a/.github/DISCUSSION_TEMPLATE/ideas.yml
+++ b/.github/DISCUSSION_TEMPLATE/ideas.yml
@@ -1,5 +1,5 @@
 title: "[Ideas] "
-labels: ["enhancement"]
+labels: ["type: Enhancement"]
 body:
   - type: markdown
     attributes:
diff --git a/.github/DISCUSSION_TEMPLATE/proposal.yml b/.github/DISCUSSION_TEMPLATE/proposal.yml
index a2b8888324d..e6c5d3a162a 100644
--- a/.github/DISCUSSION_TEMPLATE/proposal.yml
+++ b/.github/DISCUSSION_TEMPLATE/proposal.yml
@@ -1,4 +1,5 @@
 title: "[Proposal] "
+labels: ["type: Proposal"]
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 71ce3692eca..732cc92a266 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -1,7 +1,7 @@
 name: "\U0001F41B Bug Report"
 description: Problems and issues with code in Cloudberry Database core.
 title: "[Bug] "
-labels: ["bug"]
+labels: ["type: Bug"]
 body:
   - type: markdown
     attributes:
diff --git a/.gitmessage b/.gitmessage
index 811a935315b..7c5ad79a4cb 100644
--- a/.gitmessage
+++ b/.gitmessage
@@ -40,4 +40,8 @@ Add your commit body here
 #
 # Note: Usage - use this config for your own git
 # Run the configure cmd in the terminal
-# `git config --global commit.template .gitmessage`
\ No newline at end of file
+# `git config --global commit.template .gitmessage`
+#
+#
+#
+#