The Norte Fire, which torched at least six homes in San Juan Capistrano on Friday, is at 50% containment as of Sunday, according to the Orange County Fire Authority.
All evacuation orders were lifted by Saturday night.
The OCFA said the fire, which was first reported around 11:30 a.m. Friday, burned across 570 acres in parts of San Juan Capistrano and San Clemente.
Crews remained on scene Sunday to maintain containment lines and take care of any hotspots.
Two firefighters were injured during the battle, but both are doing "well," according to OCFA officials.
The cause of the fire remains under investigation.
Gov. Gavin Newsom announced Friday that the state secured a Fire Management Assistance Grant from the Federal Emergency Management Agency to "make additional resources available to support response efforts to the Norte Fire."