Updated windows-ubuntu integration solution