diff --git a/themes/intotheeast/templates/map.html.twig b/themes/intotheeast/templates/map.html.twig
index 7a8a9f7..ad5475f 100644
--- a/themes/intotheeast/templates/map.html.twig
+++ b/themes/intotheeast/templates/map.html.twig
@@ -36,10 +36,10 @@
 
 <div class="map-container" id="trip-map"></div>
 
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/maplibre-gl@4/dist/maplibre-gl.css">
-<script src="https://cdn.jsdelivr.net/npm/maplibre-gl@4/dist/maplibre-gl.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/@mapbox/togeojson@0.16.2/togeojson.min.js"></script>
-<script src="{{ url('theme://js/maplibre-utils.js') }}"></script>
+{% block map_assets %}
+{% do assets.addCss('theme://css-compiled/map.css') %}
+{% do assets.addJs('theme://js/map.js', {group: 'bottom'}) %}
+{% endblock %}
 
 <script>
 var ENTRIES     = {{ map_entries|json_encode|raw }};
diff --git a/themes/intotheeast/templates/partials/feed-map.html.twig b/themes/intotheeast/templates/partials/feed-map.html.twig
index a64452a..d4a0e6d 100644
--- a/themes/intotheeast/templates/partials/feed-map.html.twig
+++ b/themes/intotheeast/templates/partials/feed-map.html.twig
@@ -11,6 +11,8 @@
     show_journey — bool: whether to draw the route connector line between markers
 #}
 {% if map_entries|length > 0 %}
+{% do assets.addCss('theme://css-compiled/map.css') %}
+{% do assets.addJs('theme://js/map.js', {group: 'bottom'}) %}
 <div class="feed-map-wrap">
     <div class="feed-map" id="{{ map_id }}">
         <button class="feed-map-fullscreen-btn" id="{{ map_id }}-fullscreen" aria-label="Expand map">
@@ -25,9 +27,6 @@
     {% endif %}
 </div>
 
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/maplibre-gl@4/dist/maplibre-gl.css">
-<script src="https://cdn.jsdelivr.net/npm/maplibre-gl@4/dist/maplibre-gl.js"></script>
-<script src="{{ url('theme://js/maplibre-utils.js') }}"></script>
 <script>
 {% set js_suffix = map_id|replace({'-': '_'})|upper %}
 var MAP_ENTRIES_{{ js_suffix }} = {{ map_entries|json_encode|raw }};
diff --git a/themes/intotheeast/templates/story.html.twig b/themes/intotheeast/templates/story.html.twig
index f725b45..3e09e52 100644
--- a/themes/intotheeast/templates/story.html.twig
+++ b/themes/intotheeast/templates/story.html.twig
@@ -69,7 +69,6 @@
 
 <button class="story-totop" id="story-totop" aria-label="Back to top">↑ Top</button>
 
-<script src="https://cdn.jsdelivr.net/npm/scrollama@3/build/scrollama.min.js"></script>
 <script>
 /* ── Hero scroll effect ──────────────────────────────────── */
 (function () {