Rebuild for producation