diff --git a/website/src/lib/assets/layers.ts b/website/src/lib/assets/layers.ts
index ce3fcca42..f6d9823f1 100644
--- a/website/src/lib/assets/layers.ts
+++ b/website/src/lib/assets/layers.ts
@@ -31,8 +31,10 @@ import bikerouterGravel from './custom/bikerouter-gravel.json';
 export const maptilerKeyPlaceHolder = 'MAPTILER_KEY';
 
 export const basemaps: { [key: string]: string | StyleSpecification } = {
-    topo: 'https://raw.githubusercontent.com/gpxstudio/styles/refs/heads/main/topo.json',
-    satellite: 'https://raw.githubusercontent.com/gpxstudio/styles/refs/heads/main/satellite.json',
+    libertyTopo: 'https://styles.gpx.studio/liberty-topo.json',
+    libertySatellite: 'https://styles.gpx.studio/liberty-satellite.json',
+    osm: 'https://styles.gpx.studio/osm.json',
+    osmTopo: 'https://styles.gpx.studio/osm-topo.json',
     esriSatellite: {
         version: 8,
         sources: {
@@ -797,8 +799,10 @@ export type LayerTreeType = { [key: string]: LayerTreeType | boolean };
 export const basemapTree: LayerTreeType = {
     basemaps: {
         world: {
-            topo: true,
-            satellite: true,
+            libertyTopo: true,
+            libertySatellite: true,
+            osm: true,
+            osmTopo: true,
             esriSatellite: true,
             openStreetMap: true,
             openTopoMap: true,
@@ -932,7 +936,7 @@ export const overpassTree: LayerTreeType = {
 };
 
 // Default basemap used
-export const defaultBasemap = 'topo';
+export const defaultBasemap = 'libertyTopo';
 
 // Default overlays used (none)
 export const defaultOverlays: LayerTreeType = {
@@ -1021,8 +1025,10 @@ export const defaultOverpassQueries: LayerTreeType = {
 export const defaultBasemapTree: LayerTreeType = {
     basemaps: {
         world: {
-            topo: true,
-            satellite: true,
+            libertyTopo: true,
+            libertySatellite: true,
+            osm: true,
+            osmTopo: true,
             esriSatellite: false,
             openStreetMap: true,
             openTopoMap: true,
diff --git a/website/src/lib/components/embedding/embedding.ts b/website/src/lib/components/embedding/embedding.ts
index 98215c449..05914fc8f 100644
--- a/website/src/lib/components/embedding/embedding.ts
+++ b/website/src/lib/components/embedding/embedding.ts
@@ -29,7 +29,7 @@ export const defaultEmbeddingOptions = {
     key: '',
     files: [],
     ids: [],
-    basemap: 'topo',
+    basemap: 'libertyTopo',
     elevation: {
         show: true,
         height: 170,
@@ -125,7 +125,9 @@ export function convertOldEmbeddingOptions(options: URLSearchParams): any {
     }
     if (options.has('source')) {
         let basemap = options.get('source')!;
-        if (basemap === 'otm') {
+        if (basemap === 'satellite') {
+            newOptions.basemap = 'libertySatellite';
+        } else if (basemap === 'otm') {
             newOptions.basemap = 'openTopoMap';
         } else if (basemap === 'ohm') {
             newOptions.basemap = 'openHikingMap';
diff --git a/website/src/lib/components/map/style.ts b/website/src/lib/components/map/style.ts
index 904a8077f..cca7abf08 100644
--- a/website/src/lib/components/map/style.ts
+++ b/website/src/lib/components/map/style.ts
@@ -59,7 +59,7 @@ export class StyleManager {
         terrainSource.subscribe(() => this.updateTerrain());
         customLayers.subscribe(() => this.updateBasemap());
         distanceUnits.subscribe(() => {
-            if (get(currentBasemap) === 'topo') this.updateBasemap();
+            if (get(currentBasemap) === 'libertyTopo') this.updateBasemap();
         });
     }
 
diff --git a/website/src/locales/en.json b/website/src/locales/en.json
index c10c2d12a..4cb0946d7 100644
--- a/website/src/locales/en.json
+++ b/website/src/locales/en.json
@@ -304,8 +304,10 @@
             "switzerland": "Switzerland",
             "united_kingdom": "United Kingdom",
             "united_states": "United States",
-            "topo": "Topo",
-            "satellite": "Satellite",
+            "libertyTopo": "Liberty Topo",
+            "libertySatellite": "Liberty Satellite",
+            "osm": "OpenMapTiles OSM",
+            "osmTopo": "OpenMapTiles OSM Topo",
             "esriSatellite": "Esri Satellite",
             "openStreetMap": "OpenStreetMap",
             "openTopoMap": "OpenTopoMap",
diff --git a/website/src/routes/[[language]]/embed/+page.svelte b/website/src/routes/[[language]]/embed/+page.svelte
index 55aedaa52..baf9a9bb8 100644
--- a/website/src/routes/[[language]]/embed/+page.svelte
+++ b/website/src/routes/[[language]]/embed/+page.svelte
@@ -20,7 +20,7 @@
         }
         embeddingOptions = getMergedEmbeddingOptions(options);
         if (embeddingOptions.key === '' && embeddingOptions.basemap === 'satellite') {
-            embeddingOptions.basemap = 'topo';
+            embeddingOptions.basemap = 'libertyTopo';
         }
     });
 </script>