config refactoring: follow-ups from merged commits

I'm using this ticket to track follow-up items from merged commits that I can try to do once we have caught up more with the backlog of commits.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information