Refactor to recreate containers after expiration