diff --git a/packages/base-map/package.json b/packages/base-map/package.json
index b9c481d77..05c04dc1e 100644
--- a/packages/base-map/package.json
+++ b/packages/base-map/package.json
@@ -12,7 +12,7 @@
     "mapbox-gl": "npm:empty-npm-package@1.0.0",
     "maplibre-gl": "^2.1.9",
     "react-map-gl": "^7.0.15",
-    "@opentripplanner/building-blocks": "^1.2.2"
+    "@opentripplanner/building-blocks": "^2.0.0"
   },
   "peerDependencies": {
     "react": "^18.2.0",
diff --git a/packages/building-blocks/package.json b/packages/building-blocks/package.json
index 270450d38..e4e0bd48e 100644
--- a/packages/building-blocks/package.json
+++ b/packages/building-blocks/package.json
@@ -10,7 +10,7 @@
   "private": false,
   "devDependencies": {
     "@opentripplanner/types": "^6.5.2",
-    "@opentripplanner/core-utils": "^11.4.4"
+    "@opentripplanner/core-utils": "^12.0.0"
   },
   "peerDependencies": {
     "react": "^18.2.0",
diff --git a/packages/endpoints-overlay/package.json b/packages/endpoints-overlay/package.json
index 5d5fb7821..eb81876ca 100644
--- a/packages/endpoints-overlay/package.json
+++ b/packages/endpoints-overlay/package.json
@@ -19,12 +19,12 @@
     "url": "https://github.com/opentripplanner/otp-ui/issues"
   },
   "dependencies": {
-    "@opentripplanner/base-map": "^3.2.2",
+    "@opentripplanner/base-map": "^4.0.0",
     "@opentripplanner/location-icon": "^1.4.1",
-    "@opentripplanner/core-utils": "^11.4.4",
+    "@opentripplanner/core-utils": "^12.0.0",
     "flat": "^5.0.2",
     "@styled-icons/fa-solid": "^10.34.0",
-    "@opentripplanner/building-blocks": "^1.2.2"
+    "@opentripplanner/building-blocks": "^2.0.0"
   },
   "devDependencies": {
     "@opentripplanner/types": "^6.5.2",
diff --git a/packages/icons/package.json b/packages/icons/package.json
index 04ca60b62..399b49357 100644
--- a/packages/icons/package.json
+++ b/packages/icons/package.json
@@ -10,7 +10,7 @@
   "license": "MIT",
   "private": false,
   "dependencies": {
-    "@opentripplanner/core-utils": "^11.4.4",
+    "@opentripplanner/core-utils": "^12.0.0",
     "prop-types": "^15.7.2"
   },
   "peerDependencies": {
diff --git a/packages/itinerary-body/package.json b/packages/itinerary-body/package.json
index dc50d84b5..30c16119d 100644
--- a/packages/itinerary-body/package.json
+++ b/packages/itinerary-body/package.json
@@ -10,9 +10,9 @@
   "license": "MIT",
   "private": false,
   "dependencies": {
-    "@opentripplanner/core-utils": "^11.4.4",
+    "@opentripplanner/core-utils": "^12.0.0",
     "@opentripplanner/humanize-distance": "^1.2.0",
-    "@opentripplanner/icons": "^2.0.12",
+    "@opentripplanner/icons": "^3.0.0",
     "@opentripplanner/location-icon": "^1.4.1",
     "@styled-icons/fa-solid": "^10.34.0",
     "@styled-icons/foundation": "^10.34.0",
diff --git a/packages/location-field/package.json b/packages/location-field/package.json
index 1240cf331..012b8562a 100644
--- a/packages/location-field/package.json
+++ b/packages/location-field/package.json
@@ -10,7 +10,7 @@
   "private": false,
   "dependencies": {
     "@conveyal/geocoder-arcgis-geojson": "^0.0.3",
-    "@opentripplanner/core-utils": "^11.4.4",
+    "@opentripplanner/core-utils": "^12.0.0",
     "@opentripplanner/geocoder": "^3.0.2",
     "@opentripplanner/humanize-distance": "^1.2.0",
     "@opentripplanner/location-icon": "^1.4.1",
diff --git a/packages/map-popup/package.json b/packages/map-popup/package.json
index e4a8edc90..ff94c3b06 100644
--- a/packages/map-popup/package.json
+++ b/packages/map-popup/package.json
@@ -11,10 +11,10 @@
   "license": "MIT",
   "private": false,
   "dependencies": {
-    "@opentripplanner/base-map": "^3.2.2",
-    "@opentripplanner/building-blocks": "^1.2.2",
-    "@opentripplanner/core-utils": "^11.4.4",
-    "@opentripplanner/from-to-location-picker": "^2.1.14",
+    "@opentripplanner/base-map": "^4.0.0",
+    "@opentripplanner/building-blocks": "^2.0.0",
+    "@opentripplanner/core-utils": "^12.0.0",
+    "@opentripplanner/from-to-location-picker": "^3.0.0",
     "flat": "^5.0.2"
   },
   "devDependencies": {
diff --git a/packages/otp2-tile-overlay/package.json b/packages/otp2-tile-overlay/package.json
index af4aa8f53..cbc1d2f17 100644
--- a/packages/otp2-tile-overlay/package.json
+++ b/packages/otp2-tile-overlay/package.json
@@ -16,10 +16,10 @@
     "react-map-gl": "^7.0.15"
   },
   "dependencies": {
-    "@opentripplanner/map-popup": "^4.0.0"
+    "@opentripplanner/map-popup": "^v3.2.0-alpha.1"
   },
   "devDependencies": {
-    "@opentripplanner/base-map": "^3.2.2",
+    "@opentripplanner/base-map": "^4.0.0",
     "@opentripplanner/types": "^6.5.2"
   }
 }
diff --git a/packages/park-and-ride-overlay/package.json b/packages/park-and-ride-overlay/package.json
index 42223c068..b3f9598b4 100644
--- a/packages/park-and-ride-overlay/package.json
+++ b/packages/park-and-ride-overlay/package.json
@@ -19,8 +19,8 @@
     "url": "https://github.com/opentripplanner/otp-ui/issues"
   },
   "dependencies": {
-    "@opentripplanner/base-map": "^3.2.2",
-    "@opentripplanner/from-to-location-picker": "^2.1.14"
+    "@opentripplanner/base-map": "^4.0.0",
+    "@opentripplanner/from-to-location-picker": "^3.0.0"
   },
   "peerDependencies": {
     "react": "^18.2.0",
diff --git a/packages/printable-itinerary/package.json b/packages/printable-itinerary/package.json
index 2a0275026..5a147cc40 100644
--- a/packages/printable-itinerary/package.json
+++ b/packages/printable-itinerary/package.json
@@ -10,11 +10,11 @@
   "license": "MIT",
   "private": false,
   "dependencies": {
-    "@opentripplanner/core-utils": "^11.4.4",
-    "@opentripplanner/itinerary-body": "^5.3.6"
+    "@opentripplanner/core-utils": "^12.0.0",
+    "@opentripplanner/itinerary-body": "^6.0.0"
   },
   "devDependencies": {
-    "@opentripplanner/icons": "^2.0.12"
+    "@opentripplanner/icons": "^3.0.0"
   },
   "peerDependencies": {
     "react": "^18.2.0",
diff --git a/packages/route-viewer-overlay/package.json b/packages/route-viewer-overlay/package.json
index 4ca138ade..d25e6cf51 100644
--- a/packages/route-viewer-overlay/package.json
+++ b/packages/route-viewer-overlay/package.json
@@ -20,8 +20,8 @@
   },
   "dependencies": {
     "@mapbox/polyline": "^1.1.0",
-    "@opentripplanner/base-map": "^3.2.2",
-    "@opentripplanner/core-utils": "^11.4.4",
+    "@opentripplanner/base-map": "^4.0.0",
+    "@opentripplanner/core-utils": "^12.0.0",
     "point-in-polygon": "^1.1.0"
   },
   "devDependencies": {
diff --git a/packages/stop-viewer-overlay/package.json b/packages/stop-viewer-overlay/package.json
index 5c1aa9585..8d6a0b2ca 100644
--- a/packages/stop-viewer-overlay/package.json
+++ b/packages/stop-viewer-overlay/package.json
@@ -19,8 +19,8 @@
     "url": "https://github.com/opentripplanner/otp-ui/issues"
   },
   "dependencies": {
-    "@opentripplanner/base-map": "^3.2.2",
-    "@opentripplanner/core-utils": "^11.4.4"
+    "@opentripplanner/base-map": "^4.0.0",
+    "@opentripplanner/core-utils": "^12.0.0"
   },
   "devDependencies": {
     "@opentripplanner/types": "^6.5.2"
diff --git a/packages/stops-overlay/package.json b/packages/stops-overlay/package.json
index 3b3ce8a69..1d2cb9199 100644
--- a/packages/stops-overlay/package.json
+++ b/packages/stops-overlay/package.json
@@ -19,9 +19,9 @@
     "url": "https://github.com/opentripplanner/otp-ui/issues"
   },
   "dependencies": {
-    "@opentripplanner/base-map": "^3.2.2",
-    "@opentripplanner/from-to-location-picker": "^2.1.14",
-    "@opentripplanner/map-popup": "^4.0.0",
+    "@opentripplanner/base-map": "^4.0.0",
+    "@opentripplanner/from-to-location-picker": "^3.0.0",
+    "@opentripplanner/map-popup": "^5.0.0",
     "flat": "^5.0.2"
   },
   "devDependencies": {
diff --git a/packages/transit-vehicle-overlay/package.json b/packages/transit-vehicle-overlay/package.json
index f4fcb34b5..b9034dab2 100644
--- a/packages/transit-vehicle-overlay/package.json
+++ b/packages/transit-vehicle-overlay/package.json
@@ -9,9 +9,9 @@
   "module": "esm/index.js",
   "private": false,
   "dependencies": {
-    "@opentripplanner/base-map": "^3.2.2",
-    "@opentripplanner/core-utils": "^11.4.4",
-    "@opentripplanner/icons": "^2.0.12",
+    "@opentripplanner/base-map": "^4.0.0",
+    "@opentripplanner/core-utils": "^12.0.0",
+    "@opentripplanner/icons": "^3.0.0",
     "flat": "^5.0.2"
   },
   "devDependencies": {
diff --git a/packages/transitive-overlay/package.json b/packages/transitive-overlay/package.json
index db1d0e8d8..540e6895a 100644
--- a/packages/transitive-overlay/package.json
+++ b/packages/transitive-overlay/package.json
@@ -20,9 +20,9 @@
   },
   "dependencies": {
     "@mapbox/polyline": "^1.1.1",
-    "@opentripplanner/base-map": "^3.2.2",
-    "@opentripplanner/core-utils": "^11.4.4",
-    "@opentripplanner/itinerary-body": "^5.3.6",
+    "@opentripplanner/base-map": "^4.0.0",
+    "@opentripplanner/core-utils": "^12.0.0",
+    "@opentripplanner/itinerary-body": "^6.0.0",
     "@turf/bbox": "^6.5.0",
     "@turf/bearing": "^6.5.0",
     "@turf/destination": "^6.5.0",
@@ -32,7 +32,7 @@
     "lodash.isequal": "^4.5.0"
   },
   "devDependencies": {
-    "@opentripplanner/endpoints-overlay": "^2.1.3",
+    "@opentripplanner/endpoints-overlay": "^3.0.0",
     "@opentripplanner/types": "^6.5.2"
   },
   "peerDependencies": {
diff --git a/packages/trip-details/package.json b/packages/trip-details/package.json
index 713845457..71f276492 100644
--- a/packages/trip-details/package.json
+++ b/packages/trip-details/package.json
@@ -11,7 +11,7 @@
   "license": "MIT",
   "private": false,
   "dependencies": {
-    "@opentripplanner/core-utils": "^11.4.4",
+    "@opentripplanner/core-utils": "^12.0.0",
     "@styled-icons/fa-solid": "^10.34.0",
     "flat": "^5.0.2",
     "react-animate-height": "^3.0.4"
diff --git a/packages/trip-form/package.json b/packages/trip-form/package.json
index 454f7b09a..94d7b01d3 100644
--- a/packages/trip-form/package.json
+++ b/packages/trip-form/package.json
@@ -10,8 +10,8 @@
   "types": "lib/index.d.ts",
   "private": false,
   "dependencies": {
-    "@opentripplanner/core-utils": "^11.4.4",
-    "@opentripplanner/building-blocks": "^1.0.3",
+    "@opentripplanner/core-utils": "^12.0.0",
+    "@opentripplanner/building-blocks": "^2.0.0",
     "@floating-ui/react": "^0.19.2",
     "@styled-icons/bootstrap": "^10.34.0",
     "@styled-icons/boxicons-regular": "^10.38.0",
diff --git a/packages/trip-viewer-overlay/package.json b/packages/trip-viewer-overlay/package.json
index fcdc203ae..c2babcc97 100644
--- a/packages/trip-viewer-overlay/package.json
+++ b/packages/trip-viewer-overlay/package.json
@@ -20,8 +20,8 @@
   },
   "dependencies": {
     "@mapbox/polyline": "^1.1.0",
-    "@opentripplanner/base-map": "^3.2.2",
-    "@opentripplanner/core-utils": "^11.4.4"
+    "@opentripplanner/base-map": "^4.0.0",
+    "@opentripplanner/core-utils": "^12.0.0"
   },
   "peerDependencies": {
     "react": "^18.2.0",
diff --git a/packages/vehicle-rental-overlay/package.json b/packages/vehicle-rental-overlay/package.json
index c04cd9d8c..ef293b840 100644
--- a/packages/vehicle-rental-overlay/package.json
+++ b/packages/vehicle-rental-overlay/package.json
@@ -19,10 +19,10 @@
     "url": "git+https://github.com/opentripplanner/otp-ui.git"
   },
   "dependencies": {
-    "@opentripplanner/base-map": "^3.2.2",
-    "@opentripplanner/core-utils": "^11.4.4",
-    "@opentripplanner/from-to-location-picker": "^2.1.14",
-    "@opentripplanner/map-popup": "^4.0.0",
+    "@opentripplanner/base-map": "^4.0.0",
+    "@opentripplanner/core-utils": "^12.0.0",
+    "@opentripplanner/from-to-location-picker": "^3.0.0",
+    "@opentripplanner/map-popup": "^5.0.0",
     "@styled-icons/fa-solid": "^10.34.0",
     "flat": "^5.0.2",
     "lodash.memoize": "^4.1.2"
diff --git a/packages/zoom-based-markers/package.json b/packages/zoom-based-markers/package.json
index 8d3feefc4..b9514ca2d 100644
--- a/packages/zoom-based-markers/package.json
+++ b/packages/zoom-based-markers/package.json
@@ -19,8 +19,8 @@
     "url": "https://github.com/opentripplanner/otp-ui/issues"
   },
   "dependencies": {
-    "@opentripplanner/core-utils": "^11.4.4",
-    "@opentripplanner/base-map": "^3.2.2"
+    "@opentripplanner/core-utils": "^12.0.0",
+    "@opentripplanner/base-map": "^4.0.0"
   },
   "devDependencies": {
     "@opentripplanner/types": "^6.5.2"
diff --git a/yarn.lock b/yarn.lock
index ecfecbd61..a3bb50507 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4608,6 +4608,58 @@
   resolved "https://registry.yarnpkg.com/@open-draft/until/-/until-2.1.0.tgz#0acf32f470af2ceaf47f095cdecd40d68666efda"
   integrity sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==
 
+"@opentripplanner/base-map@^3.2.2":
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/base-map/-/base-map-3.2.2.tgz#6dc15f3af0bfe483ffea220dcd2220272fa31040"
+  integrity sha512-Neg+rvAr9lWx+8V8/4ZlPE+l91wxM0fbbsM5vp45L1zCRE4WszD7XtmLocnNMyuYzo3xEijoKF+ICiENsOM9bg==
+  dependencies:
+    "@opentripplanner/building-blocks" "^1.2.2"
+    mapbox-gl "npm:empty-npm-package@1.0.0"
+    maplibre-gl "^2.1.9"
+    react-map-gl "^7.0.15"
+
+"@opentripplanner/building-blocks@^1.2.2":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/building-blocks/-/building-blocks-1.2.3.tgz#404e8f9038867d66d55f51adf8855b1326c51ed5"
+  integrity sha512-I0AxiZrTZu+e7+av4u0tHW2ijqpxH0AkLHrhf75BHf1Ep2FOGxaul/v+8UT18mNYiM5eHNstOX3XiXaDjtCUaw==
+
+"@opentripplanner/core-utils@^11.4.4":
+  version "11.5.0"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-11.5.0.tgz#b0aaa7724bb44fadc71c7027fe9eacac09e4e042"
+  integrity sha512-kRn50DSnET6t8Zdwx5hoGz6ZwOegvq70Ovxs6shgJJRKuEj5tEhkPyuqY+LndTG8NWuZj9Ql9Vb4Va7kZbHAvA==
+  dependencies:
+    "@conveyal/lonlat" "^1.4.1"
+    "@mapbox/polyline" "^1.1.0"
+    "@opentripplanner/geocoder" "^3.0.2"
+    "@styled-icons/foundation" "^10.34.0"
+    "@turf/along" "^6.0.1"
+    chroma-js "^2.4.2"
+    date-fns "^2.28.0"
+    date-fns-tz "^1.2.2"
+    graphql "^16.6.0"
+    lodash.clonedeep "^4.5.0"
+    lodash.isequal "^4.5.0"
+    qs "^6.9.1"
+
+"@opentripplanner/from-to-location-picker@^2.1.14":
+  version "2.1.14"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/from-to-location-picker/-/from-to-location-picker-2.1.14.tgz#7386fe93cd486a67a119a81fb46a5a442f9aa7ec"
+  integrity sha512-V0slZKBxGj6J4QxrIc3hpcHmZzAW6F1qZGBFJG/0Lpx3MiT5BVnaYyapedJOJW7zdzcIt16FBg774RjvwBu3fQ==
+  dependencies:
+    "@opentripplanner/location-icon" "^1.4.1"
+    flat "^5.0.2"
+
+"@opentripplanner/map-popup@^v3.2.0-alpha.1":
+  version "3.2.0-alpha.1"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/map-popup/-/map-popup-3.2.0-alpha.1.tgz#dcad38c103500f7c5ad3c632398204849ed5885e"
+  integrity sha512-Z0RsyC7wkYU/aOLYQFsJI5tBhzooEE/sQZROX2WODkDWAv4Qfj95ppS8pvNkpoZ0N4fioFcj5aM2VGXVMSy0EA==
+  dependencies:
+    "@opentripplanner/base-map" "^3.2.2"
+    "@opentripplanner/building-blocks" "^1.2.2"
+    "@opentripplanner/core-utils" "^11.4.4"
+    "@opentripplanner/from-to-location-picker" "^2.1.14"
+    flat "^5.0.2"
+
 "@peculiar/asn1-schema@^2.1.6", "@peculiar/asn1-schema@^2.3.0":
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.3.3.tgz#21418e1f3819e0b353ceff0c2dad8ccb61acd777"