In a future energy system, sector coupling as a flexibilisation option and the integration of electricity-based renewable energies will play an important role. Combined electricity/heat technologies such as combined heat power (CHP) or heat pumps will be examined and optimised as components in concepts for building- and district-heating systems.