Tweak container ids