Expiry date Production Batch

Dear sir,

At present expiry date for a production batch is maintained as Date of manufacturing + Total shelf life. For example if the date of manufacturing is 02/2016, shelf life is 24 month, expiry date 02/2018 but  we require the expiry date as 01/2018. ie manufacturing date + shelf life - 1.

Please provide the procedure for the same