updated to support defining images and containers separately