1) Switch top file to matching by custom grains.
2) Add ntpdate syncing hourly.