Complete migration to Cirros 0.6.1