switch to new domains-style app databag format
refactor container definition, fix dupe resource warning