Improvements for docker demo