updated to support defining containers and images separately