No escaping on container names is done yet, as well as some values are hardcoded because they don't exist yet.
This reverts commit abd0afb03a.
abd0afb03a