diff --git a/next.config.ts b/next.config.ts
index 765d934..d1193f5 100644
--- a/next.config.ts
+++ b/next.config.ts
@@ -1,11 +1,15 @@
 import type { NextConfig } from "next";
 
 const nextConfig: NextConfig = {
-  async rewrites() {
+  rewrites() {
     return [
       {
-        source: "/map-styles/:path*",
-        destination: "https://basemaps.cartocdn.com/gl/:path*",
+        source: "/map-cdn/basemaps/:path*",
+        destination: "https://basemaps.cartocdn.com/:path*",
+      },
+      {
+        source: "/map-cdn/tiles/:path*",
+        destination: "https://tiles.basemaps.cartocdn.com/:path*",
       },
     ];
   },
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index a78ca91..f56f6d6 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -68,20 +68,7 @@ export default function RootLayout({
       suppressHydrationWarning
       className={`${geistSans.variable} ${geistMono.variable} h-full antialiased`}
     >
-      <head>
-        <link
-          rel="preconnect"
-          href="https://basemaps.cartocdn.com"
-          crossOrigin="anonymous"
-        />
-        <link
-          rel="preconnect"
-          href="https://tiles.basemaps.cartocdn.com"
-          crossOrigin="anonymous"
-        />
-        <link rel="dns-prefetch" href="https://basemaps.cartocdn.com" />
-        <link rel="dns-prefetch" href="https://tiles.basemaps.cartocdn.com" />
-      </head>
+      <head />
       <body className="flex min-h-full flex-col">
         <ThemeProvider
           attribute="class"
diff --git a/src/components/ui/map.tsx b/src/components/ui/map.tsx
index 5f181cf..24ea8a0 100644
--- a/src/components/ui/map.tsx
+++ b/src/components/ui/map.tsx
@@ -22,10 +22,23 @@ import { X, Minus, Plus, Locate, Maximize, Loader2 } from "lucide-react";
 import { cn } from "@/lib/utils";
 
 const defaultStyles = {
-  dark: "/map-styles/dark-matter-gl-style/style.json",
-  light: "/map-styles/positron-gl-style/style.json",
+  dark: "/map-cdn/basemaps/gl/dark-matter-gl-style/style.json",
+  light: "/map-cdn/basemaps/gl/positron-gl-style/style.json",
 };
 
+function proxyCartoUrl(url: string): string {
+  if (url.startsWith("https://basemaps.cartocdn.com/")) {
+    return url.replace("https://basemaps.cartocdn.com/", "/map-cdn/basemaps/");
+  }
+  if (url.startsWith("https://tiles.basemaps.cartocdn.com/")) {
+    return url.replace(
+      "https://tiles.basemaps.cartocdn.com/",
+      "/map-cdn/tiles/",
+    );
+  }
+  return url;
+}
+
 type Theme = "light" | "dark";
 
 // Check document class for theme (works with next-themes, etc.)
@@ -229,6 +242,7 @@ const Map = forwardRef<MapRef, MapProps>(function Map(
       attributionControl: {
         compact: true,
       },
+      transformRequest: (url) => ({ url: proxyCartoUrl(url) }),
       ...props,
       ...viewport,
     });
