Merge pull request #1314 from vicke4/canary #830

Job	Run time
build-and-push-cloud-image	5m 55s
build-and-push-schedule-image	1m 36s
build-and-push-server-image	1m 36s
	9m 7s

Provide feedback