The Gujarat Government which currently sources nearly 50 per cent of its water requirement from rivers flowing in from neighbouring States, will be completed to invest up to Rs. 36,500 crores during the next 25 years to bridge the demand -supply gap of water, said a study conducted by the Gujarat Infrastructure Development Board(GIDB).