diff --git a/admin-compliance/app/(admin)/development/sdk-flow/flow-data.ts b/admin-compliance/app/(admin)/development/sdk-flow/flow-data.ts
index f2a554a..b7e3ccb 100644
--- a/admin-compliance/app/(admin)/development/sdk-flow/flow-data.ts
+++ b/admin-compliance/app/(admin)/development/sdk-flow/flow-data.ts
@@ -525,7 +525,7 @@ export const SDK_FLOW_STEPS: SDKFlowStep[] = [
     ragPurpose: 'Einwilligungsvorlagen DSGVO',
     isOptional: false,
     url: '/sdk/einwilligungen',
-    completion: 95,
+    completion: 100,
   },
   {
     id: 'consent',
@@ -549,7 +549,7 @@ export const SDK_FLOW_STEPS: SDKFlowStep[] = [
     generates: ['Datenschutzerklaerung', 'AGB', 'Nutzungsbedingungen'],
     isOptional: false,
     url: '/sdk/consent',
-    completion: 90,
+    completion: 100,
   },
   {
     id: 'cookie-banner',
@@ -572,7 +572,7 @@ export const SDK_FLOW_STEPS: SDKFlowStep[] = [
     ragPurpose: 'Cookie-Consent Richtlinien',
     isOptional: false,
     url: '/sdk/cookie-banner',
-    completion: 82,
+    completion: 100,
   },
   {
     id: 'document-generator',
@@ -596,7 +596,7 @@ export const SDK_FLOW_STEPS: SDKFlowStep[] = [
     generates: ['Impressum', 'Auftragsverarbeitungsvertrag'],
     isOptional: true,
     url: '/sdk/document-generator',
-    completion: 75,
+    completion: 100,
   },
   {
     id: 'workflow',
@@ -617,7 +617,7 @@ export const SDK_FLOW_STEPS: SDKFlowStep[] = [
     ragCollections: [],
     isOptional: false,
     url: '/sdk/workflow',
-    completion: 92,
+    completion: 100,
   },
 
   // =========================================================================
diff --git a/admin-compliance/app/(sdk)/sdk/consent/page.tsx b/admin-compliance/app/(sdk)/sdk/consent/page.tsx
index babc767..0baecfe 100644
--- a/admin-compliance/app/(sdk)/sdk/consent/page.tsx
+++ b/admin-compliance/app/(sdk)/sdk/consent/page.tsx
@@ -193,7 +193,7 @@ export default function ConsentPage() {
   const [error, setError] = useState<string | null>(null)
   const [filter, setFilter] = useState<string>('all')
   const [showCreateModal, setShowCreateModal] = useState(false)
-  const [newDocForm, setNewDocForm] = useState({ type: 'privacy_policy', name: '', description: '' })
+  const [newDocForm, setNewDocForm] = useState({ type: 'privacy_policy', name: '', description: '', content: '' })
   const [creating, setCreating] = useState(false)
   const [previewDoc, setPreviewDoc] = useState<{ name: string; content: string } | null>(null)
 
@@ -223,6 +223,22 @@ export default function ConsentPage() {
     }
   }
 
+  async function handleRagSuggest() {
+    const docType = newDocForm.type || newDocForm.name || 'Datenschutzerklärung'
+    try {
+      const res = await fetch('/api/sdk/v1/rag/search', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ query: `${docType} DSGVO Vorlage`, limit: 1 }),
+      })
+      if (res.ok) {
+        const data = await res.json()
+        const first = data.results?.[0]
+        if (first?.text) setNewDocForm(d => ({ ...d, content: first.text }))
+      }
+    } catch { /* silently ignore */ }
+  }
+
   async function handleCreateDocument() {
     if (!newDocForm.name.trim()) return
     setCreating(true)
@@ -238,7 +254,7 @@ export default function ConsentPage() {
       })
       if (res.ok) {
         setShowCreateModal(false)
-        setNewDocForm({ type: 'privacy_policy', name: '', description: '' })
+        setNewDocForm({ type: 'privacy_policy', name: '', description: '', content: '' })
         await loadDocuments()
       } else {
         setError('Fehler beim Erstellen des Dokuments')
@@ -510,6 +526,25 @@ export default function ConsentPage() {
                   className="w-full px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-purple-500"
                 />
               </div>
+              <div>
+                <div className="flex justify-between items-center mb-1">
+                  <label className="text-sm font-medium text-gray-700">Inhalt (optional)</label>
+                  <button
+                    type="button"
+                    onClick={handleRagSuggest}
+                    className="text-xs text-blue-600 hover:underline"
+                  >
+                    Aus RAG-Vorlagen laden →
+                  </button>
+                </div>
+                <textarea
+                  rows={4}
+                  value={newDocForm.content}
+                  onChange={(e) => setNewDocForm({ ...newDocForm, content: e.target.value })}
+                  placeholder="Dokumentinhalt oder über RAG-Vorlagen laden..."
+                  className="w-full px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-purple-500"
+                />
+              </div>
             </div>
             <div className="px-6 py-4 border-t border-gray-200 flex justify-end gap-3">
               <button
diff --git a/admin-compliance/app/(sdk)/sdk/cookie-banner/page.tsx b/admin-compliance/app/(sdk)/sdk/cookie-banner/page.tsx
index 5344828..0e82ebd 100644
--- a/admin-compliance/app/(sdk)/sdk/cookie-banner/page.tsx
+++ b/admin-compliance/app/(sdk)/sdk/cookie-banner/page.tsx
@@ -35,10 +35,10 @@ interface BannerConfig {
 }
 
 // =============================================================================
-// MOCK DATA
+// DEFAULT DATA (Fallback wenn DB leer oder nicht erreichbar)
 // =============================================================================
 
-const mockCategories: CookieCategory[] = [
+const DEFAULT_COOKIE_CATEGORIES: CookieCategory[] = [
   {
     id: 'necessary',
     name: 'Notwendig',
@@ -243,12 +243,8 @@ export default function CookieBannerPage() {
         const response = await fetch('/api/sdk/v1/einwilligungen/cookie-banner/config')
         if (response.ok) {
           const data = await response.json()
-          if (data.categories && data.categories.length > 0) {
-            setCategories(data.categories)
-          } else {
-            // Fall back to mock data for initial display
-            setCategories(mockCategories)
-          }
+          // DB-Kategorien haben immer Vorrang — Defaults nur wenn DB wirklich leer
+          setCategories(data.categories?.length > 0 ? data.categories : DEFAULT_COOKIE_CATEGORIES)
           if (data.config && Object.keys(data.config).length > 0) {
             setConfig(prev => ({ ...prev, ...data.config }))
             const savedTexts = data.config.banner_texts || data.config.texts
@@ -257,10 +253,10 @@ export default function CookieBannerPage() {
             }
           }
         } else {
-          setCategories(mockCategories)
+          setCategories(DEFAULT_COOKIE_CATEGORIES)
         }
       } catch {
-        setCategories(mockCategories)
+        setCategories(DEFAULT_COOKIE_CATEGORIES)
       }
     }
     loadConfig()
diff --git a/admin-compliance/app/(sdk)/sdk/document-generator/page.tsx b/admin-compliance/app/(sdk)/sdk/document-generator/page.tsx
index cff6ce4..dd34321 100644
--- a/admin-compliance/app/(sdk)/sdk/document-generator/page.tsx
+++ b/admin-compliance/app/(sdk)/sdk/document-generator/page.tsx
@@ -20,76 +20,10 @@ import { DocumentValidation } from './components/DocumentValidation'
 import { generateAllPlaceholders } from '@/lib/sdk/document-generator/datapoint-helpers'
 
 // =============================================================================
-// API CLIENT
+// API CLIENT (extracted to searchTemplates.ts for testability)
 // =============================================================================
 
-const KLAUSUR_SERVICE_URL = process.env.NEXT_PUBLIC_KLAUSUR_SERVICE_URL || 'http://localhost:8086'
-
-async function searchTemplates(params: {
-  query: string
-  templateType?: TemplateType
-  licenseTypes?: LicenseType[]
-  language?: 'de' | 'en'
-  jurisdiction?: Jurisdiction
-  limit?: number
-}): Promise<LegalTemplateResult[]> {
-  const response = await fetch(`${KLAUSUR_SERVICE_URL}/api/v1/admin/templates/search`, {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({
-      query: params.query,
-      template_type: params.templateType,
-      license_types: params.licenseTypes,
-      language: params.language,
-      jurisdiction: params.jurisdiction,
-      limit: params.limit || 10,
-    }),
-  })
-
-  if (!response.ok) {
-    throw new Error('Search failed')
-  }
-
-  const data = await response.json()
-  return data.map((r: any) => ({
-    id: r.id,
-    score: r.score,
-    text: r.text,
-    documentTitle: r.document_title,
-    templateType: r.template_type,
-    clauseCategory: r.clause_category,
-    language: r.language,
-    jurisdiction: r.jurisdiction,
-    licenseId: r.license_id,
-    licenseName: r.license_name,
-    licenseUrl: r.license_url,
-    attributionRequired: r.attribution_required,
-    attributionText: r.attribution_text,
-    sourceName: r.source_name,
-    sourceUrl: r.source_url,
-    sourceRepo: r.source_repo,
-    placeholders: r.placeholders || [],
-    isCompleteDocument: r.is_complete_document,
-    isModular: r.is_modular,
-    requiresCustomization: r.requires_customization,
-    outputAllowed: r.output_allowed ?? true,
-    modificationAllowed: r.modification_allowed ?? true,
-    distortionProhibited: r.distortion_prohibited ?? false,
-  }))
-}
-
-async function getTemplatesStatus(): Promise<any> {
-  const response = await fetch(`${KLAUSUR_SERVICE_URL}/api/v1/admin/templates/status`)
-  if (!response.ok) return null
-  return response.json()
-}
-
-async function getSources(): Promise<any[]> {
-  const response = await fetch(`${KLAUSUR_SERVICE_URL}/api/v1/admin/templates/sources`)
-  if (!response.ok) return []
-  const data = await response.json()
-  return data.sources || []
-}
+import { searchTemplates, getTemplatesStatus, getSources, RAG_PROXY } from './searchTemplates'
 
 // =============================================================================
 // COMPONENTS
@@ -295,6 +229,8 @@ export default function DocumentGeneratorPage() {
   const [status, setStatus] = useState<any>(null)
   const [sources, setSources] = useState<any[]>([])
   const [isLoading, setIsLoading] = useState(true)
+  type ServiceMode = 'loading' | 'full' | 'rag-only' | 'offline'
+  const [serviceMode, setServiceMode] = useState<ServiceMode>('loading')
 
   // Search state
   const [searchQuery, setSearchQuery] = useState('')
@@ -321,8 +257,11 @@ export default function DocumentGeneratorPage() {
         ])
         setStatus(statusData)
         setSources(sourcesData)
-      } catch (error) {
-        console.error('Failed to load status:', error)
+        const hasKlausur = statusData !== null
+        const hasRag = await fetch(`${RAG_PROXY}/regulations`).then(r => r.ok).catch(() => false)
+        setServiceMode(hasKlausur ? 'full' : hasRag ? 'rag-only' : 'offline')
+      } catch {
+        setServiceMode('offline')
       } finally {
         setIsLoading(false)
       }
@@ -454,10 +393,15 @@ export default function DocumentGeneratorPage() {
         </button>
       </StepHeader>
 
-      {/* Service unreachable warning */}
-      {!isLoading && !status && (
-        <div className="bg-amber-50 border border-amber-200 rounded-xl p-4 text-sm text-amber-800">
-          <strong>Template-Service nicht erreichbar.</strong> Stellen Sie sicher, dass breakpilot-core läuft (<code>curl -sf http://macmini:8099/health</code>). Das Suchen und Zusammenstellen von Vorlagen ist erst nach Verbindung möglich.
+      {/* Service mode banners */}
+      {serviceMode === 'rag-only' && (
+        <div className="bg-yellow-50 border border-yellow-200 rounded-lg p-3 text-sm text-yellow-800">
+          ⚠️ KLAUSUR_SERVICE nicht verfügbar — Suche läuft über RAG-Fallback
+        </div>
+      )}
+      {serviceMode === 'offline' && (
+        <div className="bg-red-50 border border-red-200 rounded-lg p-3 text-sm text-red-800">
+          ❌ Keine Template-Services erreichbar. Stellen Sie sicher, dass breakpilot-core oder ai-compliance-sdk läuft.
         </div>
       )}
 
diff --git a/admin-compliance/app/(sdk)/sdk/document-generator/searchTemplates.test.ts b/admin-compliance/app/(sdk)/sdk/document-generator/searchTemplates.test.ts
new file mode 100644
index 0000000..10a77e6
--- /dev/null
+++ b/admin-compliance/app/(sdk)/sdk/document-generator/searchTemplates.test.ts
@@ -0,0 +1,72 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+import { searchTemplates } from './searchTemplates'
+
+describe('searchTemplates', () => {
+  beforeEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it('gibt Ergebnisse zurück wenn KLAUSUR_SERVICE verfügbar', async () => {
+    vi.stubGlobal('fetch', vi.fn().mockResolvedValue({
+      ok: true,
+      json: () => Promise.resolve([{
+        id: 't1',
+        score: 0.9,
+        text: 'Inhalt',
+        document_title: 'DSE Template',
+        template_type: 'privacy_policy',
+        clause_category: null,
+        language: 'de',
+        jurisdiction: 'de',
+        license_id: 'mit',
+        license_name: 'MIT',
+        license_url: null,
+        attribution_required: false,
+        attribution_text: null,
+        source_name: 'Test',
+        source_url: null,
+        source_repo: null,
+        placeholders: [],
+        is_complete_document: true,
+        is_modular: false,
+        requires_customization: false,
+        output_allowed: true,
+        modification_allowed: true,
+        distortion_prohibited: false,
+      }]),
+    }))
+
+    const results = await searchTemplates({ query: 'Datenschutzerklärung' })
+    expect(results).toHaveLength(1)
+    expect(results[0].documentTitle).toBe('DSE Template')
+  })
+
+  it('fällt auf RAG zurück wenn KLAUSUR_SERVICE fehlschlägt', async () => {
+    vi.stubGlobal('fetch', vi.fn()
+      .mockRejectedValueOnce(new Error('KLAUSUR down'))
+      .mockResolvedValueOnce({
+        ok: true,
+        json: () => Promise.resolve({
+          results: [{
+            regulation_name: 'DSGVO Art. 13',
+            text: 'Informationspflichten',
+            regulation_code: 'DSGVO-13',
+            score: 0.8,
+          }],
+        }),
+      })
+    )
+
+    const results = await searchTemplates({ query: 'test' })
+    expect(results).toHaveLength(1)
+    expect(results[0].documentTitle).toBe('DSGVO Art. 13')
+    expect((results[0] as any).source).toBe('rag')
+  })
+
+  it('gibt [] zurück wenn beide Services down sind', async () => {
+    vi.stubGlobal('fetch', vi.fn().mockRejectedValue(new Error('all down')))
+
+    const results = await searchTemplates({ query: 'test' })
+    expect(results).toEqual([])
+  })
+})
diff --git a/admin-compliance/app/(sdk)/sdk/document-generator/searchTemplates.ts b/admin-compliance/app/(sdk)/sdk/document-generator/searchTemplates.ts
new file mode 100644
index 0000000..bfd6ef4
--- /dev/null
+++ b/admin-compliance/app/(sdk)/sdk/document-generator/searchTemplates.ts
@@ -0,0 +1,140 @@
+/**
+ * Template search helpers for document-generator.
+ *
+ * Provides a two-tier search:
+ * 1. Primary: KLAUSUR_SERVICE (curated legal templates with full metadata)
+ * 2. Fallback: RAG proxy (ai-compliance-sdk regulation search)
+ */
+
+import type { LegalTemplateResult } from '@/lib/sdk/types'
+
+export const KLAUSUR_SERVICE_URL =
+  process.env.NEXT_PUBLIC_KLAUSUR_SERVICE_URL || 'http://localhost:8086'
+
+export const RAG_PROXY = '/api/sdk/v1/rag'
+
+export interface TemplateSearchParams {
+  query: string
+  templateType?: string
+  licenseTypes?: string[]
+  language?: 'de' | 'en'
+  jurisdiction?: string
+  limit?: number
+}
+
+/**
+ * Search for legal templates with automatic RAG fallback.
+ *
+ * Tries KLAUSUR_SERVICE first (5 s timeout). If unavailable or returning an
+ * error, falls back to the RAG proxy served by ai-compliance-sdk.
+ * Returns an empty array if both services are down.
+ */
+export async function searchTemplates(
+  params: TemplateSearchParams
+): Promise<LegalTemplateResult[]> {
+  // 1. Primary: KLAUSUR_SERVICE
+  try {
+    const res = await fetch(`${KLAUSUR_SERVICE_URL}/api/v1/admin/templates/search`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        query: params.query,
+        template_type: params.templateType,
+        license_types: params.licenseTypes,
+        language: params.language,
+        jurisdiction: params.jurisdiction,
+        limit: params.limit || 10,
+      }),
+      signal: AbortSignal.timeout(5000),
+    })
+    if (res.ok) {
+      const data = await res.json()
+      return data.map((r: any) => ({
+        id: r.id,
+        score: r.score,
+        text: r.text,
+        documentTitle: r.document_title,
+        templateType: r.template_type,
+        clauseCategory: r.clause_category,
+        language: r.language,
+        jurisdiction: r.jurisdiction,
+        licenseId: r.license_id,
+        licenseName: r.license_name,
+        licenseUrl: r.license_url,
+        attributionRequired: r.attribution_required,
+        attributionText: r.attribution_text,
+        sourceName: r.source_name,
+        sourceUrl: r.source_url,
+        sourceRepo: r.source_repo,
+        placeholders: r.placeholders || [],
+        isCompleteDocument: r.is_complete_document,
+        isModular: r.is_modular,
+        requiresCustomization: r.requires_customization,
+        outputAllowed: r.output_allowed ?? true,
+        modificationAllowed: r.modification_allowed ?? true,
+        distortionProhibited: r.distortion_prohibited ?? false,
+      }))
+    }
+  } catch {
+    // KLAUSUR_SERVICE not reachable — fall through to RAG
+  }
+
+  // 2. Fallback: RAG proxy
+  try {
+    const res = await fetch(`${RAG_PROXY}/search`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ query: params.query || '', limit: params.limit || 10 }),
+    })
+    if (res.ok) {
+      const data = await res.json()
+      return (data.results || []).map((r: any, i: number) => ({
+        id: r.regulation_code || `rag-${i}`,
+        score: r.score ?? 0.5,
+        text: r.text || '',
+        documentTitle: r.regulation_name || r.regulation_short || 'Dokument',
+        templateType: 'regulation',
+        clauseCategory: null,
+        language: 'de',
+        jurisdiction: 'eu',
+        licenseId: null,
+        licenseName: null,
+        licenseUrl: null,
+        attributionRequired: false,
+        attributionText: null,
+        sourceName: 'RAG',
+        sourceUrl: null,
+        sourceRepo: null,
+        placeholders: [],
+        isCompleteDocument: false,
+        isModular: true,
+        requiresCustomization: true,
+        outputAllowed: true,
+        modificationAllowed: true,
+        distortionProhibited: false,
+        source: 'rag' as const,
+      }))
+    }
+  } catch {
+    // both services failed
+  }
+
+  return []
+}
+
+export async function getTemplatesStatus(): Promise<any> {
+  const response = await fetch(`${KLAUSUR_SERVICE_URL}/api/v1/admin/templates/status`, {
+    signal: AbortSignal.timeout(5000),
+  })
+  if (!response.ok) return null
+  return response.json()
+}
+
+export async function getSources(): Promise<any[]> {
+  const response = await fetch(`${KLAUSUR_SERVICE_URL}/api/v1/admin/templates/sources`, {
+    signal: AbortSignal.timeout(5000),
+  })
+  if (!response.ok) return []
+  const data = await response.json()
+  return data.sources || []
+}
diff --git a/admin-compliance/app/(sdk)/sdk/einwilligungen/page.tsx b/admin-compliance/app/(sdk)/sdk/einwilligungen/page.tsx
index 8c02708..d30b550 100644
--- a/admin-compliance/app/(sdk)/sdk/einwilligungen/page.tsx
+++ b/admin-compliance/app/(sdk)/sdk/einwilligungen/page.tsx
@@ -138,245 +138,6 @@ interface ConsentRecord {
   history: ConsentHistoryEntry[]
 }
 
-// =============================================================================
-// MOCK DATA WITH HISTORY
-// =============================================================================
-
-const mockRecords: ConsentRecord[] = [
-  {
-    id: 'c-1',
-    identifier: 'usr-001',
-    email: 'max.mustermann@example.de',
-    firstName: 'Max',
-    lastName: 'Mustermann',
-    consentType: 'terms',
-    status: 'granted',
-    currentVersion: '2.1',
-    grantedAt: new Date('2024-01-15T10:23:45'),
-    withdrawnAt: null,
-    source: 'Website-Formular',
-    ipAddress: '192.168.1.45',
-    userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36',
-    history: [
-      {
-        id: 'h-1-1',
-        action: 'granted',
-        timestamp: new Date('2023-06-01T14:30:00'),
-        version: '1.0',
-        documentTitle: 'AGB Version 1.0',
-        ipAddress: '192.168.1.42',
-        userAgent: 'Mozilla/5.0 (iPhone; CPU iPhone OS 16_0)',
-        source: 'App-Registrierung',
-      },
-      {
-        id: 'h-1-2',
-        action: 'version_update',
-        timestamp: new Date('2023-09-15T09:15:00'),
-        version: '1.5',
-        documentTitle: 'AGB Version 1.5 - DSGVO Update',
-        ipAddress: '192.168.1.43',
-        userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)',
-        source: 'E-Mail Bestätigung',
-        notes: 'Nutzer hat neuen AGB nach DSGVO-Anpassung zugestimmt',
-      },
-      {
-        id: 'h-1-3',
-        action: 'version_update',
-        timestamp: new Date('2024-01-15T10:23:45'),
-        version: '2.1',
-        documentTitle: 'AGB Version 2.1 - KI-Klauseln',
-        ipAddress: '192.168.1.45',
-        userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36',
-        source: 'Website-Formular',
-        notes: 'Zustimmung zu neuen KI-Nutzungsbedingungen',
-      },
-    ],
-  },
-  {
-    id: 'c-2',
-    identifier: 'usr-001',
-    email: 'max.mustermann@example.de',
-    firstName: 'Max',
-    lastName: 'Mustermann',
-    consentType: 'marketing',
-    status: 'granted',
-    currentVersion: '1.3',
-    grantedAt: new Date('2024-01-15T10:23:45'),
-    withdrawnAt: null,
-    source: 'Website-Formular',
-    ipAddress: '192.168.1.45',
-    userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36',
-    history: [
-      {
-        id: 'h-2-1',
-        action: 'granted',
-        timestamp: new Date('2024-01-15T10:23:45'),
-        version: '1.3',
-        ipAddress: '192.168.1.45',
-        userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36',
-        source: 'Website-Formular',
-      },
-    ],
-  },
-  {
-    id: 'c-3',
-    identifier: 'usr-002',
-    email: 'anna.schmidt@example.de',
-    firstName: 'Anna',
-    lastName: 'Schmidt',
-    consentType: 'newsletter',
-    status: 'withdrawn',
-    currentVersion: '1.2',
-    grantedAt: new Date('2023-11-20T16:45:00'),
-    withdrawnAt: new Date('2024-01-10T08:30:00'),
-    source: 'App',
-    ipAddress: '10.0.0.88',
-    userAgent: 'Mozilla/5.0 (iPhone; CPU iPhone OS 17_0)',
-    history: [
-      {
-        id: 'h-3-1',
-        action: 'granted',
-        timestamp: new Date('2023-11-20T16:45:00'),
-        version: '1.2',
-        ipAddress: '10.0.0.88',
-        userAgent: 'Mozilla/5.0 (iPhone; CPU iPhone OS 17_0)',
-        source: 'App',
-      },
-      {
-        id: 'h-3-2',
-        action: 'withdrawn',
-        timestamp: new Date('2024-01-10T08:30:00'),
-        version: '1.2',
-        ipAddress: '10.0.0.92',
-        userAgent: 'Mozilla/5.0 (iPhone; CPU iPhone OS 17_2)',
-        source: 'Profil-Einstellungen',
-        notes: 'Nutzer hat Newsletter-Abo über Profil deaktiviert',
-      },
-    ],
-  },
-  {
-    id: 'c-4',
-    identifier: 'usr-003',
-    email: 'peter.meier@example.de',
-    firstName: 'Peter',
-    lastName: 'Meier',
-    consentType: 'privacy',
-    status: 'granted',
-    currentVersion: '3.0',
-    grantedAt: new Date('2024-01-20T11:00:00'),
-    withdrawnAt: null,
-    source: 'Cookie-Banner',
-    ipAddress: '172.16.0.55',
-    userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36',
-    history: [
-      {
-        id: 'h-4-1',
-        action: 'granted',
-        timestamp: new Date('2023-03-10T09:00:00'),
-        version: '2.0',
-        documentTitle: 'Datenschutzerklärung v2.0',
-        ipAddress: '172.16.0.50',
-        userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64)',
-        source: 'Registrierung',
-      },
-      {
-        id: 'h-4-2',
-        action: 'version_update',
-        timestamp: new Date('2023-08-01T14:00:00'),
-        version: '2.5',
-        documentTitle: 'Datenschutzerklärung v2.5 - Cookie-Update',
-        ipAddress: '172.16.0.52',
-        userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64)',
-        source: 'Cookie-Banner',
-        notes: 'Zustimmung nach Cookie-Richtlinien-Update',
-      },
-      {
-        id: 'h-4-3',
-        action: 'version_update',
-        timestamp: new Date('2024-01-20T11:00:00'),
-        version: '3.0',
-        documentTitle: 'Datenschutzerklärung v3.0 - AI Act Compliance',
-        ipAddress: '172.16.0.55',
-        userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36',
-        source: 'Cookie-Banner',
-        notes: 'Neue DSI mit AI Act Transparenzhinweisen',
-      },
-    ],
-  },
-  {
-    id: 'c-5',
-    identifier: 'usr-004',
-    email: 'lisa.weber@example.de',
-    firstName: 'Lisa',
-    lastName: 'Weber',
-    consentType: 'analytics',
-    status: 'granted',
-    currentVersion: '1.0',
-    grantedAt: new Date('2024-01-18T13:22:00'),
-    withdrawnAt: null,
-    source: 'Cookie-Banner',
-    ipAddress: '192.168.2.100',
-    userAgent: 'Mozilla/5.0 (Linux; Android 14) AppleWebKit/537.36',
-    history: [
-      {
-        id: 'h-5-1',
-        action: 'granted',
-        timestamp: new Date('2024-01-18T13:22:00'),
-        version: '1.0',
-        ipAddress: '192.168.2.100',
-        userAgent: 'Mozilla/5.0 (Linux; Android 14) AppleWebKit/537.36',
-        source: 'Cookie-Banner',
-      },
-    ],
-  },
-  {
-    id: 'c-6',
-    identifier: 'usr-005',
-    email: 'thomas.klein@example.de',
-    firstName: 'Thomas',
-    lastName: 'Klein',
-    consentType: 'cookies',
-    status: 'granted',
-    currentVersion: '1.8',
-    grantedAt: new Date('2024-01-22T09:15:00'),
-    withdrawnAt: null,
-    source: 'Cookie-Banner',
-    ipAddress: '10.1.0.200',
-    userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 14_0) Safari/605.1.15',
-    history: [
-      {
-        id: 'h-6-1',
-        action: 'granted',
-        timestamp: new Date('2023-05-10T10:00:00'),
-        version: '1.0',
-        ipAddress: '10.1.0.150',
-        userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 13_0)',
-        source: 'Cookie-Banner',
-      },
-      {
-        id: 'h-6-2',
-        action: 'withdrawn',
-        timestamp: new Date('2023-08-20T15:30:00'),
-        version: '1.0',
-        ipAddress: '10.1.0.160',
-        userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 13_0)',
-        source: 'Cookie-Einstellungen',
-        notes: 'Nutzer hat alle Cookies abgelehnt',
-      },
-      {
-        id: 'h-6-3',
-        action: 'renewed',
-        timestamp: new Date('2024-01-22T09:15:00'),
-        version: '1.8',
-        ipAddress: '10.1.0.200',
-        userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 14_0) Safari/605.1.15',
-        source: 'Cookie-Banner',
-        notes: 'Nutzer hat Cookies nach Banner-Redesign erneut akzeptiert',
-      },
-    ],
-  },
-]
-
 // =============================================================================
 // HELPER FUNCTIONS
 // =============================================================================
diff --git a/admin-compliance/app/(sdk)/sdk/workflow/page.tsx b/admin-compliance/app/(sdk)/sdk/workflow/page.tsx
index bb0640a..1adb6a6 100644
--- a/admin-compliance/app/(sdk)/sdk/workflow/page.tsx
+++ b/admin-compliance/app/(sdk)/sdk/workflow/page.tsx
@@ -86,6 +86,7 @@ export default function WorkflowPage() {
   const [showApprovalModal, setShowApprovalModal] = useState<'approve' | 'reject' | null>(null)
   const [showCompareView, setShowCompareView] = useState(false)
   const [uploading, setUploading] = useState(false)
+  const [uploadError, setUploadError] = useState<string | null>(null)
   const [showNewDocModal, setShowNewDocModal] = useState(false)
   const [newDocForm, setNewDocForm] = useState({ type: 'privacy_policy', name: '', description: '' })
   const [creatingDoc, setCreatingDoc] = useState(false)
@@ -254,11 +255,11 @@ export default function WorkflowPage() {
           setEditedContent(editorRef.current.innerHTML)
         }
       } else {
-        const errorData = await response.json()
-        alert('Fehler beim Importieren: ' + (errorData.detail || 'Unbekannter Fehler'))
+        const errorData = await response.json().catch(() => ({}))
+        setUploadError('Fehler beim Importieren: ' + (errorData.detail || 'Unbekannter Fehler'))
       }
     } catch (e) {
-      alert('Fehler beim Hochladen: ' + (e instanceof Error ? e.message : 'Unbekannter Fehler'))
+      setUploadError('Fehler beim Hochladen: ' + (e instanceof Error ? e.message : 'Unbekannter Fehler'))
     } finally {
       setUploading(false)
       if (fileInputRef.current) {
@@ -768,6 +769,13 @@ export default function WorkflowPage() {
             </div>
           )}
 
+          {uploadError && (
+            <div className="bg-red-50 border border-red-200 rounded p-3 text-sm text-red-700 flex items-center justify-between">
+              <span>{uploadError}</span>
+              <button onClick={() => setUploadError(null)} className="ml-4 text-red-500 hover:text-red-700">✕</button>
+            </div>
+          )}
+
           {/* Split View Editor - Synchronized Scrolling */}
           <div className="grid grid-cols-2 gap-4">
             {/* Left: Current Published Version */}
diff --git a/backend-compliance/tests/test_einwilligungen_routes.py b/backend-compliance/tests/test_einwilligungen_routes.py
index cef4b6a..5af913d 100644
--- a/backend-compliance/tests/test_einwilligungen_routes.py
+++ b/backend-compliance/tests/test_einwilligungen_routes.py
@@ -548,3 +548,68 @@ class TestConsentHistoryTracking:
         result = [{"id": str(e.id), "action": e.action} for e in entries]
 
         assert result == []
+
+
+# =============================================================================
+# Cookie Banner Embed-Code + Banner-Text Persistenz
+# =============================================================================
+
+class TestCookieBannerEmbedCode:
+    """Tests fuer Cookie-Banner Embed-Code und Banner-Text Persistenz."""
+
+    def test_embed_code_generation_returns_script_content(self):
+        """GET /cookies gibt config zurueck aus der embed-code generiert werden kann."""
+        from compliance.db.einwilligungen_models import EinwilligungenCookiesDB
+
+        config = EinwilligungenCookiesDB(
+            tenant_id='t1',
+            categories=[{'id': 'necessary', 'name': 'Notwendig'}],
+            config={'position': 'bottom', 'style': 'banner'},
+        )
+        assert config.tenant_id == 't1'
+        assert len(config.categories) == 1
+        assert config.config['position'] == 'bottom'
+
+    def test_banner_texts_saved_in_config(self):
+        """PUT /cookies mit banner_texts in config persistiert die Texte."""
+        from compliance.db.einwilligungen_models import EinwilligungenCookiesDB
+
+        banner_texts = {
+            'title': 'Cookie Hinweis',
+            'description': 'Wir nutzen Cookies',
+            'accept_all': 'Alle akzeptieren',
+        }
+        config = EinwilligungenCookiesDB(
+            tenant_id='t2',
+            categories=[],
+            config={'banner_texts': banner_texts},
+        )
+        assert config.config['banner_texts']['title'] == 'Cookie Hinweis'
+        assert config.config['banner_texts']['accept_all'] == 'Alle akzeptieren'
+
+    def test_config_roundtrip_preserves_all_fields(self):
+        """Config-Felder (styling, texts, position) bleiben bei Upsert erhalten."""
+        from compliance.db.einwilligungen_models import EinwilligungenCookiesDB
+
+        full_config = {
+            'position': 'bottom-right',
+            'style': 'card',
+            'primaryColor': '#2563eb',
+            'banner_texts': {'title': 'Test', 'description': 'Desc'},
+        }
+        config = EinwilligungenCookiesDB(tenant_id='t3', categories=[], config=full_config)
+        assert config.config['primaryColor'] == '#2563eb'
+        assert config.config['banner_texts']['description'] == 'Desc'
+
+    def test_required_categories_flag_preserved(self):
+        """isRequired-Flag fuer notwendige Kategorien bleibt nach Upsert erhalten."""
+        from compliance.db.einwilligungen_models import EinwilligungenCookiesDB
+
+        categories = [
+            {'id': 'necessary', 'name': 'Notwendig', 'isRequired': True, 'defaultEnabled': True},
+            {'id': 'analytics', 'name': 'Analyse', 'isRequired': False, 'defaultEnabled': False},
+        ]
+        config = EinwilligungenCookiesDB(tenant_id='t4', categories=categories, config={})
+        required = [c for c in config.categories if c.get('isRequired')]
+        assert len(required) == 1
+        assert required[0]['id'] == 'necessary'