diff --git a/.github/labeler.yaml b/.github/labeler.yaml
index d642545a5..3b3447511 100644
--- a/.github/labeler.yaml
+++ b/.github/labeler.yaml
@@ -1,9 +1,33 @@
 ---
+# Area
 area/ansible:
-  - "ansible/**/*"
-area/ci:
-  - ".github/**/*"
-area/cluster:
-  - "cluster/**/*"
+  - changed-files:
+      - any-glob-to-any-file: ansible/**/*
+area/docs:
+  - changed-files:
+      - any-glob-to-any-file: docs/**/*
+      - any-glob-to-any-file: README.md
+area/github:
+  - changed-files:
+      - any-glob-to-any-file: .github/**/*
+area/kubernetes:
+  - changed-files:
+      - any-glob-to-any-file: kubernetes/**/*
+area/taskfile:
+  - changed-files:
+      - any-glob-to-any-file: .taskfiles/**/*
+      - any-glob-to-any-file: Taskfile*
 area/terraform:
-  - "terraform/**/*"
+  - changed-files:
+      - any-glob-to-any-file: terraform/**/*
+# Cluster
+cluster/main:
+  - changed-files:
+      - any-glob-to-any-file: ansible/main/**/*
+      - any-glob-to-any-file: kubernetes/main/**/*
+      - any-glob-to-any-file: terraform/main/**/*
+cluster/storage:
+  - changed-files:
+      - any-glob-to-any-file: ansible/storage/**/*
+      - any-glob-to-any-file: kubernetes/storage/**/*
+      - any-glob-to-any-file: terraform/storage/**/*
diff --git a/.github/labels.yaml b/.github/labels.yaml
index f97860581..c20a855af 100644
--- a/.github/labels.yaml
+++ b/.github/labels.yaml
@@ -1,68 +1,46 @@
 ---
-# Area
+# Areas
 - name: area/ansible
-  color: "72ccf3"
-- name: area/ci
-  color: "72ccf3"
-- name: area/cluster
-  color: "72ccf3"
+  color: "0e8a16"
+- name: area/docs
+  color: "0e8a16"
+- name: area/github
+  color: "0e8a16"
+- name: area/kubernetes
+  color: "0e8a16"
+- name: area/taskfile
+  color: "0e8a16"
 - name: area/terraform
-  color: "72ccf3"
-# Renovate
+  color: "0e8a16"
+# Clusters
+- name: cluster/main
+  color: "ffc300"
+- name: cluster/storage
+  color: "ffc300"
+# Renovate Types
 - name: renovate/ansible
-  color: "ffc300"
+  color: "027fa0"
 - name: renovate/container
-  color: "ffc300"
+  color: "027fa0"
 - name: renovate/github-action
-  color: "ffc300"
+  color: "027fa0"
+- name: renovate/grafana-dashboard
+  color: "027fa0"
 - name: renovate/github-release
-  color: "ffc300"
+  color: "027fa0"
 - name: renovate/helm
-  color: "ffc300"
+  color: "027fa0"
 - name: renovate/terraform
-  color: "ffc300"
-# Semantic Type
+  color: "027fa0"
+# Semantic Types
+- name: type/digest
+  color: "ffeC19"
 - name: type/patch
-  color: "FFEC19"
+  color: "ffeC19"
 - name: type/minor
-  color: "FF9800"
+  color: "ff9800"
 - name: type/major
-  color: "F6412D"
-# Size
-- name: size/XS
-  color: "009900"
-  description: >-
-    Denotes a PR that changes 0-9 lines, ignoring generated files.
-- name: size/S
-  color: "77bb00"
-  description: >-
-    Denotes a PR that changes 10-29 lines, ignoring generated files.
-- name: size/M
-  color: "eebb00"
-  description: >-
-    Denotes a PR that changes 30-99 lines, ignoring generated files.
-- name: size/L
-  color: "ee9900"
-  description: >-
-    Denotes a PR that changes 100-499 lines, ignoring generated files.
-- name: size/XL
-  color: "ee5500"
-  description: >-
-    Denotes a PR that changes 500-999 lines, ignoring generated files.
-- name: size/XXL
-  color: "ee0000"
-  description: >-
-    Denotes a PR that changes 1000+ lines, ignoring generated files.
+  color: "f6412d"
 # Uncategorized
-- name: bug
+- name: hold/upstream
   color: "ee0701"
-- name: do-not-merge
-  color: "ee0701"
-- name: docs
-  color: "F4D1B7"
-- name: enhancement
-  color: "84b6eb"
-- name: broken-links
-  color: "7B55D7"
-- name: question
-  color: "cc317c"
diff --git a/.github/workflows/meta-labeler.yml b/.github/workflows/meta-labeler.yml
index 3c519f1c1..bd0e10aa4 100644
--- a/.github/workflows/meta-labeler.yml
+++ b/.github/workflows/meta-labeler.yml
@@ -19,7 +19,7 @@ jobs:
           private_key: "${{ secrets.BOT_APP_PRIVATE_KEY }}"
 
       - name: Labeler
-        uses: actions/labeler@ac9175f8a1f3625fd0d4fb234536d26811351594 # v4.3.0
+        uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
         with:
           configuration-path: .github/labeler.yaml
           repo-token: "${{ steps.generate-token.outputs.token }}"