diff --git a/admin-compliance/app/(sdk)/sdk/academy/page.tsx b/admin-compliance/app/(sdk)/sdk/academy/page.tsx
index b359b1b..8a5b736 100644
--- a/admin-compliance/app/(sdk)/sdk/academy/page.tsx
+++ b/admin-compliance/app/(sdk)/sdk/academy/page.tsx
@@ -125,7 +125,7 @@ function StatCard({
 }
 
 function CourseCard({ course, enrollmentCount }: { course: Course; enrollmentCount: number }) {
-  const categoryInfo = COURSE_CATEGORY_INFO[course.category]
+  const categoryInfo = COURSE_CATEGORY_INFO[course.category] || COURSE_CATEGORY_INFO['custom']
 
   return (
     <Link href={`/sdk/academy/${course.id}`}>
@@ -589,7 +589,7 @@ export default function AcademyPage() {
               />
               <StatCard
                 label="Aktive Teilnehmer"
-                value={statistics.byStatus.in_progress + statistics.byStatus.not_started}
+                value={(statistics.byStatus?.in_progress || 0) + (statistics.byStatus?.not_started || 0)}
                 color="blue"
               />
               <StatCard
diff --git a/docker-compose.yml b/docker-compose.yml
index 35e084c..68fef0a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -54,7 +54,7 @@ services:
       CONSENT_SERVICE_URL: http://bp-core-consent-service:8081
       SDK_URL: http://ai-compliance-sdk:8090
       OLLAMA_URL: ${OLLAMA_URL:-http://host.docker.internal:11434}
-      COMPLIANCE_LLM_MODEL: ${COMPLIANCE_LLM_MODEL:-qwen3:30b-a3b}
+      COMPLIANCE_LLM_MODEL: ${COMPLIANCE_LLM_MODEL:-qwen3.5:35b-a3b}
     extra_hosts:
       - "host.docker.internal:host-gateway"
     depends_on:
@@ -101,7 +101,7 @@ services:
       SESSION_TTL_HOURS: ${SESSION_TTL_HOURS:-24}
       COMPLIANCE_LLM_PROVIDER: ${COMPLIANCE_LLM_PROVIDER:-ollama}
       SELF_HOSTED_LLM_URL: ${SELF_HOSTED_LLM_URL:-http://host.docker.internal:11434}
-      SELF_HOSTED_LLM_MODEL: ${SELF_HOSTED_LLM_MODEL:-qwen3:30b-a3b}
+      SELF_HOSTED_LLM_MODEL: ${SELF_HOSTED_LLM_MODEL:-qwen3.5:35b-a3b}
       COMPLIANCE_LLM_MAX_TOKENS: ${COMPLIANCE_LLM_MAX_TOKENS:-4096}
       COMPLIANCE_LLM_TEMPERATURE: ${COMPLIANCE_LLM_TEMPERATURE:-0.3}
       COMPLIANCE_LLM_TIMEOUT: ${COMPLIANCE_LLM_TIMEOUT:-120}
@@ -139,7 +139,7 @@ services:
       LLM_PROVIDER: ${COMPLIANCE_LLM_PROVIDER:-ollama}
       LLM_FALLBACK_PROVIDER: ${LLM_FALLBACK_PROVIDER:-}
       OLLAMA_URL: ${OLLAMA_URL:-http://host.docker.internal:11434}
-      OLLAMA_DEFAULT_MODEL: ${OLLAMA_DEFAULT_MODEL:-qwen3:30b-a3b}
+      OLLAMA_DEFAULT_MODEL: ${OLLAMA_DEFAULT_MODEL:-qwen3.5:35b-a3b}
       ANTHROPIC_API_KEY: ${ANTHROPIC_API_KEY:-}
       ANTHROPIC_DEFAULT_MODEL: ${ANTHROPIC_DEFAULT_MODEL:-claude-sonnet-4-5-20250929}
       PII_REDACTION_ENABLED: ${PII_REDACTION_ENABLED:-true}