The city is creating a SWAT team of workers to improve health and safety standards at the city’s 500 homeless shelters.

The shelter repair squads will have hundreds of workers from the homeless, buildings, fire, health and housing departments. The announcement comes on the heels of a Department of Investigation report that found unsafe conditions in dozens of shelters. Mayor Bill de Blasio says most repairs will be completed within seven days, and major capital repairs will be finished by the end of 2015.

“Thousands and thousands of New Yorkers are depending on us to get this right. We take responsibility for that. We all know well that we have to break through here and make these repairs and make them quickly," said the mayor.

Comptroller Scott Stringer said Monday he was rejecting permanent contracts for two shelters, in Queens and Manhattan, because he hasn’t yet received assurances violations and complaints had been corrected.

City figures show 56,701 people currently live in the city’s shelters.