This study proposes a revised strategy within the 2019 Integrated Flood Safety Plan (IFSP). The current NCICD master plan for Jakarta's Coastal Reservoir (CR) follows a first-generation design, aiming to capture and store all incoming river water. To shift to a second-generation CR design, a bypass channel is added. This bypass channel would divert high-sediment or polluted water away from the reservoir. This allows the CR to shift to serving as a raw water reservoir to better fulfill its role of providing a reliable source of raw water. The cross-section and dimensions of the Giant Sea Wall remain unchanged; its function is to separate freshwater and saltwater and to serve as a base for a roadway, potentially with a railway line. Its internal structure would incorporate ground improvement measures, a sand core, and a middle armor layer of rock, while the outer layer would consist of interlocking PentaPods connected by stainless steel slings. Flood protection efforts should focus on constructing coastal and river dikes. PentaPod coastal dikes, with an inspection road above, can be installed where dikes are lacking and conditions are suitable. The Ciliwung River and Cengkareng Drain will transition from their role in desalination in the initial stages of CR operation to become regulated raw water sources, with extraction permitted only when quality and quantity standards are met. Eliminating the flood control function will direct floodwaters to the sea, removing the need for two 80-meter-wide sector gates, three 11 m x 50 m ship locks, two 80-meter roller gates, and and two large pumps totaling 660 m3/s. This change will significantly reduce both capital and operational costs. Additionally, as housing and industrial clusters in the existing Cisadane irrigation area expand and irrigation demands decrease, the much larger Cisadane River could be diverted to the Dadap River to supplement the Coastal Reservoir's supply, potentially serving as an additional raw water source.