Added new headless docker image and cleanup