Blended containers one config

`git diff master` to see the real diff.