Hello there I would advise leaving the hyphen out in the two examples you have given. e. two nouns creating a single noun) and in modern English a compound noun does not generally exhibit a hyphen.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.