diff --git a/.github/BOTMETA.yml b/.github/BOTMETA.yml
index 6688bbfb1b..3f19859091 100644
--- a/.github/BOTMETA.yml
+++ b/.github/BOTMETA.yml
@@ -10,7 +10,7 @@ files:
     maintainers: paulquack
     labels: ironware networking
   $actions/shutdown.py:
-    authors: nitzmahone samdoran aminvakil
+    maintainers: nitzmahone samdoran aminvakil
   $becomes/:
     labels: become
   $callbacks/:
@@ -76,9 +76,9 @@ files:
     maintainers: bvitnik
     labels: xenserver
   $filters/time.py:
-    authors: resmo
+    maintainers: resmo
   $filters/jc.py:
-    authors: kellyjonbrazil
+    maintainers: kellyjonbrazil
   $httpapis/:
     maintainers: $team_networking
     labels: networking
@@ -121,9 +121,9 @@ files:
     maintainers: jpmens
     labels: dig
   $lookups/tss.py:
-    authors: amigus
+    maintainers: amigus
   $lookups/dsv.py:
-    authors: amigus
+    maintainers: amigus
   $lookups/hashi_vault.py:
     labels: hashi_vault
     maintainers: briantist
@@ -150,7 +150,6 @@ files:
     labels: huawei hwc_utils networking
     keywords: cloud huawei hwc
   $module_utils/identity/keycloak/keycloak.py:
-    authors: eikef
     maintainers: $team_keycloak
   $module_utils/ipa.py:
     maintainers: $team_ipa
@@ -194,20 +193,18 @@ files:
     maintainers: bvitnik
     labels: xenserver
   $modules/cloud/alicloud/:
-    authors: xiaozhu36
+    maintainers: xiaozhu36
   $modules/cloud/atomic/atomic_container.py:
-    authors: giuseppe
-    maintainers: krsacme
+    maintainers: giuseppe krsacme
   $modules/cloud/atomic/:
-    authors: krsacme
+    maintainers: krsacme
   $modules/cloud/centurylink/:
-    authors: clc-runner
+    maintainers: clc-runner
   $modules/cloud/dimensiondata/dimensiondata_network.py:
-    authors: aimonb
-    maintainers: tintoy
+    maintainers: aimonb tintoy
     labels: dimensiondata_network
   $modules/cloud/dimensiondata/dimensiondata_vlan.py:
-    authors: tintoy
+    maintainers: tintoy
   $modules/cloud/docker/:
     maintainers: $team_docker
     ignore: cove
@@ -216,1072 +213,850 @@ files:
     maintainers: sluther
     labels: docker_compose
   $modules/cloud/docker/docker_config.py:
-    authors: chouseknecht ushuz
+    maintainers: ushuz
   $modules/cloud/docker/docker_container.py:
-    authors: ThomasSteinbach chouseknecht cove dusdanig felixfontein kassiansun softzilla zfil
+    maintainers: dusdanig softzilla zfil
     ignore: ThomasSteinbach cove joshuaconner
-  $modules/cloud/docker/docker_container_info.py:
-    authors: felixfontein
-  $modules/cloud/docker/docker_host_info.py:
-    authors: WojciechowskiPiotr
   $modules/cloud/docker/docker_image.py:
-    authors: chouseknecht softzilla ssbarnea
+    maintainers: softzilla ssbarnea
   $modules/cloud/docker/docker_login.py:
-    authors: chouseknecht olsaki
+    maintainers: olsaki
   $modules/cloud/docker/docker_network.py:
-    authors: DBendit chouseknecht keitwb
+    maintainers: keitwb
     labels: docker_network
-  $modules/cloud/docker/docker_network_info.py:
-    authors: DBendit
-  $modules/cloud/docker/docker_node.py:
-    authors: WojciechowskiPiotr tbouvet
-  $modules/cloud/docker/docker_node_info.py:
-    authors: WojciechowskiPiotr
-  $modules/cloud/docker/docker_prune.py:
-    authors: felixfontein
-  $modules/cloud/docker/docker_stack.py:
-    authors: dariko
   $modules/cloud/docker/docker_stack_task_info.py:
-    authors: imjoseangel
-  $modules/cloud/docker/docker_swarm.py:
-    authors: WojciechowskiPiotr tbouvet
-  $modules/cloud/docker/docker_swarm_info.py:
-    authors: WojciechowskiPiotr
+    maintainers: imjoseangel
   $modules/cloud/docker/docker_swarm_service.py:
-    authors: dariko hannseman jwitko
+    maintainers: hannseman
     labels: docker_swarm_service
   $modules/cloud/docker/docker_swarm_service_info.py:
-    authors: hannseman
+    maintainers: hannseman
   $modules/cloud/docker/docker_volume.py:
-    authors: agronholm
-  $modules/cloud/docker/docker_volume_info.py:
-    authors: felixfontein
+    maintainers: agronholm
   $modules/cloud/google/:
-    authors: supertom
     maintainers: $team_google
     ignore: supertom
-    supershipit: erjohnso rambleraptor
+    supershipit: $team_google
   $modules/cloud/heroku/heroku_collaborator.py:
-    authors: marns93
+    maintainers: marns93
   $modules/cloud/huawei/:
-    authors: huaweicloud
-    maintainers: $team_huawei
+    maintainers: $team_huawei huaweicloud
     keywords: cloud huawei hwc
   $modules/cloud/kubevirt/:
-    authors: kubevirt
-    maintainers: $team_kubevirt
+    maintainers: $team_kubevirt kubevirt
     keywords: kubevirt
   $modules/cloud/linode/:
     maintainers: $team_linode
   $modules/cloud/linode/linode.py:
-    authors: zbal
-  $modules/cloud/linode/linode_v4.py:
-    authors: decentral1se
+    maintainers: zbal
   $modules/cloud/lxc/lxc_container.py:
-    authors: cloudnull
+    maintainers: cloudnull
   $modules/cloud/lxd/:
-    authors: hnakamur
+    maintainers: hnakamur
   $modules/cloud/memset/:
-    authors: glitchcrab
+    maintainers: glitchcrab
   $modules/cloud/misc/cloud_init_data_facts.py:
-    authors: resmo
+    maintainers: resmo
   $modules/cloud/misc/helm.py:
-    authors: flaper87
+    maintainers: flaper87
   $modules/cloud/misc/proxmox.py:
-    authors: UnderGreen
-    maintainers: $team_virt
+    maintainers: $team_virt UnderGreen
     labels: proxmox virt
     ignore: skvidal
     keywords: kvm libvirt proxmox qemu
   $modules/cloud/misc/proxmox_kvm.py:
-    authors: helldorado
-    maintainers: $team_virt
+    maintainers: $team_virt helldorado
     labels: proxmox_kvm virt
     ignore: skvidal
     keywords: kvm libvirt proxmox qemu
   $modules/cloud/misc/proxmox_template.py:
-    authors: UnderGreen
-    maintainers: $team_virt
+    maintainers: $team_virt UnderGreen
     labels: proxmox_template virt
     ignore: skvidal
     keywords: kvm libvirt proxmox qemu
   $modules/cloud/misc/rhevm.py:
-    authors: TimothyVandenbrande
-    maintainers: $team_virt
+    maintainers: $team_virt TimothyVandenbrande
     labels: rhevm virt
     ignore: skvidal
     keywords: kvm libvirt proxmox qemu
   $modules/cloud/misc/:
-    authors: ryansb
     ignore: ryansb
   $modules/cloud/misc/terraform.py:
     maintainers: m-yosefpor
-  $modules/cloud/misc/virt.py:
-    authors: ansible skvidal
-    maintainers: $team_virt
-    labels: virt
-    ignore: skvidal
-    keywords: kvm libvirt proxmox qemu
-  $modules/cloud/misc/virt_net.py:
-    authors: drybjed
-    maintainers: $team_virt
-    labels: virt virt_net
-    ignore: skvidal
-    keywords: kvm libvirt proxmox qemu
-  $modules/cloud/misc/virt_pool.py:
-    authors: drybjed
-    maintainers: $team_virt
-    labels: virt virt_pool
-    ignore: skvidal
-    keywords: kvm libvirt proxmox qemu
   $modules/cloud/misc/xenserver_facts.py:
-    authors: andyhky caphrim007 cheese
+    maintainers: caphrim007 cheese
     labels: xenserver_facts
     ignore: andyhky
   $modules/cloud/oneandone/:
-    authors: aajdinov edevenport
+    maintainers: aajdinov edevenport
   $modules/cloud/online/:
-    authors: sieben
-  $modules/cloud/opennebula/one_image_facts.py:
-    authors: ilicmilan meerkampdvv
-    maintainers: rsmontero xorel
+    maintainers: sieben
+  $modules/cloud/opennebula/:
+    maintainers: $team_opennebula
   $modules/cloud/opennebula/one_host.py:
-    authors: rvalle
-    maintainers: ilicmilan meerkampdvv rsmontero xorel
-  $modules/cloud/opennebula/one_image.py:
-    authors: ilicmilan
-    maintainers: meerkampdvv rsmontero xorel
-  $modules/cloud/opennebula/one_image_info.py:
-    authors: ilicmilan meerkampdvv
-    maintainers: rsmontero xorel
-  $modules/cloud/opennebula/one_service.py:
-    authors: ilicmilan
-    maintainers: meerkampdvv rsmontero xorel
-  $modules/cloud/opennebula/one_vm.py:
-    authors: ilicmilan meerkampdvv
-    maintainers: rsmontero xorel
+    maintainers: rvalle
   $modules/cloud/oracle/oci_vcn.py:
-    authors: rohitChaware
-    maintainers: $team_oracle
+    maintainers: $team_oracle rohitChaware
   $modules/cloud/ovh/:
-    authors: pascalheraud
+    maintainers: pascalheraud
   $modules/cloud/ovh/ovh_monthly_billing.py:
-    authors: fraff
+    maintainers: fraff
   $modules/cloud/packet/packet_device.py:
-    authors: baldwinSPC t0mk teebes
+    maintainers: baldwinSPC t0mk teebes
   $modules/cloud/packet/:
-    authors: nurfet-becirevic t0mk
+    maintainers: nurfet-becirevic t0mk
   $modules/cloud/packet/packet_sshkey.py:
-    authors: t0mk
+    maintainers: t0mk
   $modules/cloud/profitbricks/:
-    authors: baldwinSPC
+    maintainers: baldwinSPC
   $modules/cloud/pubnub/pubnub_blocks.py:
-    authors: parfeon pubnub
+    maintainers: parfeon pubnub
   $modules/cloud/rackspace/rax.py:
-    authors: omgjlk sivel
+    maintainers: omgjlk sivel
   $modules/cloud/rackspace/:
-    authors: sivel
     ignore: ryansb sivel
   $modules/cloud/rackspace/rax_clb.py:
-    authors: claco sivel
+    maintainers: claco
   $modules/cloud/rackspace/rax_clb_nodes.py:
-    authors: neuroid
-    ignore: ryansb
+    maintainers: neuroid
   $modules/cloud/rackspace/rax_clb_ssl.py:
-    authors: smashwilson
-    ignore: ryansb
+    maintainers: smashwilson
   $modules/cloud/rackspace/rax_identity.py:
-    authors: claco sivel
+    maintainers: claco
   $modules/cloud/rackspace/rax_network.py:
-    authors: claco omgjlk
-    ignore: ryansb
+    maintainers: claco omgjlk
   $modules/cloud/rackspace/rax_queue.py:
-    authors: claco sivel
+    maintainers: claco
   $modules/cloud/scaleway/:
-    authors: sieben
     maintainers: $team_scaleway
   $modules/cloud/scaleway/scaleway_database_backup.py:
-    authors: guillaume_ro_fr
+    maintainers: guillaume_ro_fr
   $modules/cloud/scaleway/scaleway_image_info.py:
-    authors: Spredzy sieben
+    maintainers: Spredzy
   $modules/cloud/scaleway/scaleway_ip_info.py:
-    authors: Spredzy sieben
+    maintainers: Spredzy
   $modules/cloud/scaleway/scaleway_organization_info.py:
-    authors: Spredzy sieben
+    maintainers: sieben
   $modules/cloud/scaleway/scaleway_security_group.py:
-    authors: abarbare
     maintainers: DenBeke
   $modules/cloud/scaleway/scaleway_security_group_info.py:
-    authors: Spredzy sieben
+    maintainers: sieben
   $modules/cloud/scaleway/scaleway_security_group_rule.py:
-    authors: abarbare
     maintainers: DenBeke
   $modules/cloud/scaleway/scaleway_volume.py:
-    authors: hekonsek
     labels: scaleway_volume
     ignore: hekonsek
   $modules/cloud/scaleway/scaleway_volume_info.py:
-    authors: Spredzy sieben
+    maintainers: Spredzy
   $modules/cloud/smartos/:
     maintainers: $team_solaris
     labels: solaris
     keywords: beadm dladm illumos ipadm nexenta omnios openindiana pfexec smartos solaris sunos zfs zpool
-  $modules/cloud/smartos/smartos_image_facts.py:
-    authors: xen0l
-  $modules/cloud/smartos/imgadm.py:
-    authors: jasperla
   $modules/cloud/smartos/nictagadm.py:
-    authors: SmithX10
-  $modules/cloud/smartos/smartos_image_info.py:
-    authors: xen0l
-  $modules/cloud/smartos/vmadm.py:
-    authors: jasperla
+    maintainers: SmithX10
   $modules/cloud/softlayer/sl_vm.py:
-    authors: mcltn
+    maintainers: mcltn
   $modules/cloud/spotinst/spotinst_aws_elastigroup.py:
-    authors: talzur
+    maintainers: talzur
   $modules/cloud/univention/:
-    authors: keachi
+    maintainers: keachi
   $modules/cloud/webfaction/:
-    authors: quentinsf
+    maintainers: quentinsf
   $modules/cloud/xenserver/:
-    authors: bvitnik
+    maintainers: bvitnik
   $modules/clustering/consul/:
     maintainers: $team_consul
-  $modules/clustering/consul/consul.py:
-    authors: sgargan
   $modules/clustering/etcd3.py:
-    authors: evrardjp vfauth
+    maintainers: evrardjp vfauth
   $modules/clustering/nomad/:
     maintainers: chris93111
   $modules/clustering/pacemaker_cluster.py:
-    authors: matbu
+    maintainers: matbu
   $modules/clustering/znode.py:
-    authors: treyperry
+    maintainers: treyperry
   $modules/database/aerospike/aerospike_migrations.py:
-    authors: Alb0t
-  $modules/database/influxdb/influxdb_database.py:
-    authors: kamsz
+    maintainers: Alb0t
+  $modules/database/influxdb/:
+    maintainers: kamsz
   $modules/database/influxdb/influxdb_query.py:
-    authors: resmo
-    maintainers: kamsz
-  $modules/database/influxdb/influxdb_retention_policy.py:
-    authors: kamsz
+    maintainers: resmo
   $modules/database/influxdb/influxdb_user.py:
-    authors: zhhuta
-    maintainers: kamsz
+    maintainers: zhhuta
   $modules/database/influxdb/influxdb_write.py:
-    authors: resmo
-    maintainers: kamsz
+    maintainers: resmo
   $modules/database/misc/elasticsearch_plugin.py:
-    authors: ThePixelDeveloper samdoran
+    maintainers: ThePixelDeveloper samdoran
   $modules/database/misc/kibana_plugin.py:
-    authors: barryib
+    maintainers: barryib
   $modules/database/misc/odbc.py:
-    authors: john-westcott-iv
+    maintainers: john-westcott-iv
   $modules/database/misc/redis.py:
-    authors: slok
+    maintainers: slok
   $modules/database/misc/riak.py:
-    authors: drewkerrigan jsmartin
+    maintainers: drewkerrigan jsmartin
   $modules/database/mssql/mssql_db.py:
-    authors: vedit
-    maintainers: Jmainguy kenichi-ogawa-1988
+    maintainers: vedit Jmainguy kenichi-ogawa-1988
     labels: mssql_db
   $modules/database/postgresql/:
     keywords: database postgres postgresql
     labels: postgres postgresql
     maintainers: $team_postgresql
   $modules/database/postgresql/postgresql_ext.py:
-    authors: Andersson007 andytom dschep strk
+    maintainers: dschep strk
   $modules/database/postgresql/postgresql_lang.py:
-    authors: andytom jensdepuydt
-  $modules/database/postgresql/postgresql_pg_hba.py:
-    authors: sebasmannem
+    maintainers: jensdepuydt
   $modules/database/postgresql/postgresql_privs.py:
-    authors: b6d tcraxs
-  $modules/database/postgresql/postgresql_publication.py:
-    authors: Andersson007 nerzhul
+    maintainers: b6d
   $modules/database/postgresql/postgresql_query.py:
-    authors: Andersson007 archf wrouesnel
-  $modules/database/postgresql/postgresql_schema.py:
-    authors: Dorn- andytom
-  $modules/database/postgresql/postgresql_sequence.py:
-    authors: tcraxs
-  $modules/database/postgresql/postgresql_slot.py:
-    authors: Andersson007 jscalia
+    maintainers: archf wrouesnel
   $modules/database/postgresql/postgresql_tablespace.py:
-    authors: Andersson007 Dorn- antoinell
+    maintainers: antoinell
   $modules/database/vertica/:
-    authors: dareko
+    maintainers: dareko
   $modules/files/archive.py:
-    authors: bendoh
+    maintainers: bendoh
   $modules/files/ini_file.py:
-    authors: jpmens noseka1
+    maintainers: jpmens noseka1
   $modules/files/iso_extract.py:
-    authors: dagwieers jhoekx ribbons
+    maintainers: dagwieers jhoekx ribbons
   $modules/files/read_csv.py:
-    authors: dagwieers
+    maintainers: dagwieers
   $modules/files/xattr.py:
-    authors: bcoca
+    maintainers: bcoca
     labels: xattr
   $modules/files/xml.py:
-    authors: dagwieers magnus919 tbielawa
-    maintainers: cmprescott sm4rk0
+    maintainers: dagwieers magnus919 tbielawa cmprescott sm4rk0
     labels: m:xml xml
     ignore: magnus919
   $modules/identity/onepassword_facts.py:
-    authors: Rylon
+    maintainers: Rylon
   $modules/identity/ipa/:
     maintainers: $team_ipa
-  $modules/identity/ipa/ipa_config.py:
-    authors: fxfitz
-  $modules/identity/ipa/ipa_dnsrecord.py:
-    authors: Akasurde
-  $modules/identity/ipa/ipa_dnszone.py:
-    authors: fxfitz
   $modules/identity/ipa/ipa_service.py:
-    authors: cprh
-  $modules/identity/ipa/ipa_subca.py:
-    authors: Akasurde
+    maintainers: cprh
   $modules/identity/ipa/ipa_vault.py:
-    authors: jparrill
+    maintainers: jparrill
   $modules/identity/keycloak/:
     maintainers: $team_keycloak
   $modules/identity/keycloak/keycloak_group.py:
-    authors: adamgoossens
+    maintainers: adamgoossens
   $modules/identity/onepassword_info.py:
-    authors: Rylon
+    maintainers: Rylon
   $modules/identity/opendj/opendj_backendprop.py:
-    authors: dj-wasabi
+    maintainers: dj-wasabi
   $modules/monitoring/airbrake_deployment.py:
-    authors: bpennypacker
     labels: airbrake_deployment
     ignore: bpennypacker
   $modules/monitoring/bigpanda.py:
-    authors: hkariti
+    maintainers: hkariti
   $modules/monitoring/circonus_annotation.py:
-    authors: NickatEpic
+    maintainers: NickatEpic
   $modules/monitoring/datadog/datadog_event.py:
-    authors: arturaz n0ts
+    maintainers: n0ts
     labels: datadog_event
     ignore: arturaz
   $modules/monitoring/datadog/datadog_monitor.py:
-    authors: skornehl
+    maintainers: skornehl
   $modules/monitoring/honeybadger_deployment.py:
-    authors: stympy
+    maintainers: stympy
   $modules/monitoring/icinga2_feature.py:
-    authors: nerzhul
+    maintainers: nerzhul
   $modules/monitoring/icinga2_host.py:
-    authors: t794104
+    maintainers: t794104
   $modules/monitoring/librato_annotation.py:
-    authors: Sedward
+    maintainers: Sedward
   $modules/monitoring/logentries.py:
-    authors: ivanvanderbyl
     labels: logentries
     ignore: ivanvanderbyl
   $modules/monitoring/logstash_plugin.py:
-    authors: nerzhul
+    maintainers: nerzhul
   $modules/monitoring/monit.py:
-    authors: dstoflet
-    maintainers: brian-brazil snopoke
+    maintainers: dstoflet brian-brazil snopoke
     labels: monit
   $modules/monitoring/nagios.py:
-    authors: tbielawa
-    maintainers: tgoetheyn
+    maintainers: tbielawa tgoetheyn
   $modules/monitoring/newrelic_deployment.py:
-    authors: mcodd
+    maintainers: mcodd
   $modules/monitoring/pagerduty.py:
-    authors: bpennypacker suprememoocow thaumos
+    maintainers: suprememoocow thaumos
     labels: pagerduty
     ignore: bpennypacker
   $modules/monitoring/pagerduty_alert.py:
-    authors: ApsOps
+    maintainers: ApsOps
   $modules/monitoring/pingdom.py:
-    authors: thaumos
+    maintainers: thaumos
   $modules/monitoring/rollbar_deployment.py:
-    authors: kavu
+    maintainers: kavu
   $modules/monitoring/sensu/sensu_check.py:
-    authors: andsens
+    maintainers: andsens
   $modules/monitoring/sensu/:
-    authors: dmsimard
+    maintainers: dmsimard
   $modules/monitoring/sensu/sensu_silence.py:
-    authors: smbambling
+    maintainers: smbambling
   $modules/monitoring/sensu/sensu_subscription.py:
-    authors: andsens
+    maintainers: andsens
   $modules/monitoring/spectrum_device.py:
-    authors: orgito
+    maintainers: orgito
   $modules/monitoring/stackdriver.py:
-    authors: bwhaley
+    maintainers: bwhaley
   $modules/monitoring/statusio_maintenance.py:
-    authors: bhcopeland
+    maintainers: bhcopeland
   $modules/monitoring/uptimerobot.py:
-    authors: nate-kingsley
+    maintainers: nate-kingsley
   $modules/net_tools/cloudflare_dns.py:
-    authors: mgruener
+    maintainers: mgruener
     labels: cloudflare_dns
   $modules/net_tools/dnsimple.py:
-    authors: drcapulet
+    maintainers: drcapulet
   $modules/net_tools/dnsmadeeasy.py:
-    authors: briceburg
+    maintainers: briceburg
   $modules/net_tools/haproxy.py:
-    authors: ravibhure
+    maintainers: ravibhure
   $modules/net_tools/hetzner_failover_ip.py:
-    authors: felixfontein
+    maintainers: felixfontein
   $modules/net_tools/hetzner_failover_ip_info.py:
-    authors: felixfontein
+    maintainers: felixfontein
   $modules/net_tools/hetzner_firewall.py:
-    authors: felixfontein
+    maintainers: felixfontein
   $modules/net_tools/hetzner_firewall_info.py:
-    authors: felixfontein
+    maintainers: felixfontein
   $modules/net_tools/:
-    authors: nerzhul
+    maintainers: nerzhul
   $modules/net_tools/infinity/infinity.py:
-    authors: MeganLiu
+    maintainers: MeganLiu
   $modules/net_tools/ip_netns.py:
-    authors: bregman-arie
+    maintainers: bregman-arie
   $modules/net_tools/ipify_facts.py:
-    authors: resmo
+    maintainers: resmo
   $modules/net_tools/ipinfoio_facts.py:
-    authors: akostyuk
+    maintainers: akostyuk
   $modules/net_tools/ipwcli_dns.py:
-    authors: cwollinger
+    maintainers: cwollinger
   $modules/net_tools/ldap/ldap_attr.py:
-    authors: jtyr
+    maintainers: jtyr
   $modules/net_tools/ldap/ldap_attrs.py:
-    authors: drybjed jtyr noles
+    maintainers: drybjed jtyr noles
   $modules/net_tools/ldap/ldap_entry.py:
-    authors: jtyr
+    maintainers: jtyr
   $modules/net_tools/ldap/ldap_passwd.py:
-    authors: KellerFuchs
-    maintainers: jtyr
+    maintainers: KellerFuchs jtyr
   $modules/net_tools/ldap/ldap_search.py:
-    authors: eryx12o45
-    maintainers: jtyr
+    maintainers: eryx12o45 jtyr
   $modules/net_tools/lldp.py:
-    authors: andyhky
     labels: lldp
     ignore: andyhky
   $modules/net_tools/netcup_dns.py:
-    authors: nbuchwitz
+    maintainers: nbuchwitz
   $modules/net_tools/nios/:
-    authors: privateip
-    maintainers: $team_networking sganesh-infoblox
-    labels: infoblox networking
-  $modules/net_tools/nios/nios_dns_view.py:
-    authors: privateip
-    maintainers: $team_networking sganesh-infoblox
+    maintainers: $team_networking
     labels: infoblox networking
   $modules/net_tools/nios/nios_fixed_address.py:
-    authors: sjaiswal
-    maintainers: $team_networking sganesh-infoblox
-    labels: infoblox networking
-  $modules/net_tools/nios/nios_host_record.py:
-    authors: privateip
-    maintainers: $team_networking sganesh-infoblox
-    labels: infoblox networking
-  $modules/net_tools/nios/nios_member.py:
-    authors: krisvasudevan
-    maintainers: $team_networking sganesh-infoblox
-    labels: infoblox networking
+    maintainers: sjaiswal
   $modules/net_tools/nios/nios_nsgroup.py:
-    authors: ebirn sjaiswal
-    maintainers: $team_networking sganesh-infoblox
-    labels: infoblox networking
+    maintainers: ebirn sjaiswal
   $modules/net_tools/nios/nios_ptr_record.py:
-    authors: clementtrebuchet
-    maintainers: $team_networking sganesh-infoblox
-    labels: infoblox networking
+    maintainers: clementtrebuchet
   $modules/net_tools/nios/nios_srv_record.py:
-    authors: brampling
-    maintainers: $team_networking sganesh-infoblox
-    labels: infoblox networking
+    maintainers: brampling
   $modules/net_tools/nios/nios_txt_record.py:
-    authors: coreywan
-    maintainers: $team_networking sganesh-infoblox
-    labels: infoblox networking
-  $modules/net_tools/nios/nios_zone.py:
-    authors: privateip
-    maintainers: $team_networking sganesh-infoblox
-    labels: infoblox networking
+    maintainers: coreywan
   $modules/net_tools/nmcli.py:
-    authors: alcamie101
+    maintainers: alcamie101
   $modules/net_tools/snmp_facts.py:
-    authors: ogenstad
-    maintainers: bigmstone ujwalkomarla
+    maintainers: ogenstad bigmstone ujwalkomarla
   $modules/notification/osx_say.py:
-    authors: ansible mpdehaan
+    maintainers: ansible mpdehaan
     labels: _osx_say
     deprecated: true
   $modules/notification/bearychat.py:
-    authors: tonyseek
+    maintainers: tonyseek
   $modules/notification/campfire.py:
-    authors: fabulops
+    maintainers: fabulops
   $modules/notification/catapult.py:
-    authors: Jmainguy
+    maintainers: Jmainguy
   $modules/notification/cisco_spark.py:
-    authors: drew-russell
+    maintainers: drew-russell
   $modules/notification/flowdock.py:
-    authors: mcodd
+    maintainers: mcodd
   $modules/notification/grove.py:
-    authors: zimbatm
+    maintainers: zimbatm
   $modules/notification/hipchat.py:
-    authors: pb8226 shirou
+    maintainers: pb8226 shirou
   $modules/notification/irc.py:
-    authors: jpmens sivel
+    maintainers: jpmens sivel
   $modules/notification/jabber.py:
-    authors: bcoca
+    maintainers: bcoca
   $modules/notification/logentries_msg.py:
-    authors: jcftang
+    maintainers: jcftang
   $modules/notification/mail.py:
-    authors: dagwieers
+    maintainers: dagwieers
   $modules/notification/matrix.py:
-    authors: jcgruenhage
+    maintainers: jcgruenhage
   $modules/notification/mattermost.py:
-    authors: bjolivot
+    maintainers: bjolivot
   $modules/notification/mqtt.py:
-    authors: jpmens
+    maintainers: jpmens
   $modules/notification/nexmo.py:
-    authors: sivel
+    maintainers: sivel
   $modules/notification/office_365_connector_card.py:
-    authors: marc-sensenich
+    maintainers: marc-sensenich
   $modules/notification/pushbullet.py:
-    authors: willybarro
+    maintainers: willybarro
   $modules/notification/pushover.py:
-    authors: weaselkeeper
+    maintainers: weaselkeeper
   $modules/notification/rocketchat.py:
-    authors: ramondelafuente
     maintainers: Deepakkothandan
     labels: rocketchat
     ignore: ramondelafuente
   $modules/notification/say.py:
-    authors: ansible mpdehaan
+    maintainers: ansible mpdehaan
   $modules/notification/sendgrid.py:
-    authors: makaimc
+    maintainers: makaimc
   $modules/notification/slack.py:
-    authors: ramondelafuente
+    maintainers: ramondelafuente
   $modules/notification/syslogger.py:
-    authors: garbled1
+    maintainers: garbled1
   $modules/notification/telegram.py:
-    authors: tyouxa
+    maintainers: tyouxa
   $modules/notification/twilio.py:
-    authors: makaimc
+    maintainers: makaimc
   $modules/notification/typetalk.py:
-    authors: tksmd
+    maintainers: tksmd
   $modules/packaging/language/bower.py:
-    authors: mwarkentin
+    maintainers: mwarkentin
   $modules/packaging/language/bundler.py:
-    authors: thoiberg
+    maintainers: thoiberg
   $modules/packaging/language/composer.py:
-    authors: dmtrs resmo
+    maintainers: dmtrs resmo
   $modules/packaging/language/cpanm.py:
-    authors: fcuny
+    maintainers: fcuny
   $modules/packaging/language/easy_install.py:
-    authors: mattupstate
+    maintainers: mattupstate
   $modules/packaging/language/gem.py:
-    authors: ansible johanwiren
+    maintainers: ansible johanwiren
     labels: gem
   $modules/packaging/language/maven_artifact.py:
-    authors: chrisisbeef
     maintainers: tumbl3w33d turb
     labels: maven_artifact
     ignore: chrisisbeef
   $modules/packaging/language/npm.py:
-    authors: chrishoffman
     maintainers: shane-walker xcambar
     labels: npm
     ignore: chrishoffman
   $modules/packaging/language/pear.py:
-    authors: jle64
     labels: pear
     ignore: jle64
   $modules/packaging/language/pip_package_info.py:
-    authors: bcoca matburt maxamillion
+    maintainers: bcoca matburt maxamillion
   $modules/packaging/language/yarn.py:
-    authors: chrishoffman verkaufer
+    maintainers: chrishoffman verkaufer
   $modules/packaging/os/apk.py:
-    authors: kbrebanov
     maintainers: tdtrask
     labels: apk
     ignore: kbrebanov
   $modules/packaging/os/apt_rpm.py:
-    authors: evgkrsk
+    maintainers: evgkrsk
   $modules/packaging/os/flatpak.py:
-    authors: $team_flatpak
+    maintainers: $team_flatpak
   $modules/packaging/os/flatpak_remote.py:
-    authors: $team_flatpak
+    maintainers: $team_flatpak
   $modules/packaging/os/pkg5:
-    authors: mavit
-    maintainers: $team_solaris
+    maintainers: $team_solaris mavit
     labels: pkg5 solaris
     keywords: beadm dladm illumos ipadm nexenta omnios openindiana pfexec smartos solaris sunos zfs zpool
   $modules/packaging/os/homebrew.py:
     notify: chris-short
-    authors: andrew-d danieljaouen indrajitr
-    maintainers: $team_macos
+    maintainers: $team_macos andrew-d
     labels: homebrew macos
     ignore: ryansb
     keywords: brew cask darwin homebrew macosx macports osx
   $modules/packaging/os/homebrew_cask.py:
     notify: chris-short
-    authors: danieljaouen enriclluelles indrajitr
-    maintainers: $team_macos
+    maintainers: $team_macos enriclluelles
     labels: homebrew_ macos
     ignore: ryansb
     keywords: brew cask darwin homebrew macosx macports osx
   $modules/packaging/os/homebrew_tap.py:
     notify: chris-short
-    authors: danieljaouen indrajitr
     maintainers: $team_macos
     labels: homebrew_ macos
     ignore: ryansb
     keywords: brew cask darwin homebrew macosx macports osx
   $modules/packaging/os/installp.py:
-    authors: kairoaraujo
-    maintainers: $team_aix
+    maintainers: $team_aix kairoaraujo
     labels: aix installp
     keywords: aix efix lpar wpar
   $modules/packaging/os/layman.py:
-    authors: jirutka
+    maintainers: jirutka
   $modules/packaging/os/macports.py:
     notify: chris-short
-    authors: jcftang
-    maintainers: $team_macos
+    maintainers: $team_macos jcftang
     labels: macos macports
     ignore: ryansb
     keywords: brew cask darwin homebrew macosx macports osx
   $modules/packaging/os/mas.py:
-    authors: lukasbestle mheap
+    maintainers: lukasbestle mheap
   $modules/packaging/os/openbsd_pkg.py:
-    authors: eest
-    maintainers: $team_bsd
+    maintainers: $team_bsd eest
     labels: bsd openbsd_pkg
     ignore: ryansb
     keywords: doas dragonfly freebsd iocage jail netbsd openbsd opnsense pfsense
   $modules/packaging/os/opkg.py:
-    authors: skinp
+    maintainers: skinp
   $modules/packaging/os/pacman.py:
-    authors: elasticdog indrajitr tchernomax
+    maintainers: elasticdog indrajitr tchernomax
     labels: pacman
     ignore: elasticdog
   $modules/packaging/os/pkgin.py:
-    authors: L2G jasperla szinck
-    maintainers: $team_solaris
+    maintainers: $team_solaris L2G jasperla szinck
     labels: pkgin solaris
   $modules/packaging/os/pkgng.py:
-    authors: bleader
-    maintainers: $team_bsd
+    maintainers: $team_bsd bleader
     labels: bsd pkgng
     ignore: bleader
     keywords: doas dragonfly freebsd iocage jail netbsd openbsd opnsense pfsense
   $modules/packaging/os/pkgutil.py:
-    authors: dermute
-    maintainers: $team_solaris
+    maintainers: $team_solaris dermute
     labels: pkgutil solaris
   $modules/packaging/os/portage.py:
-    authors: Tatsh sayap wltjr
+    maintainers: Tatsh wltjr
     labels: portage
     ignore: sayap
   $modules/packaging/os/portinstall.py:
-    authors: berenddeboer
-    maintainers: $team_bsd
+    maintainers: $team_bsd berenddeboer
     labels: bsd portinstall
     ignore: ryansb
     keywords: doas dragonfly freebsd iocage jail netbsd openbsd opnsense pfsense
   $modules/packaging/os/pulp_repo.py:
-    authors: sysadmind
+    maintainers: sysadmind
   $modules/packaging/os/redhat_subscription.py:
-    authors: barnabycourt
-    maintainers: alikins kahowell
+    maintainers: barnabycourt alikins kahowell
     labels: redhat_subscription
   $modules/packaging/os/rhn_channel.py:
-    authors: vincentvdk
-    maintainers: alikins $team_rhn
+    maintainers: vincentvdk alikins $team_rhn
     labels: rhn_channel
   $modules/packaging/os/rhn_register.py:
-    authors: jlaska
-    maintainers: $team_rhn
+    maintainers: jlaska $team_rhn
     labels: rhn_register
   $modules/packaging/os/rhsm_release.py:
-    authors: seandst
+    maintainers: seandst
   $modules/packaging/os/rhsm_repository.py:
-    authors: giovannisciortino
+    maintainers: giovannisciortino
   $modules/packaging/os/slackpkg.py:
-    authors: KimNorgaard
+    maintainers: KimNorgaard
   $modules/packaging/os/snap.py:
-    authors: angristan vcarceler
+    maintainers: angristan vcarceler
     labels: snap
   $modules/packaging/os/sorcery.py:
-    authors: vaygr
+    maintainers: vaygr
   $modules/packaging/os/svr4pkg.py:
-    authors: brontitall
-    maintainers: $team_solaris
+    maintainers: $team_solaris brontitall
     labels: solaris svr4pkg
   $modules/packaging/os/swdepot.py:
-    authors: melodous
-    maintainers: $team_hpux
+    maintainers: $team_hpux melodous
     labels: hpux swdepot
     keywords: hp-ux
   $modules/packaging/os/swupd.py:
-    authors: albertomurillo
-    maintainers: hnanni
+    maintainers: hnanni albertomurillo
     labels: swupd
   $modules/packaging/os/urpmi.py:
-    authors: pmakowski
+    maintainers: pmakowski
   $modules/packaging/os/xbps.py:
-    authors: dinoocch the-maldridge
+    maintainers: dinoocch the-maldridge
   $modules/packaging/os/zypper.py:
-    authors: AnderEnder alxgu andytom dirtyharrycallahan robinro
     maintainers: $team_suse
     labels: zypper
     ignore: dirtyharrycallahan robinro
   $modules/packaging/os/zypper_repository.py:
-    authors: matze
+    maintainers: matze
   $modules/remote_management/cobbler/:
-    authors: dagwieers
-  $modules/remote_management/dellemc/idrac_firmware.py:
-    authors: rajeevarakkal
+    maintainers: dagwieers
+  $modules/remote_management/dellemc/:
+    maintainers: rajeevarakkal
   $modules/remote_management/dellemc/idrac_server_config_profile.py:
-    authors: jagadeeshnv
-    maintainers: rajeevarakkal
+    maintainers: jagadeeshnv
   $modules/remote_management/dellemc/ome_device_info.py:
-    authors: Sajna-Shetty
-    maintainers: rajeevarakkal
+    maintainers: Sajna-Shetty
   $modules/remote_management/foreman/:
-    authors: ehelms
-    maintainers: ares ekohl xprazak2
+    maintainers: ehelms ares ekohl xprazak2
   $modules/remote_management/hpilo/:
-    authors: dagwieers
     maintainers: haad
     ignore: dagwieers
   $modules/remote_management/imc/imc_rest.py:
-    authors: dagwieers
+    maintainers: dagwieers
     labels: cisco
   $modules/remote_management/ipmi/:
-    authors: bgaifullin
-    maintainers: cloudnull
+    maintainers: bgaifullin cloudnull
   $modules/remote_management/lxca/:
-    authors: navalkp prabhosa
+    maintainers: navalkp prabhosa
   $modules/remote_management/manageiq/:
     labels: manageiq
     maintainers: $team_manageiq
   $modules/remote_management/manageiq/manageiq_group.py:
-    authors: evertmulder
+    maintainers: evertmulder
   $modules/remote_management/manageiq/manageiq_tenant.py:
-    authors: evertmulder
+    maintainers: evertmulder
   $modules/remote_management/oneview/oneview_datacenter_facts.py:
-    authors: aalexmonteiro madhav-bharadwaj ricardogpsf soodpr
+    maintainers: aalexmonteiro madhav-bharadwaj ricardogpsf soodpr
   $modules/remote_management/oneview/:
-    authors: adriane-cardozo fgbulsoni tmiotto
+    maintainers: adriane-cardozo fgbulsoni tmiotto
   $modules/remote_management/oneview/oneview_datacenter_info.py:
-    authors: aalexmonteiro madhav-bharadwaj ricardogpsf soodpr
+    maintainers: aalexmonteiro madhav-bharadwaj ricardogpsf soodpr
   $modules/remote_management/oneview/oneview_fc_network.py:
-    authors: fgbulsoni
+    maintainers: fgbulsoni
   $modules/remote_management/oneview/oneview_fcoe_network.py:
-    authors: fgbulsoni
+    maintainers: fgbulsoni
   $modules/remote_management/redfish/:
-    authors: jose-delarosa billdodd
-    maintainers: $team_redfish
+    maintainers: $team_redfish billdodd
     ignore: jose-delarosa
   $modules/remote_management/stacki/stacki_host.py:
-    authors: bbyhuy
-    maintainers: bsanders
+    maintainers: bsanders bbyhuy
     labels: stacki_host
   $modules/remote_management/wakeonlan.py:
-    authors: dagwieers
+    maintainers: dagwieers
   $modules/source_control/bitbucket/:
-    authors: catcombo
+    maintainers: catcombo
   $modules/source_control/bzr.py:
-    authors: andreparames
+    maintainers: andreparames
   $modules/source_control/git_config.py:
-    authors: djmattyg007 mgedmin
+    maintainers: djmattyg007 mgedmin
   $modules/source_control/github/github_hooks.py:
-    authors: pcgentry
+    maintainers: pcgentry
   $modules/source_control/github/github_deploy_key.py:
-    authors: bincyber
+    maintainers: bincyber
   $modules/source_control/github/github_issue.py:
-    authors: Akasurde
+    maintainers: Akasurde
   $modules/source_control/github/github_key.py:
-    authors: erydo
+    maintainers: erydo
     labels: github_key
     ignore: erydo
   $modules/source_control/github/github_release.py:
-    authors: adrianmoisey
+    maintainers: adrianmoisey
   $modules/source_control/github/:
-    authors: stpierre
+    maintainers: stpierre
   $modules/source_control/gitlab/:
     notify: jlozadad
-    authors: Lunik marwatk
     maintainers: $team_gitlab
     keywords: gitlab source_control
-  $modules/source_control/gitlab/gitlab_group.py:
-    authors: Lunik dj-wasabi
-    maintainers: $team_gitlab
-  $modules/source_control/gitlab/gitlab_group_members.py:
-    authors: zanssa
-    maintainers: $team_gitlab
-  $modules/source_control/gitlab/gitlab_group_variable.py:
-    authors: scodeman
-    maintainers: $team_gitlab
-  $modules/source_control/gitlab/gitlab_project.py:
-    authors: Lunik dj-wasabi
-    maintainers: $team_gitlab
   $modules/source_control/gitlab/gitlab_project_variable.py:
-    authors: markuman
-    maintainers: $team_gitlab
+    maintainers: markuman
   $modules/source_control/gitlab/gitlab_runner.py:
-    authors: Lunik SamyCoenen
-    maintainers: $team_gitlab
-  $modules/source_control/gitlab/gitlab_user.py:
-    authors: Lunik dj-wasabi
-    maintainers: $team_gitlab
+    maintainers: SamyCoenen
   $modules/source_control/hg.py:
-    authors: yeukhon
+    maintainers: yeukhon
   $modules/storage/emc/emc_vnx_sg_member.py:
-    authors: remixtj
+    maintainers: remixtj
   $modules/storage/glusterfs/:
-    authors: devyanikota
+    maintainers: devyanikota
   $modules/storage/glusterfs/gluster_peer.py:
-    authors: sac
-    maintainers: devyanikota
+    maintainers: sac
   $modules/storage/glusterfs/gluster_volume.py:
-    authors: rosmo
-    maintainers: devyanikota
+    maintainers: rosmo
   $modules/storage/hpe3par/ss_3par_cpg.py:
-    authors: farhan7500 gautamphegde
+    maintainers: farhan7500 gautamphegde
   $modules/storage/ibm/:
-    authors: tzure
-    maintainers: tzurE
+    maintainers: tzure
   $modules/storage/infinidat/:
-    authors: GR360RY
-    maintainers: vmalloc
+    maintainers: vmalloc GR360RY
   $modules/storage/netapp/:
-    authors: hulquest
     maintainers: $team_netapp
   $modules/storage/purestorage/:
-    authors: sdodsley
     maintainers: $team_purestorage
     labels: pure_storage
   $modules/storage/vexata/:
-    authors: vexata
-  $modules/storage/zfs/zfs.py:
-    authors: johanwiren
-    maintainers: $team_solaris
-  $modules/storage/zfs/zfs_delegate_admin.py:
-    authors: natefoo
-    maintainers: $team_solaris
+    maintainers: vexata
   $modules/storage/zfs/:
-    authors: xen0l
     maintainers: $team_solaris
     labels: solaris
     keywords: beadm dladm illumos ipadm nexenta omnios openindiana pfexec smartos solaris sunos zfs zpool
+  $modules/storage/zfs/zfs.py:
+    maintainers: johanwiren
+  $modules/storage/zfs/zfs_delegate_admin.py:
+    maintainers: natefoo
   $modules/system/python_requirements_facts.py:
-    authors: ryansb willthames
+    maintainers: willthames
     ignore: ryansb
   $modules/system/:
-    authors: kairoaraujo
     maintainers: $team_aix
     labels: aix
     keywords: aix efix lpar wpar
-  $modules/system/aix_inittab.py:
-    authors: molekuul
-    maintainers: $team_aix
   $modules/system/aix_lvol.py:
-    authors: adejoux
-    maintainers: $team_aix
+    maintainers: adejoux
   $modules/system/alternatives.py:
-    authors: DavidWittman mulby
+    maintainers: mulby
     labels: alternatives
     ignore: DavidWittman
   $modules/system/awall.py:
-    authors: tdtrask
+    maintainers: tdtrask
   $modules/system/beadm.py:
-    authors: xen0l
     maintainers: $team_solaris
     labels: beadm solaris
     keywords: beadm dladm illumos ipadm nexenta omnios openindiana pfexec smartos solaris sunos zfs zpool
   $modules/system/capabilities.py:
-    authors: natefoo
+    maintainers: natefoo
   $modules/system/cronvar.py:
-    authors: dougluce
+    maintainers: dougluce
   $modules/system/crypttab.py:
-    authors: groks
+    maintainers: groks
   $modules/system/dconf.py:
-    authors: azaghal
+    maintainers: azaghal
   $modules/system/dpkg_divert.py:
-    authors: quidame
+    maintainers: quidame
   $modules/system/facter.py:
-    authors: ansible
+    maintainers: ansible
     labels: facter
   $modules/system/filesystem.py:
-    authors: abulimov
-    maintainers: pilou-
+    maintainers: pilou- abulimov
     labels: filesystem
   $modules/system/gconftool2.py:
-    authors: kevensen
-    maintainers: Akasurde
+    maintainers: Akasurde kevensen
     labels: gconftool2
   $modules/system/interfaces_file.py:
-    authors: hryamzik
-    maintainers: obourdon
+    maintainers: obourdon hryamzik
     labels: interfaces_file
   $modules/system/iptables_state.py:
-    authors: quidame
+    maintainers: quidame
   $modules/system/java_cert.py:
-    authors: haad
+    maintainers: haad
   $modules/system/java_keystore.py:
-    authors: Mogztter
+    maintainers: Mogztter
   $modules/system/kernel_blacklist.py:
-    authors: matze
+    maintainers: matze
   $modules/system/launchd.py:
-    authors: martinm82
+    maintainers: martinm82
   $modules/system/lbu.py:
-    authors: kunkku
+    maintainers: kunkku
   $modules/system/listen_ports_facts.py:
-    authors: ndavison
+    maintainers: ndavison
   $modules/system/locale_gen.py:
-    authors: AugustusKling
+    maintainers: AugustusKling
   $modules/system/lvg.py:
-    authors: abulimov
+    maintainers: abulimov
   $modules/system/lvol.py:
-    authors: abulimov jhoekx
+    maintainers: abulimov jhoekx
   $modules/system/make.py:
-    authors: LinusU
+    maintainers: LinusU
   $modules/system/mksysb.py:
-    authors: kairoaraujo
     maintainers: $team_aix
     labels: aix mksysb
   $modules/system/modprobe.py:
-    authors: jdauphant mattjeffery stygstra
+    maintainers: jdauphant mattjeffery
     labels: modprobe
     ignore: stygstra
   $modules/system/nosh.py:
-    authors: tacatac
+    maintainers: tacatac
   $modules/system/ohai.py:
-    authors: ansible mpdehaan
+    maintainers: ansible mpdehaan
     labels: ohai
   $modules/system/open_iscsi.py:
-    authors: srvg
+    maintainers: srvg
   $modules/system/openwrt_init.py:
-    authors: agaffney
+    maintainers: agaffney
   $modules/system/osx_defaults.py:
     notify: chris-short
     maintainers: $team_macos
     labels: macos osx_defaults
     keywords: brew cask darwin homebrew macosx macports osx
   $modules/system/pam_limits.py:
-    authors: usawa
     maintainers: giovannisciortino
     labels: pam_limits
     ignore: usawa
   $modules/system/pamd.py:
-    authors: kevensen
+    maintainers: kevensen
   $modules/system/parted.py:
-    authors: ColOfAbRiX
+    maintainers: ColOfAbRiX
   $modules/system/pids.py:
-    authors: saranyasridharan
+    maintainers: saranyasridharan
   $modules/system/puppet.py:
-    authors: emonty
-    maintainers: nibalizer
+    maintainers: nibalizer emonty
     labels: puppet
   $modules/system/python_requirements_info.py:
-    authors: ryansb willthames
+    maintainers: willthames
     ignore: ryansb
   $modules/system/runit.py:
-    authors: jsumners
+    maintainers: jsumners
   $modules/system/sefcontext.py:
-    authors: dagwieers
+    maintainers: dagwieers
   $modules/system/selinux_permissive.py:
-    authors: mscherer
+    maintainers: mscherer
   $modules/system/selogin.py:
-    authors: bachradsusi dankeder jamescassell
+    maintainers: bachradsusi dankeder jamescassell
   $modules/system/seport.py:
-    authors: dankeder
+    maintainers: dankeder
   $modules/system/solaris_zone.py:
-    authors: pmarkham
-    maintainers: $team_solaris
+    maintainers: $team_solaris pmarkham
     labels: solaris
     keywords: beadm dladm illumos ipadm nexenta omnios openindiana pfexec smartos solaris sunos zfs zpool
   $modules/system/svc.py:
-    authors: bcoca
+    maintainers: bcoca
   $modules/system/syspatch.py:
-    authors: precurse
+    maintainers: precurse
   $modules/system/sysupgrade.py:
-    authors: precurse
+    maintainers: precurse
   $modules/system/timezone.py:
-    authors: indrajitr jasperla tmshn
+    maintainers: indrajitr jasperla tmshn
   $modules/system/ufw.py:
     notify: felixfontein
-    authors: ahtik ovcharenko pyykkis
+    maintainers: ahtik ovcharenko pyykkis
     labels: ufw
   $modules/system/vdo.py:
-    authors: bgurney-rh
+    maintainers: bgurney-rh
   $modules/system/xfconf.py:
-    authors: jbenden
-    maintainers: russoz
+    maintainers: russoz jbenden
     labels: xfconf
   $modules/system/xfs_quota.py:
-    authors: bushvin
+    maintainers: bushvin
   $modules/web_infrastructure/jenkins_job_facts.py:
-    authors: stpierre
+    maintainers: stpierre
   $modules/web_infrastructure/nginx_status_facts.py:
-    authors: resmo
+    maintainers: resmo
   $modules/web_infrastructure/apache2_mod_proxy.py:
-    authors: oboukili
+    maintainers: oboukili
   $modules/web_infrastructure/apache2_module.py:
-    authors: berendt n0trax robinro
+    maintainers: berendt n0trax robinro
   $modules/web_infrastructure/deploy_helper.py:
-    authors: ramondelafuente
+    maintainers: ramondelafuente
   $modules/web_infrastructure/django_manage.py:
-    authors: tastychutney
-    maintainers: scottanderson42 russoz
+    maintainers: scottanderson42 russoz tastychutney
     labels: django_manage
   $modules/web_infrastructure/ejabberd_user.py:
-    authors: privateip
+    maintainers: privateip
   $modules/web_infrastructure/gunicorn.py:
-    authors: agmezr
+    maintainers: agmezr
   $modules/web_infrastructure/htpasswd.py:
-    authors: ansible
+    maintainers: ansible
     labels: htpasswd
   $modules/web_infrastructure/jboss.py:
-    authors: jhoekx
-    maintainers: $team_jboss
+    maintainers: $team_jboss jhoekx
     labels: jboss
   $modules/web_infrastructure/jenkins_job.py:
-    authors: sermilrod
+    maintainers: sermilrod
   $modules/web_infrastructure/jenkins_job_info.py:
-    authors: stpierre
+    maintainers: stpierre
   $modules/web_infrastructure/jenkins_plugin.py:
-    authors: jtyr
+    maintainers: jtyr
   $modules/web_infrastructure/jenkins_script.py:
-    authors: hogarthj
+    maintainers: hogarthj
   $modules/web_infrastructure/jira.py:
-    authors: tarka
-    maintainers: Slezhuk
+    maintainers: Slezhuk tarka
     labels: jira
   $modules/web_infrastructure/nginx_status_info.py:
-    authors: resmo
+    maintainers: resmo
   $modules/web_infrastructure/:
-    authors: nerzhul
+    maintainers: nerzhul
   $modules/web_infrastructure/sophos_utm/:
-    authors: MatrixCrawler
-    maintainers: getjack
-    keywords: sophos utm
-  $modules/web_infrastructure/sophos_utm/utm_dns_host.py:
-    authors: MatrixCrawler
-    maintainers: getjack
+    maintainers: $team_e_spirit
     keywords: sophos utm
   $modules/web_infrastructure/sophos_utm/utm_proxy_auth_profile.py:
-    authors: stearz
-    maintainers: $team_e_spirit
+    maintainers: $team_e_spirit stearz
     keywords: sophos utm
   $modules/web_infrastructure/sophos_utm/utm_proxy_exception.py:
-    authors: RickS-C137
-    maintainers: $team_e_spirit
+    maintainers: $team_e_spirit RickS-C137
     keywords: sophos utm
   $modules/web_infrastructure/supervisorctl.py:
-    authors: inetfuture mattupstate
+    maintainers: inetfuture mattupstate
   $modules/web_infrastructure/taiga_issue.py:
-    authors: lekum
+    maintainers: lekum
 #########################
   tests/:
     labels: tests
@@ -1324,16 +1099,17 @@ macros:
   team_keycloak: eikef ndclt
   team_kubevirt: machacekondra mmazur pkliczewski
   team_linode: InTheCloudDan decentral1se displague rmcintosh
-  team_macos: Akasurde kyleabenson martinm82
+  team_macos: Akasurde kyleabenson martinm82 danieljaouen indrajitr
   team_manageiq: abellotti cben gtanzillo yaacov zgalor dkorn evertmulder
   team_netapp: amit0701 carchi8py hulquest lmprice lonico ndswartz schmots1
-  team_networking: NilashishC Qalthos danielmellado ganeshrn justjais trishnaguha
+  team_networking: NilashishC Qalthos danielmellado ganeshrn justjais trishnaguha sganesh-infoblox privateip
+  team_opennebula: ilicmilan meerkampdvv rsmontero xorel
   team_oracle: manojmeda mross22 nalsaber
   team_postgresql: Andersson007 Dorn- andytom jbscalia kostiantyn-nemchenko matburt nerzhul sebasmannem tcraxs ilicmilan
   team_purestorage: bannaych dnix101 genegr lionmax opslounge raekins sdodsley sile16
   team_redfish: billdodd mraineri tomasg2012
   team_rhn: FlossWare alikins barnabycourt vritant
-  team_scaleway: QuentinBrosse abarbare jerome-quere kindermoumoute remyleone
+  team_scaleway: QuentinBrosse abarbare jerome-quere kindermoumoute remyleone sieben
   team_solaris: bcoca fishman jasperla jpdasma mator scathatheworm troy2914 xen0l
-  team_suse: commel dcermak evrardjp lrupp toabctl
+  team_suse: commel dcermak evrardjp lrupp toabctl AnderEnder alxgu andytom
   team_virt: joshainglis karmab Aversiste