Merge pull request #1068 from yiiman-dev/canary #583

Job	Run time
build-and-push-cloud-image	5m 14s
build-and-push-schedule-image	1m 19s
build-and-push-server-image	1m 21s
	7m 54s

Provide feedback