diff --git a/install/firmware.csv b/install/firmware.csv
index 278a45fd1..5bdca974f 100644
--- a/install/firmware.csv
+++ b/install/firmware.csv
@@ -250,7 +250,7 @@ Canterbury Seismic Instruments,CUSP3D,42264,Cusp3D+r 400.74.1 (GPS18X4.40),2022-
 Canterbury Seismic Instruments,CUSP3D,42265,Cusp3D+r 400.74.1,2019-08-29T00:00:00Z,2021-03-10T21:59:59Z,Fix GPS timing 1 sec
 Canterbury Seismic Instruments,CUSP3D,42265,Cusp3D+r 400.74.1 (GPS18X4.40),2021-03-10T22:00:00Z,2025-10-21T23:37:00Z,Fix GPS week number rollover
 Canterbury Seismic Instruments,CUSP3D,42266,Cusp3D+r 400.74.1,2019-08-29T00:00:00Z,2021-06-09T22:59:59Z,Fix GPS timing 1 sec
-Canterbury Seismic Instruments,CUSP3D,42266,Cusp3D+r 400.74.1 (GPS18X4.40),2021-06-09T23:00:00Z,9999-01-01T00:00:00Z,Fix GPS week number rollover
+Canterbury Seismic Instruments,CUSP3D,42266,Cusp3D+r 400.74.1 (GPS18X4.40),2021-06-09T23:00:00Z,2026-05-24T22:10:00Z,Fix GPS week number rollover
 Canterbury Seismic Instruments,CUSP3D,42267,Cusp3D+r 400.74.1,2019-08-30T00:00:00Z,2021-06-09T20:59:59Z,Fix GPS timing 1 sec
 Canterbury Seismic Instruments,CUSP3D,42267,Cusp3D+r 400.74.1 (GPS18X4.40),2021-06-09T21:00:00Z,9999-01-01T00:00:00Z,Fix GPS week number rollover
 Canterbury Seismic Instruments,CUSP3D,42268,Cusp3D+r 400.74.1,2019-08-30T00:00:00Z,2021-06-09T21:59:59Z,Fix GPS timing 1 sec
diff --git a/install/recorders.csv b/install/recorders.csv
index 80b2cde7a..7bbe7b4ea 100644
--- a/install/recorders.csv
+++ b/install/recorders.csv
@@ -550,7 +550,7 @@ Canterbury Seismic Instruments,CUSP3D,CUSP3D,42263,CULC,20,203,,0,0,2019-11-13T0
 Canterbury Seismic Instruments,CUSP3D,CUSP3D,42264,POTS,20,210,,0,0,2015-04-10T00:00:05Z,2016-05-17T01:20:00Z
 Canterbury Seismic Instruments,CUSP3D,CUSP3D,42264,PIPS,20,77,,0,0,2018-01-25T19:49:00Z,2026-04-23T04:19:00Z
 Canterbury Seismic Instruments,CUSP3D,CUSP3D,42265,WNHS,20,85,,0,0,2015-04-14T00:00:05Z,2025-10-21T23:37:00Z
-Canterbury Seismic Instruments,CUSP3D,CUSP3D,42266,BTWS,20,340,,0,0,2015-04-01T00:00:05Z,9999-01-01T00:00:00Z
+Canterbury Seismic Instruments,CUSP3D,CUSP3D,42266,BTWS,20,340,,0,0,2015-04-01T00:00:05Z,2026-05-24T22:10:00Z
 Canterbury Seismic Instruments,CUSP3D,CUSP3D,42267,NCBS,20,223,,0,0,2015-06-02T01:45:10Z,9999-01-01T00:00:00Z
 Canterbury Seismic Instruments,CUSP3D,CUSP3D,42268,NELS,20,217,,0,0,2015-06-03T08:45:10Z,2025-07-11T03:37:00Z
 Canterbury Seismic Instruments,CUSP3D,CUSP3D,42269,NLMS,20,117,,0,0,2015-06-02T08:45:10Z,2015-11-10T00:00:00Z
diff --git a/install/streams.csv b/install/streams.csv
index be3eeebf4..d72463231 100644
--- a/install/streams.csv
+++ b/install/streams.csv
@@ -205,7 +205,7 @@ BSWZ,20,H,N,200,false,false,true,2016-11-15T06:11:00Z,2020-05-27T21:11:00Z
 BSWZ,20,H,N,200,false,false,false,2021-07-22T04:06:00Z,9999-01-01T00:00:00Z
 BSZ,10,S,H,50,false,false,true,1990-06-20T05:14:00Z,2003-11-27T03:07:00Z
 BTWS,20,B,N,50,true,false,false,2015-04-01T00:00:05Z,2020-06-16T00:00:00Z
-BTWS,20,H,N,200,true,false,true,2002-10-08T04:00:00Z,9999-01-01T00:00:00Z
+BTWS,20,H,N,200,true,false,true,2002-10-08T04:00:00Z,2026-05-24T22:10:00Z
 BWHS,20,B,N,50,true,false,false,2012-12-18T22:16:05Z,2015-08-27T15:30:00Z
 BWHS,20,H,N,200,true,false,true,2012-12-18T22:16:05Z,2015-08-27T15:30:00Z
 BWHS,21,B,N,50,true,false,false,2018-02-19T03:10:00Z,2020-06-16T00:00:00Z
diff --git a/network/sites.csv b/network/sites.csv
index 2a14474ed..2e78eb51f 100644
--- a/network/sites.csv
+++ b/network/sites.csv
@@ -586,7 +586,7 @@ BRKS,20,-45.57481679,166.7410863,311,,WGS84,External GPS Device,2009-07-16T23:05
 BSWZ,10,-41.714915447,173.875740852,277,,WGS84,Internal GPS Clock,2003-12-09T00:00:00Z,9999-01-01T00:00:00Z
 BSWZ,20,-41.71662,173.87559,277,,NZGD49,Internal GPS Clock,2016-11-15T06:11:00Z,9999-01-01T00:00:00Z
 BSZ,10,-39.796955189,174.931372067,150,,WGS84,Unknown,1990-06-20T05:14:00Z,2003-11-27T03:07:00Z
-BTWS,20,-41.389235986,173.128512822,44,,WGS84,Internal GPS Clock,2002-10-08T04:00:00Z,9999-01-01T00:00:00Z
+BTWS,20,-41.389235986,173.128512822,44,,WGS84,Internal GPS Clock,2002-10-08T04:00:00Z,2026-05-24T22:10:00Z
 BWHS,20,-43.480415,172.6821837,10,,WGS84,External GPS Device,2012-12-18T22:16:05Z,2015-08-27T15:30:00Z
 BWHS,21,-43.481087,172.68237,7,,WGS84,Unknown,2018-02-19T03:10:00Z,9999-01-01T00:00:00Z
 BWRS,20,-41.43954404,173.90511789,75,,WGS84,External GPS Device,2011-08-22T04:05:00Z,9999-01-01T00:00:00Z