; (7) include, in the thermal electric energy portion of the clean energy requirement established in paragraph (3), clean energy associated with— (A) installing thermal clean energy on site at Department facilities and retaining corresponding renewable and clean attributes; and (B) fulfilling the requirements of the energy policy of the Department as provided in section 2911 of title 10, United States Code; (8) improve water use efficiency and management, including stormwater management, by— (A) reducing potable water consumption intensity, measured in gallons per gross square foot, by 36 percent by fiscal year 2025 through reductions of 2 percent annually through fiscal year 2025 relative to a baseline of the water consumption of the Department in fiscal year 2007; (B) installing water meters and collecting and using building and facility water balance data to improve water conservation and management; (C) reducing the industrial, landscaping, and agricultural water consumption, measured in gallons, by 2 percent annually through fiscal year 2025 relative to a baseline of the industrial, landscaping, and agricultural water consumption of the Department during fiscal year 2010; and (D) installing appropriate green infrastructure features on Department property to help with stormwater and wastewater management; (9) improve building efficiency, performance, and management by— (A) ensuring, for fiscal year 2021 and each subsequent fiscal year, that the new construction of any Department building larger than 5,000 gross square feet that enters the planning process is designed to achieve energy net-zero and, water or waste net-zero by fiscal year 2035