Allow custom image and fix monitoring