Energy and investment intensity of integrated renovation variants were studied to determine cost optimal energy savings by 2030 as a part of new Estonian energy roadmap preparation. For major residential and non-residential building types, 3-4 renovation variants with different ambition were defined, all including the installation of adequate ventilation system in order not to compromise indoor climate. Cost optimal energy performance level of renovation corresponded in most cases to minimum energy performance requirements of new buildings. In most of building types cost optimal renovation cost was slightly below or higher of 200 €/m2 which could be seen as major barrier in residential buildings needing support schemes in order to realize the potential. Cost optimal energy savings were remarkable in heating energy, which was reduced by factor of 3 to 4, but electricity use tended to increase in most of building types while retail and industrial buildings showed strong electricity reduction potential. The reduction in electricity use by 2030 was without and with new construction 7 and -8%, respectively. By 2030 cost optimal renovation saved 16% of final energy, but with the inclusion of new construction the reductions in final energy and non-renewable primary energy were 8% and 0% respectively.