redesign
preserve docker env vars + some cleanup