I have to make the following sentence less ambiguous
I stay with my family in a small house in Porbandar which includes my grandparents.
My attempt is:
I stay with my family which includes my grandparents in a small house in Porbandar.
Have I corrected the right part? Does the original sentence make it ambiguous as to what includes my grandparents?