Container deployment rework

@rowanj you may be interested in the previous discussion here:

「いいね!」 6