Resolve issues around DHCP vs. non-DHCP configuration of containers (non DHCP tested, DHCP not yet tested)