Naya Rivera and estranged husband Ryan Dorsey will share joint custody of son Josey, 2, according to documents obtained by The Blast.

“The family is working together peacefully and all matters have been amicably resolved,” Rivera’s rep tells PEOPLE.

This comes after Rivera was arrested following an alleged domestic violence incident, where the actress struck Dorsey. She was arrested and charged with misdemeanor domestic battery over the Thanksgiving holiday. She was released on bond.

Rivera, 34, has since filed for divorce for the second time from Dorsey,30.