Less containers this way