diff --git a/admin-v2/app/layout.tsx b/admin-v2/app/layout.tsx
index 5d3f280..f17fb1d 100644
--- a/admin-v2/app/layout.tsx
+++ b/admin-v2/app/layout.tsx
@@ -5,7 +5,7 @@ import './globals.css'
 const inter = Inter({ subsets: ['latin'] })
 
 export const metadata: Metadata = {
-  title: 'BreakPilot Admin v2',
+  title: 'BreakPilot Admin Lehrer KI',
   description: 'Neues Admin-Frontend mit verbesserter Navigation und Rollen-System',
 }
 
diff --git a/admin-v2/components/layout/Header.tsx b/admin-v2/components/layout/Header.tsx
index 4b8855b..8928e3b 100644
--- a/admin-v2/components/layout/Header.tsx
+++ b/admin-v2/components/layout/Header.tsx
@@ -65,7 +65,7 @@ export function Header({ title, description }: HeaderProps) {
 
         {/* User Area */}
         <div className="flex items-center gap-3">
-          <span className="text-sm text-slate-500">Admin v2</span>
+          <span className="text-sm text-slate-500">Admin Lehrer KI</span>
           <div className="w-8 h-8 rounded-full bg-primary-600 flex items-center justify-center text-white text-sm font-medium">
             A
           </div>
diff --git a/admin-v2/components/layout/Sidebar.tsx b/admin-v2/components/layout/Sidebar.tsx
index 3ea5e25..c41a6b9 100644
--- a/admin-v2/components/layout/Sidebar.tsx
+++ b/admin-v2/components/layout/Sidebar.tsx
@@ -148,7 +148,7 @@ export function Sidebar({ onRoleChange }: SidebarProps) {
       <div className="h-16 flex items-center justify-between px-4 border-b border-slate-700">
         {!collapsed && (
           <Link href="/dashboard" className="font-bold text-lg">
-            Admin v2
+            Admin Lehrer KI
           </Link>
         )}
         <button
diff --git a/admin-v2/lib/navigation.ts b/admin-v2/lib/navigation.ts
index 0107af0..3a7e63b 100644
--- a/admin-v2/lib/navigation.ts
+++ b/admin-v2/lib/navigation.ts
@@ -5,7 +5,7 @@
  * All DSGVO and Compliance modules are now consolidated under the SDK.
  */
 
-export type CategoryId = 'compliance-sdk' | 'ai' | 'infrastructure' | 'education' | 'communication' | 'development' | 'website' | 'sdk-docs'
+export type CategoryId = 'compliance-sdk' | 'ai' | 'education' | 'website' | 'sdk-docs'
 
 export interface NavModule {
   id: string
@@ -162,67 +162,6 @@ export const navigation: NavCategory[] = [
     ],
   },
   // =========================================================================
-  // Infrastruktur & DevOps
-  // =========================================================================
-  {
-    id: 'infrastructure',
-    name: 'Infrastruktur & DevOps',
-    icon: 'server',
-    color: '#f97316', // Orange
-    colorClass: 'infrastructure',
-    description: 'GPU, Security, CI/CD & Monitoring',
-    modules: [
-      {
-        id: 'ci-cd',
-        name: 'CI/CD',
-        href: '/infrastructure/ci-cd',
-        description: 'Pipelines, Deployments & Container',
-        purpose: 'CI/CD Dashboard mit Gitea Actions Pipelines, Deployment-Status und Container-Management.',
-        audience: ['DevOps', 'Entwickler'],
-        subgroup: 'DevOps Pipeline',
-      },
-      {
-        id: 'tests',
-        name: 'Test Dashboard',
-        href: '/infrastructure/tests',
-        description: 'Test-Suites, Coverage & CI/CD',
-        purpose: 'Zentrales Dashboard fuer alle 280+ Tests. Unit (Go, Python), Integration, E2E (Playwright) und BQAS Quality Tests. Aggregiert Tests aus allen Services ohne physische Migration.',
-        audience: ['Entwickler', 'QA', 'DevOps'],
-        subgroup: 'DevOps Pipeline',
-      },
-      {
-        id: 'sbom',
-        name: 'SBOM',
-        href: '/infrastructure/sbom',
-        description: 'Software Bill of Materials',
-        purpose: 'Verwalten Sie alle Software-Abhaengigkeiten und deren Lizenzen.',
-        audience: ['DevOps', 'Compliance'],
-        oldAdminPath: '/admin/sbom',
-        subgroup: 'DevOps Pipeline',
-      },
-      {
-        id: 'security',
-        name: 'Security',
-        href: '/infrastructure/security',
-        description: 'DevSecOps Dashboard & Scans',
-        purpose: 'Security-Scans, Vulnerability-Reports und OWASP-Compliance.',
-        audience: ['DevOps', 'Security'],
-        oldAdminPath: '/admin/security',
-        subgroup: 'DevOps Pipeline',
-      },
-      {
-        id: 'middleware',
-        name: 'Middleware',
-        href: '/infrastructure/middleware',
-        description: 'Middleware Stack & API Gateway',
-        purpose: 'Ueberwachen und testen Sie den Middleware-Stack und API Gateway.',
-        audience: ['DevOps'],
-        oldAdminPath: '/admin/middleware',
-        subgroup: 'Infrastructure',
-      },
-    ],
-  },
-  // =========================================================================
   // Bildung & Schule
   // =========================================================================
   {
@@ -271,103 +210,6 @@ export const navigation: NavCategory[] = [
     ],
   },
   // =========================================================================
-  // Kommunikation & Alerts
-  // =========================================================================
-  {
-    id: 'communication',
-    name: 'Kommunikation & Alerts',
-    icon: 'mail',
-    color: '#22c55e', // Green
-    colorClass: 'communication',
-    description: 'Matrix, E-Mail & Benachrichtigungen',
-    modules: [
-      {
-        id: 'video-chat',
-        name: 'Video & Chat',
-        href: '/communication/video-chat',
-        description: 'Matrix & Jitsi Monitoring',
-        purpose: 'Dashboard fuer Matrix Synapse (E2EE Messaging) und Jitsi Meet (Videokonferenzen). Ueberwachen Sie Service-Status, aktive Meetings, Traffic und SysEleven Ressourcenplanung.',
-        audience: ['Admins', 'DevOps', 'Support'],
-        oldAdminPath: '/admin/communication',
-      },
-      {
-        id: 'matrix',
-        name: 'Voice Service',
-        href: '/communication/matrix',
-        description: 'Voice-First Interface & Architektur',
-        purpose: 'Konfigurieren und testen Sie den Voice-Service (PersonaPlex-7B, TaskOrchestrator). Dokumentation der Voice-First Architektur mit DSGVO-Compliance.',
-        audience: ['Entwickler', 'Admins'],
-        oldAdminPath: '/admin/voice',
-      },
-      {
-        id: 'mail',
-        name: 'Unified Inbox',
-        href: '/communication/mail',
-        description: 'E-Mail-Konten & KI-Analyse',
-        purpose: 'Verwalten Sie E-Mail-Konten und nutzen Sie KI zur Kategorisierung.',
-        audience: ['Support', 'Admins'],
-        oldAdminPath: '/admin/mail',
-      },
-      {
-        id: 'alerts',
-        name: 'Alerts Monitoring',
-        href: '/communication/alerts',
-        description: 'Google Alerts & Feed-Ueberwachung',
-        purpose: 'Ueberwachen Sie Google Alerts und RSS-Feeds fuer relevante Neuigkeiten.',
-        audience: ['Marketing', 'Admins'],
-        oldAdminPath: '/admin/alerts',
-      },
-    ],
-  },
-  // =========================================================================
-  // Entwicklung & Produkte
-  // =========================================================================
-  {
-    id: 'development',
-    name: 'Entwicklung & Produkte',
-    icon: 'code',
-    color: '#64748b', // Slate
-    colorClass: 'development',
-    description: 'Workflow, Game, Docs & Brandbook',
-    modules: [
-      {
-        id: 'workflow',
-        name: 'Dev Workflow',
-        href: '/development/workflow',
-        description: 'Git, CI/CD & Team-Regeln',
-        purpose: 'Entwicklungs-Workflow mit Git, CI/CD Pipeline und Team-Konventionen. Pflichtlektuere fuer alle Entwickler.',
-        audience: ['Entwickler', 'DevOps'],
-      },
-      {
-        id: 'docs',
-        name: 'Developer Docs',
-        href: '/development/docs',
-        description: 'API & Architektur',
-        purpose: 'Durchsuchen Sie die API-Dokumentation und Architektur-Diagramme.',
-        audience: ['Entwickler'],
-        oldAdminPath: '/admin/docs',
-      },
-      {
-        id: 'brandbook',
-        name: 'Brandbook',
-        href: '/development/brandbook',
-        description: 'Corporate Design',
-        purpose: 'Referenz fuer Logos, Farben, Typografie und Design-Richtlinien.',
-        audience: ['Designer', 'Marketing'],
-        oldAdminPath: '/admin/brandbook',
-      },
-      {
-        id: 'screen-flow',
-        name: 'Screen Flow',
-        href: '/development/screen-flow',
-        description: 'UI Screen-Verbindungen',
-        purpose: 'Visualisieren Sie die Navigation und Screen-Verbindungen der App.',
-        audience: ['Designer', 'Entwickler'],
-        oldAdminPath: '/admin/screen-flow',
-      },
-    ],
-  },
-  // =========================================================================
   // Website
   // =========================================================================
   {
diff --git a/admin-v2/lib/roles.ts b/admin-v2/lib/roles.ts
index b0e7f8e..30664e5 100644
--- a/admin-v2/lib/roles.ts
+++ b/admin-v2/lib/roles.ts
@@ -23,7 +23,7 @@ export const roles: Role[] = [
     name: 'Entwickler',
     description: 'Voller Zugriff auf alle Bereiche',
     icon: 'code',
-    visibleCategories: ['compliance-sdk', 'ai', 'infrastructure', 'education', 'communication', 'development', 'website'],
+    visibleCategories: ['compliance-sdk', 'ai', 'education', 'website'],
     color: 'bg-primary-100 border-primary-300 text-primary-700',
   },
   {
@@ -31,7 +31,7 @@ export const roles: Role[] = [
     name: 'Manager',
     description: 'Executive Uebersicht',
     icon: 'chart',
-    visibleCategories: ['compliance-sdk', 'communication', 'website'],
+    visibleCategories: ['compliance-sdk', 'website'],
     color: 'bg-blue-100 border-blue-300 text-blue-700',
   },
   {