This report adds to findings concerning the impact of advanced electricity tariff structures on grid-connected hybrid photovoltaic-battery systems. A representative database of 1'608 buildings in the city of Rolle was clustered into 15 medoids. For these 15 medoids and for the years 2020 and 2040, five tariff designs such as real-time pricings, a capacity-based tariff, and a block-rate tariff were evaluated using a mixed-integer-linear programming optimisation. The capacity-based tariff was concluded to be the most dependent on the grid and resulted in no investment in PV capacity or batteries in the year 2020. With Switzerland's current 2050 energy plans, the block-rate tariff scenario was concluded to be the most adequate mainly due to its independence from the electricity grid. In 2040, the block-rate scenario had an average of 18kWh more battery capacity installation compared to all other tariff designs. Even though, PV curtailment was present in this scenario, it was concluded that curtailment could be seen as an opportunity to encourage storage and the renovation of the current grid infrastructure. These conclusions could provide insights for policy makers.