Change Expiry time to use PERIOD_S instead of fixed 10s timeout