Mold and water damage forced county workers out of their offices last year in Pittsylvania County.
Now renovations are underway to make the building safer and ready to handle more foot traffic.
The Pittsylvania County Sheriffs Office is expanding its offices from the basement and second floor to the third floor of the Moses Building in Chatham.
The building used to house several county departments until workers started complaining of sinus issues.
A study revealed part of the building was in bad shape due to a leaky roof.
The board of supervisors hired workers to fix the problem and add a back up power generator.
"So that in the worst of times, if they come our way and they will, we can maintain the operations center here and have a seamless interface; not have to leave the building," said Sheriff Mike Taylor.
All windows on the building were replaced because of damage.
Renovations are expected to be finished this summer.