diff --git a/components/Gallery.tsx b/components/Gallery.tsx
index c9cfc25..4a4cca7 100644
--- a/components/Gallery.tsx
+++ b/components/Gallery.tsx
@@ -8,6 +8,9 @@ import { Download, Maximize2, Sparkles, Trash2, X, ChevronLeft, ChevronRight, Co
 import { VideoPromptModal } from './VideoPromptModal';
 import { EditPromptModal } from './EditPromptModal';
 
+// FastAPI backend URL
+const API_BASE = process.env.NEXT_PUBLIC_API_URL || 'http://localhost:8000';
+
 // Helper function to get proper image src (handles URLs vs base64)
 const getImageSrc = (data: string): string => {
     if (!data) return '';
@@ -111,7 +114,7 @@ export function Gallery() {
                 }
             } catch (e) { console.error("Cookie merge failed", e); }
 
-            const res = await fetch('/api/meta/video', {
+            const res = await fetch(`${API_BASE}/meta/video`, {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify({
@@ -168,7 +171,7 @@ export function Gallery() {
         setIsGeneratingWhiskVideo(true);
 
         try {
-            const res = await fetch('/api/video/generate', {
+            const res = await fetch(`${API_BASE}/video/generate`, {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify({
@@ -240,7 +243,7 @@ export function Gallery() {
                     }
                 } catch (e) { console.error("Cookie merge failed", e); }
 
-                const res = await fetch('/api/meta/generate', {
+                const res = await fetch(`${API_BASE}/meta/generate`, {
                     method: 'POST',
                     headers: { 'Content-Type': 'application/json' },
                     body: JSON.stringify({
@@ -289,7 +292,7 @@ export function Gallery() {
         }
 
         // First upload the current image as a reference
-        const uploadRes = await fetch('/api/references/upload', {
+        const uploadRes = await fetch(`${API_BASE}/references/upload`, {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify({
@@ -312,7 +315,7 @@ export function Gallery() {
         if (options.keepStyle) refs.style = [uploadData.id];
 
         // Generate new image with references
-        const res = await fetch('/api/generate', {
+        const res = await fetch(`${API_BASE}/generate`, {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify({
diff --git a/components/PromptHero.tsx b/components/PromptHero.tsx
index ad559ce..6d7911e 100644
--- a/components/PromptHero.tsx
+++ b/components/PromptHero.tsx
@@ -5,6 +5,9 @@ import { useStore, ReferenceCategory } from "@/lib/store";
 import { cn } from "@/lib/utils";
 import { Sparkles, Maximize2, X, Hash, AlertTriangle, Upload, Brain, Settings, Settings2 } from "lucide-react";
 
+// FastAPI backend URL
+const API_BASE = process.env.NEXT_PUBLIC_API_URL || 'http://localhost:8000';
+
 const IMAGE_COUNTS = [1, 2, 4];
 
 export function PromptHero() {
@@ -126,7 +129,7 @@ export function PromptHero() {
                 const subjectRef = references.subject?.[0];
                 const imageUrl = subjectRef ? subjectRef.thumbnail : undefined; // Use full data URI from thumbnail property
 
-                res = await fetch('/api/meta/generate', {
+                res = await fetch(`${API_BASE}/meta/generate`, {
                     method: 'POST',
                     headers: { 'Content-Type': 'application/json' },
                     body: JSON.stringify({
@@ -145,7 +148,7 @@ export function PromptHero() {
                     style: references.style?.map(r => r.id) || [],
                 };
 
-                res = await fetch('/api/generate', {
+                res = await fetch(`${API_BASE}/generate`, {
                     method: 'POST',
                     headers: { 'Content-Type': 'application/json' },
                     body: JSON.stringify({
@@ -317,7 +320,7 @@ export function PromptHero() {
                 // If Whisk, upload to backend to get ID
                 if (!settings.provider || settings.provider === 'whisk') {
                     try {
-                        const res = await fetch('/api/references/upload', {
+                        const res = await fetch(`${API_BASE}/references/upload`, {
                             method: 'POST',
                             headers: { 'Content-Type': 'application/json' },
                             body: JSON.stringify({
diff --git a/components/PromptLibrary.tsx b/components/PromptLibrary.tsx
index df0bf45..982e12b 100644
--- a/components/PromptLibrary.tsx
+++ b/components/PromptLibrary.tsx
@@ -7,6 +7,9 @@ import { cn } from '@/lib/utils';
 import { Prompt, PromptCache } from '@/lib/types';
 import { motion, AnimatePresence } from 'framer-motion';
 
+// FastAPI backend URL
+const API_BASE = process.env.NEXT_PUBLIC_API_URL || 'http://localhost:8000';
+
 export function PromptLibrary({ onSelect }: { onSelect?: (prompt: string) => void }) {
     const { setPrompt, settings } = useStore();
     const [prompts, setPrompts] = useState<Prompt[]>([]);
@@ -24,7 +27,7 @@ export function PromptLibrary({ onSelect }: { onSelect?: (prompt: string) => voi
         setLoading(true);
         setError(null);
         try {
-            const res = await fetch('/api/prompts');
+            const res = await fetch(`${API_BASE}/prompts`);
             if (res.ok) {
                 const data: PromptCache = await res.json();
                 setPrompts(data.prompts);
@@ -43,7 +46,7 @@ export function PromptLibrary({ onSelect }: { onSelect?: (prompt: string) => voi
         setLoading(true);
         setError(null);
         try {
-            const syncRes = await fetch('/api/prompts/sync', { method: 'POST' });
+            const syncRes = await fetch(`${API_BASE}/prompts/sync`, { method: 'POST' });
             if (!syncRes.ok) throw new Error('Sync failed');
             await fetchPrompts();
         } catch (error) {
@@ -70,7 +73,7 @@ export function PromptLibrary({ onSelect }: { onSelect?: (prompt: string) => voi
                 try {
                     console.log(`Requesting preview for: ${prompt.title}`);
 
-                    const res = await fetch('/api/prompts/generate', {
+                    const res = await fetch(`${API_BASE}/prompts/generate`, {
                         method: 'POST',
                         headers: { 'Content-Type': 'application/json' },
                         body: JSON.stringify({
@@ -118,7 +121,7 @@ export function PromptLibrary({ onSelect }: { onSelect?: (prompt: string) => voi
 
         // Track usage
         try {
-            await fetch('/api/prompts/use', {
+            await fetch(`${API_BASE}/prompts/use`, {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify({ id: p.id })
diff --git a/components/UploadHistory.tsx b/components/UploadHistory.tsx
index 12d578f..d4622d6 100644
--- a/components/UploadHistory.tsx
+++ b/components/UploadHistory.tsx
@@ -5,6 +5,9 @@ import { useStore, ReferenceCategory } from '@/lib/store';
 import { Clock, Upload, Trash2, CheckCircle, X, Film, Check } from 'lucide-react';
 import { cn } from '@/lib/utils';
 
+// FastAPI backend URL
+const API_BASE = process.env.NEXT_PUBLIC_API_URL || 'http://localhost:8000';
+
 export function UploadHistory() {
     const {
         history, setHistory,
@@ -115,7 +118,7 @@ export function UploadHistory() {
 
                     // Optimistic UI update could happen here
 
-                    const res = await fetch('/api/references/upload', {
+                    const res = await fetch(`${API_BASE}/references/upload`, {
                         method: 'POST',
                         headers: { 'Content-Type': 'application/json' },
                         body: JSON.stringify({