Heat pumps have a significant and increasing share in the European heating market. In most applications heat pumps are operated with a storage tank, either for domestic hot water or for the space heating circuit. The design of the storage and its connection to the heat pump has a significant influence on the performance of the heat pump and the whole system. Within a comprehensive investigation, system simulations in TRNSYS are used to identify the optimum design of two typical systems with a heat pump connected to a buffer storage including total storage volume, number and size of heated zones, sensor and in- and outlet positions. As result, a sharp decrease in the energy demand can be reached if the storage is equipped with two heat zones instead of one. This can be explained by the decreased set temperature in the additional heat zone for space heating leading to a higher performance of the heat pump. Other measures with a positive effect on the energy demand are a large space heating volume, the number and place of sensors, low set temperatures and the sensor position in the upper part of the heating zone. The investigation gives important recommendations how to connect a heat pump with a storage tank and may be considered as design rules for all heating systems consisting of heat pump and different types of storage tanks.