Don't remove the maximum number to keep but increase it for release/beta/onDemand and add the timebase policy.