diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index c0af360ba..8c35577f6 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,7 @@
 ---
 name: Bug Report
 about: Use this template for reporting a bug.
+labels: bug
 ---
 
 # Bug Report
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
index 7a88393a0..278530c11 100644
--- a/.github/ISSUE_TEMPLATE/documentation.md
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -1,9 +1,9 @@
 ---
 name: Documentation issue
 about: Use this template for reporting issue or improvements for documentation.
+labels: documentation
 ---
-
-## Documentation bug, improvement
+# Documentation issue
 
 ## Description
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 6624d7b81..28883c4f5 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,9 +1,10 @@
 ---
 name: Feature request
 about: Use this template to suggest an idea for this project.
+labels: feature-request
 ---
 
-## Feature Request
+# Feature Request
 
 ## Description
 
diff --git a/.github/ISSUE_TEMPLATE/maintainance.md b/.github/ISSUE_TEMPLATE/maintainance.md
new file mode 100644
index 000000000..4aee8f6af
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/maintainance.md
@@ -0,0 +1,19 @@
+---
+name: Maintainance task
+about: Use this template to propose a maintainance task.
+labels: maintainance
+---
+
+# Maintainance task
+
+## Description
+
+<!--- Description of the maintainance task you are proposing. Please include as much context and information as possible. -->
+
+## Possible Solution
+
+<!--- Only if you have suggestions on a implementation -->
+
+## Additional information
+
+<!-- Only if you want to share additional context or related information -->
\ No newline at end of file
diff --git a/booster.code-workspace b/booster.code-workspace
index 1855b8913..03b3e1831 100644
--- a/booster.code-workspace
+++ b/booster.code-workspace
@@ -1,5 +1,9 @@
 {
   "folders": [
+    {
+      "name": "✨ root",
+      "path": "."
+    },
     {
       "name": "📦 @boostercloud/application-tester",
       "path": "packages/application-tester"