Updated to latest version of dockerfiles