[skip ci] Add TODO about keystone and how we can retain the origin/domain