In light of the Paris Agreement's objectives and the related European and Swiss goals of decarbonising the built environment, the importance, relevance, and potential benefits of integrating Building-Integrated Photovoltaic (BIPV) within building renovation processes are acknowledged. Functioning both as envelope material and on-site electricity generator, BIPV can simultaneously reduce the use of fossil fuels and greenhouse gas emissions. Motivated by the current barriers and misconceptions that withhold a widespread integration of BIPV, particularly regarding financial implications and solar exposure levels that are believed to be unfavourable, this paper aims at bringing new knowledge and a rigorous and adaptable method to inform decision-making and promote the use of BIPV in urban renewal processes. Focusing on the architectural design, we here present a methodology to select active (BIPV) surfaces during the retrofitting process based on a trade-off between the self-consumption (SC) and self-sufficiency (SS) of a building. The approach consists in iteratively identifying surfaces that achieve a varying annual irradiation value (threshold). It also includes the evaluation of the effect of electricity storage systems. The methodology and the results of its application are presented through the comparison of two case studies in Neuchatel (Switzerland). The outcomes of this new approach for addressing building renovation projects in the urban context can help architects, designers and engineers to better size the installation and the repartition of active surfaces in the renovated thermal envelope. Results show that it is important to take into account a larger range of irradiation levels to choose the active surfaces, especially in high-rise buildings with a greater proportion of facade than roof. In such cases, the irradiation threshold can vary between 600 and 800 kWh/m(2).year depending on the strategy adopted in terms of Heating, Ventilation and Air-conditioning (HVAC) system improvement or storage system implementation. Such findings demonstrate the need for context-specific methods towards a proper evaluation and better valorisation of BIPV potential. (C) 2019 Elsevier B.V. All rights reserved.