Use an intermediate --work-dir for building the final image
Tweak output slightly
Use prefixes instead of exact matches for non-installed-files