This chapter examines how improved management practices could be has been incorporated into various adaptation interventions in major and medium irrigation systems, emphasizing surface and groundwater use and the modifications required to withstand growing challenges due to external climate and economic risks. Some of the crucial governance challenges to enhance the sector’s climate resilience include: improving use of rainfall, surface drainage, and seepage flows to address inequitable irrigation distribution across many smallholdings; initiating bulk water allocation to encourage farmer organizations to manage irrigation at the field level; promoting conjunctive management of surface and groundwater to ensure crop water requirements are met during critical growth periods with supplemental groundwater irrigation; encouraging groundwater use to enable farmers to diversify crops, especially during the Yala season; revising existing laws and regulations to promote crop diversification, particularly in areas currently allocated for paddy cultivation; enhancing collaboration among various institutions and across scales to support a more productive agricultural sector, and considering participatory water management models to address the increasing uncertainty of water availability due to climate change.