Cleanup and added ubuntu-based image with java