diff --git a/src/virtualship/cli/commands.py b/src/virtualship/cli/commands.py
index dccb6816..777015bc 100644
--- a/src/virtualship/cli/commands.py
+++ b/src/virtualship/cli/commands.py
@@ -1,4 +1,5 @@
 import shutil
+from datetime import timedelta
 from pathlib import Path
 
 import click
@@ -235,7 +236,7 @@ def fetch(path: str | Path, username: str | None, password: str | None) -> None:
                     minimum_latitude=spatial_range.minimum_latitude - 3.0,
                     maximum_latitude=spatial_range.maximum_latitude + 3.0,
                     start_datetime=start_datetime,
-                    end_datetime=end_datetime,
+                    end_datetime=end_datetime + timedelta(days=21),
                     minimum_depth=abs(1),
                     maximum_depth=abs(1),
                     output_filename=dataset["output_filename"],
@@ -283,7 +284,7 @@ def fetch(path: str | Path, username: str | None, password: str | None) -> None:
                     minimum_latitude=spatial_range.minimum_latitude - 3.0,
                     maximum_latitude=spatial_range.maximum_latitude + 3.0,
                     start_datetime=start_datetime,
-                    end_datetime=end_datetime,
+                    end_datetime=end_datetime + timedelta(days=21),
                     minimum_depth=abs(1),
                     maximum_depth=abs(spatial_range.maximum_depth),
                     output_filename=dataset["output_filename"],
diff --git a/src/virtualship/static/ship_config.yaml b/src/virtualship/static/ship_config.yaml
index 494656c1..5066e38d 100644
--- a/src/virtualship/static/ship_config.yaml
+++ b/src/virtualship/static/ship_config.yaml
@@ -16,7 +16,7 @@ ctd_config:
   stationkeeping_time_minutes: 20.0
 drifter_config:
   depth_meter: 0.0
-  lifetime_minutes: 40320.0
+  lifetime_minutes: 60480.0
 xbt_config:
   max_depth_meter: -285.0
   min_depth_meter: -2.0