Revert, and adjust for better build times #74

Job	Run time
Build the image (linux/ppc64le, ubuntu-22.04, true)	1h 7m 37s
Build the image (linux/amd64, ubuntu-22.04, false)	7m 51s
Build the image (linux/s390x, ubuntu-22.04, true)	1h 58m 10s
Build the image (linux/arm64/v8, ubuntu-22.04-arm, false)	6m 44s
Build the image (linux/riscv64, ubuntu-22.04, true)	1h 24m 33s
Build the image (linux/386, ubuntu-22.04, true)	8m 45s
Build the image (linux/arm/v7, ubuntu-22.04-arm, true)	10m 17s
Build the image (linux/arm/v6, ubuntu-22.04, true)	1h 17m 17s
	6h 21m 14s

Provide feedback