Update Makefile to make use of latest docker features