Docker simplification

Simplify things