[ros6] Make it ready for delivery