diff --git a/.github/BOTMETA.yml b/.github/BOTMETA.yml
index 6e365a054e..e5c227064b 100644
--- a/.github/BOTMETA.yml
+++ b/.github/BOTMETA.yml
@@ -173,7 +173,7 @@ files:
   $modules/cloud/vmware/: &vmware
     ignored: cigamit jcpowermac mtnbikenc tchernomax
     keywords: [ esx, vcenter, vcsa, vcsim, vsphere ]
-    labels: vmware
+    labels: [ cloud, vmware ]
     maintainers: $team_vmware
     notified: lparkes
   $modules/cloud/vmware/vmware_vm_shell.py: chrrrles
@@ -202,7 +202,7 @@ files:
     labels: [ database, mysql ]
     maintainers: $team_mysql
   $modules/database/postgresql/: &postgresql
-    keywords: [ postgres, postgresql ]
+    keywords: [ database, postgres, postgresql ]
     labels: postgresql
     maintainers: $team_postgresql
     notified: jbscalia
@@ -264,7 +264,11 @@ files:
       - infoblox
   $modules/net_tools/netbox/: fragmentedpacket
   $modules/network/a10/: ericchou1 mischapeters
-  $modules/network/aci/: $team_aci
+  $modules/network/aci/: &aci
+    keywords: [ ACI, Cisco MSC, Cisco MSO, MultiSite, Multi-Site ]
+    labels: [ aci, cisco, networking ]
+    maintainers: $team_aci
+    notified: koladiya
   $modules/network/aireos/: &aireos
     maintainers: $team_aireos
     labels: [ aireos, cisco, networking ]
@@ -319,7 +323,7 @@ files:
     labels: [ cisco, networking, nxos ]
     maintainers: $team_nxos
   $modules/network/nso/: &nso
-    labels: [ cisco, network, nso ]
+    labels: [ cisco, networking, nso ]
     maintainers: $team_nso
   $modules/network/onyx/: $team_onyx
   $modules/network/ordnance/: alexanderturner djh00t
@@ -398,7 +402,7 @@ files:
   $modules/remote_management/foreman/: ehelms
   $modules/remote_management/hpilo/: dagwieers haad
   $modules/remote_management/imc/:
-    labels: cisco
+    labels: [ cisco ]
     maintainers: $team_imc
   $modules/remote_management/ipmi/: cloudnull
   $modules/remote_management/lxca/: navalkp prabhosa
@@ -413,7 +417,7 @@ files:
   $modules/source_control/github_key.py:
     ignored: erydo
   $modules/source_control/gitlab_: &gitlab
-    keywords: [ gitlab ]
+    keywords: [ gitlab, source_control ]
     labels: gitlab
     maintainers: $team_gitlab
     notified: jlozadad
@@ -682,11 +686,7 @@ files:
     labels: networking
   $module_utils/network/a10:
     maintainers: ericchou1 mischapeters
-  $module_utils/network/aci: &aci
-    keywords: [ ACI, Cisco MSC, Cisco MSO, MultiSite, Multi-Site ]
-    labels: [ aci, networking ]
-    maintainers: $team_aci
-    notified: koladiya
+  $module_utils/network/aci: *aci
   $module_utils/network/aireos: *aireos
   $module_utils/network/aos:
     maintainers: dgarros jeremyschulman
@@ -733,8 +733,9 @@ files:
       - fortimanager
       - networking
   $module_utils/network/ios:
-    support: network
+    <<: *ios
     maintainers: $team_networking $team_ios
+    support: network
   $module_utils/network/iosxr:
     <<: *iosxr
     maintainers: $team_networking $team_iosxr