<p>Mitochondria display intricately shaped deep invaginations of the mitochondrial inner membrane (MIM) termed cristae. This peculiar membrane architecture is essential for diverse mitochondrial functions, such as oxidative phosphorylation or the biosynthesis of cellular building blocks. Conserved protein nano-machineries such as F₁F_o-ATP synthase oligomers and the mitochondrial contact site and cristae organizing system (MICOS) act as adaptable protein–lipid scaffolds controlling MIM biogenesis and its dynamic remodelling. Signal-dependent rearrangements of cristae architecture and MIM fusion events are governed by the dynamin-like GTPase optic atrophy 1 (OPA1). Recent groundbreaking structural insights into these nano-machineries have considerably advanced our understanding of the functional architecture of mitochondria. In this Review, we discuss how the MIM-shaping machineries cooperate to control cristae and crista junction dynamics, including MIM fusion, in response to cellular signalling pathways. We also explore how mutations affecting MIM-shaping machineries compromise mitochondrial functions.</p>