I found that using the foreign language regularly was the only way it "stuck". So as you say "immersion".
I've married a Finnish woman, and we go through phases where we speak only Finnish at different times. We also agreed she'd never say "no" if I spoke Finnish, so I started with all the obvious things to say "One black coffee, please", etc.