A method and system for creating a new restore container. A count that is determined for each unique infrastructure container of existing unique infrastructure containers is a number of instances in which a particular container type that is unique for each unique infrastructure container has been utilized. In response to both determining that the count for one unique infrastructure container is equal to or greater than a specified threshold and determining that a popular infrastructure container does not exist within a central repository that stores the existing unique infrastructure containers, the new restore container is created within the central repository by determining a most similar container of the existing restore containers whose software stack content matches, in part, software content in a first software stack of the popular infrastructure container more closely than does software content in the software stack of any other existing restore container.