Refinement of all docker definitions