Alameda Marina on San Francisco Bay will undergo a multi-million-dollar facelift over the next 10 years. The redevelopment project will be known as the Dockyard at Alameda Marina. It took 86 community meetings over many years for the plan to move ahead, according to KTVU.com.

“The plan for Alameda Marina returns the waterfront to all Alamedans,” said Sean Murphy, project lead for Alameda Marina Development Co. “We will create a new waterfront community with housing, jobs, a water-life park and a fully functioning working marina to dock, service and repair boats.”

Plans call for 530 boat slips and storage for 60 boats on the hard, as well as the addition of several floating classrooms, known as “ServiceShips.’’ The vessels were used during the 2013 America’s Cup races on San Francisco Bay. Murphy said they will help expand recreation and education opportunities.

The new marina will also serve as the home to Bay Area Association of Disabled Sailors. The 30-year-old non-profit seeks to make all aspects of sailing accessible to people with physical, mental and developmental disabilities.

It will also include a working boatyard. Plans also call for up to 250,000 square feet for commercial maritime use. That could eventually double the number of current jobs and preserve the historic buildings on the site.