Move docker version info into machine phase; cleaner