diff --git a/.asf.yaml b/.asf.yaml
index 60fe3ffba7d..032190ddfd6 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -27,11 +27,16 @@ github:
     - infrastructure
     - java
     - python
-    - hosting
     - kvm
+    - libvirt
     - vsphere
+    - vmware
     - xenserver
     - xcp-ng
+    - orchestartion
+    - virtualization
+    - virtual-machine
+    - kubernetes
 
   features:
     wiki: true