diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index db0b941e95..fad34bb326 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,7 +1,7 @@
 ---
 name: Bug report
 about: Report a bug encountered while using Liqo
-labels: kind/bug
+labels: kind/fix
 
 ---
 
diff --git a/.github/release.yml b/.github/release.yml
index 98711bd2d5..cb9b202c9e 100644
--- a/.github/release.yml
+++ b/.github/release.yml
@@ -10,16 +10,37 @@ changelog:
       - kind/breaking
     - title: ":rocket: New Features"
       labels:
-      - kind/feature
+      - kind/feat
     - title: ":bug: Bug Fixes"
       labels:
-      - kind/bug
+      - kind/fix
     - title: ":broom: Code Refactoring"
       labels:
-      - kind/cleanup
+      - kind/refactor
     - title: ":memo: Documentation"
       labels:
       - kind/docs
+    - title: ":lipstick: Code Style"
+      labels:
+      - kind/style
+    - title: ":racehorse: Performance Improvement"
+      labels:
+      - kind/perf
+    - title: ":white_check_mark: Tests"
+      labels:
+      - kind/test
+    - title: ":truck: Dependencies Management"
+      labels:
+      - kind/chore
+    - title: ":package: Builds Management"
+      labels:
+      - kind/build
+    - title: ":construction_worker: CI/CD"
+      labels:
+      - kind/ci
+    - title: ":rewind: Reverts Previous Changes"
+      labels:
+      - kind/revert
     - title: Other Changes
       labels:
       - "*"
diff --git a/.github/workflows/greeting.yml b/.github/workflows/greeting.yml
index b5bbe96d04..a0cb2716dc 100644
--- a/.github/workflows/greeting.yml
+++ b/.github/workflows/greeting.yml
@@ -30,7 +30,15 @@ jobs:
 
             Make sure this PR appears in the **${{ github.event.repository.name }} changelog**, adding one of the following **labels**:
             * `kind/breaking`:      :boom: Breaking Change
-            * `kind/feature`:       :rocket: New Feature
-            * `kind/bug`:           :bug: Bug Fix
-            * `kind/cleanup`:       :broom: Code Refactoring
+            * `kind/feat`:          :rocket: New Feature
+            * `kind/fix`:           :bug: Bug Fix
+            * `kind/refactor`:      :broom: Code Refactoring
             * `kind/docs`:          :memo: Documentation
+            * `kind/style`:         :lipstick: Code Style
+            * `kind/perf`:          :racehorse: Performance Improvement
+            * `kind/test`:          :white_check_mark: Tests
+            * `kind/chore`:         :truck: Dependencies Management
+            * `kind/build`:         :package: Builds Management
+            * `kind/ci`:            :construction_worker: CI/CD
+            * `kind/revert`:        :rewind: Reverts Previous Changes
+
diff --git a/docs/contributing/contributing.md b/docs/contributing/contributing.md
index cdd951ef11..a024c76258 100644
--- a/docs/contributing/contributing.md
+++ b/docs/contributing/contributing.md
@@ -14,10 +14,17 @@ Liqo leverages the automatic release notes generation capabilities featured by G
 Specifically, PRs characterized by the following labels get included in the respective category:
 
 * *kind/breaking*: 💥 Breaking Change
-* *kind/feature*: 🚀 New Features
-* *kind/bug*: 🐛 Bug Fixes
-* *kind/cleanup*: 🧹 Code Refactoring
+* *kind/feat*: 🚀 New Features
+* *kind/fix*: 🐛 Bug Fixes
+* *kind/refactor*: 🧹 Code Refactoring
 * *kind/docs*: 📝 Documentation
+* *kind/style: 💄Code Style
+* *kind/perf: 🐎 Performance Improvement
+* *kind/test: ✅ Tests
+* *kind/chore: 🚚 Dependencies Management
+* *kind/build: 📦 Builds Management
+* *kind/ci: 👷 CI/CD
+* *kind/revert: ⏪ Reverts Previous Changes
 
 ## Local development