Fixed multiple places with container name