Refactor & clean container file generation
This tag has no release notes.