When creating a zabbix_agentd.conf for windows/linux hosts rollout, instead of manually specifying the Hostname=Foo line, comment that line and uncomment HostnameItem=system.hostname

Then you can proceed to defining discovery of zabbix agents, and actions to add the hosts to their respective groups and templates.

So much easier.