With the city of Waterbury back on its feet, officials pledged Friday to fight for millions of dollars in federal funding to pay for the damage from a recent water main break and then upgrade the system so that it is strengthened for the future.