Increasing water productivity is an important element in improved water management for sustainable agriculture, food security and healthy ecosystem functioning. Water productivity is defined as the amount of agricultural output per unit of water depleted, and can be assessed for crops, trees, livestock and fish. This chapter reviews challenges in and opportunities for improving water productivity in socially equitable and sustainable ways by thinking beyond technologies, and fostering enabling institutions and policies.