diff --git a/src/model/s3/lifecycle_worker.rs b/src/model/s3/lifecycle_worker.rs
index 9ecf168c..d884d30f 100644
--- a/src/model/s3/lifecycle_worker.rs
+++ b/src/model/s3/lifecycle_worker.rs
@@ -388,15 +388,12 @@ fn check_size_filter(version_data: &ObjectVersionData, filter: &LifecycleFilter)
 fn midnight_ts(date: NaiveDate) -> u64 {
 	date.and_hms_opt(0, 0, 0)
 		.expect("midnight does not exist")
-		.timestamp_millis() as u64
+		.and_utc().timestamp_millis() as u64
 }
 
 fn next_date(ts: u64) -> NaiveDate {
-	NaiveDateTime::from_timestamp_millis(ts as i64)
-		.expect("bad timestamp")
-		.date()
-		.succ_opt()
-		.expect("no next day")
+	DateTime::from_timestamp_millis(ts as i64)
+		.expect("bad timestamp").date_naive()
 }
 
 fn today() -> NaiveDate {