Refonte du déploiement de conteneurs

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