Move to OYP gatekeeper instance