Uncontrolled urbanization causes serious quality degradation of surface waters throughrncovering natural land by impervious surfaces that greatly increases the volume and rnvelocity of stormwater runoff as well as transportation of pollutants from point and non point sources. Therefore, sustainable water management is essential. This study focuses on rnnon-point source pollutants having an objective of identifying Green Infrastructure retro fitting options to protect the stream water from these pollutants in the localized sub watershed around Egziabherab church in Bole sub city of Addis Ababa. Both primary and rnsecondary data were consumed for this study. The secondary data include contour map rnand base map collected from Addis Ababa plan commission, rain fall data from National rnMeteorological Agency and other related literatures. The primary data were the land rnuse/cover, street surfacing and stormwater sample directly collected from selected sites. rnSoftware such as GIS, spread sheet, ArchiCAD, AutoCAD, Scketchup and laboratory taste rnwere used for analysis and designing purpose. The result indicates that Total Suspended rnSolids exceed the limit of the recommended standard. Applying permeable pavers on rnprivate plots, 21â€“33.3% of the stormwater runoff and 68â€“86% of Total Suspended Solidsrngenerated from the entire development can be reduced. Rainwater Harvesting from roofs rnof institutional plots can reduce 6.4â€“9% of the total runoff. 100% of Total Suspended Solidsrncan be reduced by vegetated swale, rain garden and riparian buffer. Generally, green rninfrastructure retro-fitting should be an integral part of urban plan and design at all scale rnto reduce runoff volume and improve stream water quality.