rework container_config to only add the non-empty elements