Fix sources.list (add universe) for Ubuntu images
Cleanup