[WM] rework docker image tree along agreed-upon lines