Make Witr the end of your night prayer.
Sahih Muslim Book 6, Hadith 184