fix: use insert and delete instead of upsert for custom roles

fix: use insert and delete instead of upsert for custom roles #25863