Selection of the appropriate final storage containers for the waste is crucial for disposal and holds enormous potential for optimization. In the selection process, we consider the radiological, geometric and technical boundary conditions, check them for the expected or existing waste to be managed and optimize them in an iterative process. In addition, we develop the arrangement planning for the loading of the containers, including a specification of the technical requirements for the equipment needed to implement an efficient and safe process and, at the end, a container suitable for final storage in the repository.