Docker layout improvements