Moved code from AddContainerStep to ContainerSetupWizard