Update Makefile to enhanve image building

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>