Switch from some bundles to new alternatives