Cfy 1840 docker recovery

&& and move