Agile development is getting more and more used, also in the development of safety-critical software. For the sake of certification, it is necessary to comply with relevant standards – in this case IEC 61508 and EN 50128. In this paper we focus on two aspects of the need for configuration management and SafeScrum. First and foremost we need to adapt SafeScrum to the standards’ needs for configuration management. We show that this can be achieved by relative simple amendments to SafeScrum. In addition – in order to keep up with a rapidly changing set of development paradigms it is necessary to move the standards’ requirement in a goal based direction – more focus on what and not so much focus on how.