Hello Yes - the simple future (will / going to) are not used in subordinate clauses. These include clauses with the words that you have listed. Your two examples are correct.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.