Fix duplicate container names conflict Upstream-commit: b72a431928d6389727d07235bc4d5a7b22403a53 Component: engine