Added default for keep_containers option
Renamed @other_config to @fallback_config