The city of Bijapur is located in the dry Deccan region of India, yet ensured 24x7 water supply to its citizens be it for agricultural or domestic use during the 14th to 18th centuries under the Bahmani and Adil-Shahi Dynasty. Two unique urban water systems the Kharejari and Muhammed Nada accompanied by several cisterns made it possible to populate and develop a city in the semi-arid region of India. Watershed management techniques were applied to ensure the sustainability of these water systems. Though, in ruins provides water for irrigation and domestic use even today. Extensive ground surveys were carried out to record every segment using a mobile-based mapping application and handheld navigation device. Satellite data, topographical maps, historic maps and literature reviews aided in linking up all segments to prepare the first complete map of the Kharejari and Muhammed Nada water systems. Bijapur, a heritage city of Karnataka State, has undergone unplanned organic urban growth coupled with a lack of awareness, understanding, conservation practices and appropriate implementation of existing policies have resulted in an unsustainable geophysical alteration of the fragile hydraulic landscape affecting these unique water systems. This paper discusses the intricate details of the historic water systems of Bijapur and discusses the challenges in conserving them as national heritage.