Merge pull request #1028 from designorant/feat/complete-polish #522

Job	Run time
build-and-push-server-image	1m 22s
build-and-push-cloud-image	5m 15s
build-and-push-schedule-image	1m 22s
	7m 59s

Provide feedback