diff --git a/.github/labeler.yaml b/.github/labeler.yaml
index 943dbeae..0b474bc5 100644
--- a/.github/labeler.yaml
+++ b/.github/labeler.yaml
@@ -1,9 +1,18 @@
 ---
 area/ansible:
   - "ansible/**/*"
+  - "bootstrap/templates/ansible/**/*"
+  - "bootstrap/tasks/ansible/**/*"
 area/github:
   - ".github/**/*"
 area/kubernetes:
   - "kubernetes/**/*"
+  - "bootstrap/templates/kubernetes/**/*"
+  - "bootstrap/tasks/kubernetes/**/*"
 area/bootstrap:
   - "bootstrap/**/*"
+  - "bootstrap/configure.yaml"
+area/addons:
+  - "bootstrap/templates/addons/**/*"
+  - "bootstrap/tasks/addons/**/*"
+  - "bootstrap/vars/addons.sample.yaml"
diff --git a/.github/labels.yaml b/.github/labels.yaml
index bab08fc8..6a4b9d75 100644
--- a/.github/labels.yaml
+++ b/.github/labels.yaml
@@ -12,10 +12,10 @@
   color: "72ccf3"
   description: >-
     Changes made in the kubernetes directory
-- name: area/template
+- name: area/addons
   color: "72ccf3"
   description: >-
-    Changes made in the template directory
+    Changes made in the addons directory
 # Renovate
 - name: renovate/ansible
   color: "ffc300"