Modern buildings are being built with increasingly complex technical installations and energy systems. The introduction of renewable energy production, like photovoltaic (PV) panels on building roofs and facades and an increasing number of connected electric appliances, changes the way the electric power is distributed from production to end-user. The difference in production and demand for energy over time also gives incentives for installing energy storage systems. Electric energy can be stored in batteries, transferred into hydrogen gas via electrolysis or stored as thermal energy for use later. The current work presents an overview of an ongoing study in the Fire Research and Innovation Centre (FRIC), on fire safety implications related to implementing new technology for energy storage and production. The focus is on the built environment such as dwellings and office buildings situated in the Nordic countries. This study builds on previous studies of related topics