I’ve been using the Collabora option for the mastercontainer since the start of the AIO, it’s worked well for my users.