Include the scheme in the container name

Currently we'd have to guess in order to recreate it. Just include the
scheme from the start.