Switch to stable Sonata bundles