[Jenkins only] Intelligent container

Jenkins PR for jenkins-12830