diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yaml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yaml
index a975c0b99..df3dc8671 100644
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.yaml
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.yaml
@@ -1,7 +1,6 @@
 name: Bug Report
 description: "Create a bug report to help us improve ZITADEL."
 title: "[Bug]: "
-labels: ["bug"]
 type: Bug
 body:
 - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/docs.yaml b/.github/ISSUE_TEMPLATE/docs.yaml
index d3f82b994..57eea0d0d 100644
--- a/.github/ISSUE_TEMPLATE/docs.yaml
+++ b/.github/ISSUE_TEMPLATE/docs.yaml
@@ -1,6 +1,6 @@
 name: 📄 Documentation
 description: Create an issue for missing or wrong documentation.
-labels: ["docs"]
+labels: ["area/docs"]
 type: task
 body:
   - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index 5f565e604..f2b573930 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -1,6 +1,5 @@
 name: 💡 Proposal / Feature request
 description: "Create an issue for a feature request/proposal."
-labels: ["enhancement"]
 type: enhancement
 body:
   - type: markdown
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 6696343e1..29b2aafbe 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -16,7 +16,7 @@ updates:
     interval: weekly
     time: "02:00"
   labels:
-   - "npm"
+   - "javascript"
    - "dependencies"
   open-pull-requests-limit: 10
   commit-message:
@@ -49,7 +49,7 @@ updates:
     interval: weekly
     time: "02:00"
   labels:
-   - "gomod"
+   - "go"
    - "dependencies"
   open-pull-requests-limit: 10
   commit-message:
@@ -101,6 +101,6 @@ updates:
     prefix: chore
     include: scope
   labels:
-    - "npm"
+    - "javascript"
     - "dependencies"
-    - "documentation"
+    - "area/docs"