Dockerfile update - speed things up