Which address should I put on my return?

In 2016, my daughter and I lived on our own for 8 months. This address is on my W-2s. Because of this, I know to file head of household. However, in August, we moved in with my boyfriend. He says that I should not put his address (my current address) on my tax return because he also files as head of household and there cannot be two with the same address. However, I am only claiming to be the Head of Household for 2016, not currently. So, do I put my old address on the return where I was the head of household or the new one?