Will only people dwell in the new Jerusalem with the LORD?

Or will angels dwell there, as well?

Or will the angels dwell only in heaven?