diff --git a/marketplace/src/components/LocationPicker.tsx b/marketplace/src/components/LocationPicker.tsx
index fe47abc..f6913b6 100644
--- a/marketplace/src/components/LocationPicker.tsx
+++ b/marketplace/src/components/LocationPicker.tsx
@@ -46,8 +46,8 @@ export const LocationPicker = ({ initialLat, initialLng, onLocationSelect }: Loc
         <div className="h-[300px] w-full rounded-lg overflow-hidden border border-gray-300">
             <MapContainer center={center} zoom={13} scrollWheelZoom={true} style={{ height: '100%', width: '100%' }}>
                 <TileLayer
-                    attribution='&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
-                    url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
+                    attribution={import.meta.env.VITE_MAP_ATTRIBUTION}
+                    url={import.meta.env.VITE_MAP_TILE_LAYER}
                 />
                 <LocationMarker onLocationSelect={onLocationSelect} />
                 {(initialLat && initialLng) && <Marker position={[initialLat, initialLng]} />}
diff --git a/marketplace/src/services/apiClient.ts b/marketplace/src/services/apiClient.ts
index 40ff7c3..0eb4920 100644
--- a/marketplace/src/services/apiClient.ts
+++ b/marketplace/src/services/apiClient.ts
@@ -1,7 +1,11 @@
 import axios from 'axios'
 
+// Use VITE_API_URL if set, fallback to /api for local development proxy
+const apiBaseUrl = import.meta.env.VITE_API_URL || '/api'
+console.log('🔗 [apiClient] Using API base URL:', apiBaseUrl)
+
 const instance = axios.create({
-  baseURL: '/api',
+  baseURL: apiBaseUrl,
   timeout: 8000
 })