Merge pull request #1038 from 190km/swarm-style-improvement #527

Job	Run time
build-and-push-server-image	1m 19s
build-and-push-schedule-image	1m 32s
build-and-push-cloud-image	5m 15s
	8m 6s

Provide feedback