Fix  certificate's expiration date and sync with common lib