diff --git a/modules/apps/map/map-openstreetmap/package.json b/modules/apps/map/map-openstreetmap/package.json
index e2189285ceb2d0..de60d8bfede5d1 100644
--- a/modules/apps/map/map-openstreetmap/package.json
+++ b/modules/apps/map/map-openstreetmap/package.json
@@ -1,7 +1,8 @@
 {
 	"dependencies": {
 		"@liferay/map-common": "*",
-		"frontend-js-web": "*"
+		"frontend-js-web": "*",
+		"leaflet": "1.7.1"
 	},
 	"main": "js/index.js",
 	"name": "@liferay/map-openstreetmap",
diff --git a/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/init.jsp b/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/init.jsp
index ddd55fc89876ad..009c9e9bdbb54a 100644
--- a/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/init.jsp
@@ -7,10 +7,8 @@
 
 <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
 
-<%@ taglib uri="http://liferay.com/tld/aui" prefix="aui" %><%@
-taglib uri="http://liferay.com/tld/frontend" prefix="liferay-frontend" %><%@
-taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %><%@
-taglib uri="http://liferay.com/tld/util" prefix="liferay-util" %>
+<%@ taglib uri="http://liferay.com/tld/frontend" prefix="liferay-frontend" %><%@
+taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %>
 
 <%@ page import="com.liferay.portal.kernel.json.JSONFactoryUtil" %><%@
 page import="com.liferay.portal.kernel.util.GetterUtil" %><%@
diff --git a/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/js/MapOpenStreetMap.js b/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/js/MapOpenStreetMap.js
index 5218ff578a1d1d..201076ce52dbed 100644
--- a/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/js/MapOpenStreetMap.js
+++ b/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/js/MapOpenStreetMap.js
@@ -4,6 +4,9 @@
  */
 
 import {MapBase} from '@liferay/map-common';
+import L from 'leaflet';
+
+import 'leaflet/dist/leaflet.css';
 
 import OpenStreetMapDialog from './OpenStreetMapDialog';
 import OpenStreetMapGeoJSON from './OpenStreetMapGeoJSON';
diff --git a/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/js/OpenStreetMapDialog.js b/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/js/OpenStreetMapDialog.js
index 55f95b3cb17460..209098deaad201 100644
--- a/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/js/OpenStreetMapDialog.js
+++ b/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/js/OpenStreetMapDialog.js
@@ -3,6 +3,10 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
  */
 
+import L from 'leaflet';
+
+import 'leaflet/dist/leaflet.css';
+
 /**
  * OpenStreetMapDialog
  * @review
diff --git a/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/js/OpenStreetMapGeoJSON.js b/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/js/OpenStreetMapGeoJSON.js
index 6effb78fc3d77e..69ce16b2d9a8e7 100644
--- a/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/js/OpenStreetMapGeoJSON.js
+++ b/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/js/OpenStreetMapGeoJSON.js
@@ -4,6 +4,9 @@
  */
 
 import {GeoJSONBase} from '@liferay/map-common';
+import L from 'leaflet';
+
+import 'leaflet/dist/leaflet.css';
 
 /**
  * OpenStreetMapGeoJSONBase
diff --git a/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/js/OpenStreetMapMarker.js b/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/js/OpenStreetMapMarker.js
index 539ecbe6b1c8b7..dd89fe5a1021c8 100644
--- a/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/js/OpenStreetMapMarker.js
+++ b/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/js/OpenStreetMapMarker.js
@@ -4,6 +4,9 @@
  */
 
 import {MarkerBase} from '@liferay/map-common';
+import L from 'leaflet';
+
+import 'leaflet/dist/leaflet.css';
 
 /**
  * OpenStreetMapMarker
diff --git a/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/view.jsp b/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/view.jsp
index 795d6f6296a44b..f1e3432b5547c2 100644
--- a/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/view.jsp
+++ b/modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/view.jsp
@@ -17,14 +17,6 @@ String points = (String)request.getAttribute("liferay-map:map:points");
 name = AUIUtil.getNamespace(liferayPortletRequest, liferayPortletResponse) + name;
 %>
 
-<liferay-util:html-top
-	outputKey="com.liferay.map.openstreetmap#/view.jsp"
->
-	<aui:link crossOrigin="anonymous" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css" integrity="sha384-VzLXTJGPSyTLX6d96AxgkKvE/LRb7ECGyTxuwtpjHnVWVZs2gp5RDjeM/tgBnVdM" rel="stylesheet" />
-
-	<aui:script crossOrigin="anonymous" integrity="sha384-RFZC58YeKApoNsIbBxf4z6JJXmh+geBSgkCQXFyh+4tiFSJmJBt+2FbjxW7Ar16M" src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js" type="text/javascript"></aui:script>
-</liferay-util:html-top>
-
 <liferay-frontend:component
 	context='<%=
 		HashMapBuilder.<String, Object>put(