Reestructuración del despliegue de contenedores

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