A small update on this -
These have now been updated
https://github.com/discourse/discourse/pull/20462
