Hello!

In general we try to have information on either a node OR the surrounding building (if it's the only occupant). Generally this is called One Feature One Element. https://wiki.openstreetmap.org/wiki/One_feature,_one_OSM_element.

Feel free to keep one set of tags or the other, whichever seems more the style in Forks.