Switch over to packaged Ona