Use container name as key in json rather