Switch to Omni galaxys2-common