Makefile more inline with docker reqs