diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js
index 771d49e7..dc353750 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js
@@ -24,7 +24,7 @@ import SearchBox from './components/SearchBox.vue'
 import SearchResult from './components/SearchResult.vue'
 import ProductDetail from './components/ProductDetail.vue'
 import AjaxContent from './components/AjaxContent.vue'
-import Gmap from './components/Gmap.vue'
+import OsmMap from './components/OsmMap.vue'
 import Calendar from './components/Calendar.vue'
 import EventPricetable from './components/EventPriceTable.vue'
 import ContactForm from './components/ContactForm.vue'
@@ -54,7 +54,7 @@ new Vue({
         SearchResult,
         ProductDetail,
         AjaxContent,
-        Gmap,
+        OsmMap,
         Calendar,
         EventPricetable,
         ContactForm,
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/Gmap.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/OsmMap.vue
similarity index 95%
rename from web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/Gmap.vue
rename to web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/OsmMap.vue
index 7633e0af..85b7f179 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/Gmap.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/OsmMap.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="gmap" ref="container"></div>
+    <div class="osm-map" ref="container"></div>
 </template>
 <script>
     import L from 'leaflet';
@@ -67,7 +67,7 @@
                     }
                     this.map.fitBounds(bounds);
                 }
-                L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+                L.tileLayer('https://{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png', {
                     maxZoom: 19,
                     attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
                 }).addTo(this.map);
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ProductDetail.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ProductDetail.vue
index 8f733a3b..16253346 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ProductDetail.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ProductDetail.vue
@@ -11,7 +11,7 @@
     import Calendar from './Calendar.vue'
     import FacebookPixel from './FacebookPixel.vue'
     import WatchlistToggle from './WatchlistToggle.vue'
-    import Gmap from './Gmap.vue'
+    import OsmMap from './OsmMap.vue'
     import dayjs from 'dayjs'
     import 'dayjs/locale/de'
 
@@ -26,7 +26,7 @@
             Calendar,
             FacebookPixel,
             WatchlistToggle,
-            Gmap
+            OsmMap
         },
         data () {
             return {
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main.scss b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main.scss
index 24ee6681..36bc47b7 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main.scss
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main.scss
@@ -21,7 +21,7 @@ $output-bourbon-deprecation-warnings: false;
 @import "remix/herounit";
 @import "remix/calendar";
 @import "remix/partnerlogos";
-@import "remix/gmap";
+@import "remix/osm-map";
 @import "remix/video";
 @import "remix/newsletterform";
 @import "remix/layout";
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_boarderweek.scss b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_boarderweek.scss
index dcca1649..1579f5de 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_boarderweek.scss
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_boarderweek.scss
@@ -22,7 +22,7 @@ $output-bourbon-deprecation-warnings: false;
 @import "remix/herounit";
 @import "remix/calendar";
 @import "remix/partnerlogos";
-@import "remix/gmap";
+@import "remix/osm-map";
 @import "remix/video";
 @import "remix/newsletterform";
 @import "remix/layout";
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_snowzone.scss b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_snowzone.scss
index b54eddc2..4b1f7d9b 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_snowzone.scss
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_snowzone.scss
@@ -22,7 +22,7 @@ $output-bourbon-deprecation-warnings: false;
 @import "remix/herounit";
 @import "remix/calendar";
 @import "remix/partnerlogos";
-@import "remix/gmap";
+@import "remix/osm-map";
 @import "remix/video";
 @import "remix/newsletterform";
 @import "remix/layout";
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_unichamp.scss b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_unichamp.scss
index 3a3c09be..e1dc5ac3 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_unichamp.scss
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main_unichamp.scss
@@ -22,7 +22,7 @@ $output-bourbon-deprecation-warnings: false;
 @import "remix/herounit";
 @import "remix/calendar";
 @import "remix/partnerlogos";
-@import "remix/gmap";
+@import "remix/osm-map";
 @import "remix/video";
 @import "remix/newsletterform";
 @import "remix/layout";
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_gmap.scss b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_osm-map.scss
similarity index 85%
rename from web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_gmap.scss
rename to web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_osm-map.scss
index 5a5dbeb5..283f2d21 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_gmap.scss
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_osm-map.scss
@@ -1,4 +1,4 @@
-.gmap {
+.osm-map {
   width: 100%;
   padding-bottom: 56.25%;
   margin-bottom: 34px;
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Gmap.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Gmap.html
index 758a895a..99c3f3d5 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Gmap.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Gmap.html
@@ -15,11 +15,11 @@
 
     <f:section name="Map">
         <div class="row">
-            <gmap
+            <osm-map
                 lat="{latitude}"
                 lng="{longitude}"
                 :zoom="17"
-            ></gmap>
+            ></osm-map>
         </div>
     </f:section>
 
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Map/General.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Map/General.html
index 6b1654b7..3ffd49a0 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Map/General.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Map/General.html
@@ -4,7 +4,7 @@
     <f:layout name="Default"/>
 
     <f:section name="Main">
-        <gmap :markers="{markerData}" :zoom="17"></gmap>
+        <osm-map :markers="{markerData}" :zoom="17"></osm-map>
     </f:section>
 
 </html>
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html
index f51b782b..ab9306d3 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html
@@ -92,8 +92,8 @@
                                 <div class="ep-sidebar ep-snow">
                                     <p><strong>Lage</strong></p>
                                     <div>
-                                        <gmap lat="{hotel.latitude}" lng="{hotel.longitude}" :zoom="12"
-                                              external-link="{f:uri.typolink(parameter: hotel.externalLink)}"></gmap>
+                                        <osm-map lat="{hotel.latitude}" lng="{hotel.longitude}" :zoom="12"
+                                              external-link="{f:uri.typolink(parameter: hotel.externalLink)}"></osm-map>
                                     </div>
                                 </div>
                                 <f:render partial="Region/Webcam" arguments="{region: region}"/>
@@ -191,8 +191,8 @@
                                 <div class="ep-sidebar ep-snow">
                                     <p><strong>Lage</strong></p>
                                     <div>
-                                        <gmap lat="{hotel.latitude}" lng="{hotel.longitude}" :zoom="12"
-                                              external-link="{f:uri.typolink(parameter: hotel.externalLink)}"></gmap>
+                                        <osm-map lat="{hotel.latitude}" lng="{hotel.longitude}" :zoom="12"
+                                              external-link="{f:uri.typolink(parameter: hotel.externalLink)}"></osm-map>
                                     </div>
                                 </div>
                                 <f:render partial="Region/Webcam" arguments="{region: region}"/>