Battery technologies have become an integral component of the modern built environment, with applications ranging from e-bikes and battery energy storage systems to electric vehicles. These widespread advancements introduce significant fire and explosion hazards and have modified the overall fire risk profile across building types, from single-family homes to complex structures. The presence of interconnected energy supply systems, such as solar panels, can further complicate this risk landscape. Addressing these challenges within the Canadian regulatory framework is multifaceted, involving the intersection of multiple codes and standards such as the OBC, OFC, and CEC. This presentation will examine these associated risks and outline fire management strategies for potential inclusion in the code framework, considering both Part 9 and Part 3 buildings.