diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c1a599fb..45d15f9d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 * `getValueOrDefault` helper ([#125])
 * `makeMergeable` helper ([#126])
 * `commodore component compile` to compile a single component ([#122])
+* labels to issue templates ([#134])
 
 ### Changed
 
@@ -100,3 +101,4 @@ Initial implementation
 [#125]: https://github.com/projectsyn/commodore/pull/125
 [#126]: https://github.com/projectsyn/commodore/pull/126
 [#130]: https://github.com/projectsyn/commodore/pull/130
+[#134]: https://github.com/projectsyn/commodore/pull/134
diff --git a/commodore/component-template/{{ cookiecutter.slug }}/.github/ISSUE_TEMPLATE/01_bug_report.md b/commodore/component-template/{{ cookiecutter.slug }}/.github/ISSUE_TEMPLATE/01_bug_report.md
index c2be0d8cc..f074759e4 100644
--- a/commodore/component-template/{{ cookiecutter.slug }}/.github/ISSUE_TEMPLATE/01_bug_report.md	
+++ b/commodore/component-template/{{ cookiecutter.slug }}/.github/ISSUE_TEMPLATE/01_bug_report.md	
@@ -1,7 +1,7 @@
 ---
 name: 🐜 Bug report
 about: Create a report to help us improve 🔧
-
+labels: bug
 ---
 
 <!-- Place a general description or your issue here. -->
diff --git a/commodore/component-template/{{ cookiecutter.slug }}/.github/ISSUE_TEMPLATE/02_feature_request.md b/commodore/component-template/{{ cookiecutter.slug }}/.github/ISSUE_TEMPLATE/02_feature_request.md
index a58a8a734..bf42f3668 100644
--- a/commodore/component-template/{{ cookiecutter.slug }}/.github/ISSUE_TEMPLATE/02_feature_request.md	
+++ b/commodore/component-template/{{ cookiecutter.slug }}/.github/ISSUE_TEMPLATE/02_feature_request.md	
@@ -1,7 +1,7 @@
 ---
 name: 🚀 Feature request
 about: Suggest an idea for this project 💡
-
+labels: enhancement
 ---
 
 ## Context