Boston-based Elkus Manfredi Architects will move to the Innovation and Design Building at the end of August, becoming the latest high-profile tenant to populate the former military warehouses in the Boston Marine Industrial Park.

After 10 years occupying parts of three floors at 300 A St. in Fort Point, Elkus Manfredi has leased 50,000 square feet on the seventh floor of 25 Drydock Ave.

“Over three floors we had created too many corners,” Founding Principal David Manfredi said. “This is a way to create a more open environment, in the same way you see tech companies breaking down walls to make for more accidental interactions between employees.”

Elkus Manfredi already has a professional connection to the 1.4 million-square-foot design building, which was acquired last year by developer Jamestown Properties. Jamestown hired Elkus Manfredi to design updates to common areas including lobbies and the ground floor, where 50,000 square feet of retail space and restaurants may be added.

The Boston Redevelopment Authority in July approved Jamestown’s plans to convert 206,388 square feet from industrial to commercial space as it recruits more creative firms and tech companies. Startup accelerator MassChallenge moved into 26,000 square feet at 21-23 Drydock Ave. in June after Jamestown gave it a rent-free five-year deal.

The complex has a stop on the MBTA’s Silver Line but to improve mass transit connections, Jamestown recently added a private shuttle bus to South Station from 6 to 10 a.m. and 3 to 7 p.m. weekdays.