Lock in versions and fix up zookeeper role