diff --git a/install.sh b/install.sh
index 774e5fb..ca52737 100755
--- a/install.sh
+++ b/install.sh
@@ -111,7 +111,7 @@ update_env() {
 if [ "$HAS_NVIDIA" = true ]; then
     update_env "WHISPER_IMAGE" "fedirz/faster-whisper-server:latest-cuda"
     update_env "WHISPER_DEVICE" "cuda"
-    update_env "LOCAL_LLM_MODEL" "llama3:8b"
+    update_env "LOCAL_LLM_MODEL" "llama3.2:1b"
     # Uncomment GPU deploy section in docker-compose.yml while preserving indentation
     sed -i 's/^    #deploy:/    deploy:/' docker-compose.yml
     sed -i 's/^    #  resources:/      resources:/' docker-compose.yml
@@ -163,7 +163,7 @@ fi
 
 until curl -s http://localhost:11434/api/tags &> /dev/null; do sleep 2; done
 if [ "$HAS_NVIDIA" = true ]; then
-    ollama pull llama3:8b
+    ollama pull llama3.2:1b
 else
     ollama pull phi3:mini
 fi
diff --git a/services/cms-service/src/handlers.rs b/services/cms-service/src/handlers.rs
index 7ac8f71..927c535 100644
--- a/services/cms-service/src/handlers.rs
+++ b/services/cms-service/src/handlers.rs
@@ -2473,7 +2473,7 @@ pub async fn get_all_users(
     }
 
     let users = sqlx::query_as::<_, UserResponse>(
-        "SELECT id, email, full_name, role, organization_id FROM users WHERE organization_id = $1",
+        "SELECT id, email, full_name, role, organization_id, xp, level, avatar_url, bio, language FROM users WHERE organization_id = $1",
     )
     .bind(org_ctx.id)
     .fetch_all(&pool)
@@ -2897,27 +2897,25 @@ pub async fn generate_course(
         )
     };
 
-    let system_prompt = r#"You are an expert curriculum designer. 
-Design a structured course based on the topic provided. 
-If the topic is for children or youth, use interactive content types:
-- 'hotspot': Identifying image parts.
-- 'memory-match': Card matching game.
-- 'quiz': Standard questions.
-
-Return ONLY a valid JSON object with the following structure:
+    let system_prompt = r#"You are a curriculum expert. 
+Generate a course in JSON.
+Structure:
 {
-  "title": "Clear and Engaging Course Title",
-  "description": "Short overview and objectives",
+  "title": "Course Title",
+  "description": "Description",
   "modules": [
     {
-      "title": "Module Name",
-      "position": 1,
+      "title": "Module Title",
       "lessons": [
-        { "title": "Lesson Name", "position": 1, "content_type": "text|video|hotspot|memory-match|quiz" }
+        { "title": "Lesson Title", "content_type": "text" }
       ]
     }
   ]
-}"#;
+}
+RULES:
+1. content_type MUST be one of: text, video, quiz.
+2. NO nested lessons.
+3. Return ONLY the JSON object."#;
 
     let mut request = client.post(&url).json(&json!({
         "model": model,
@@ -2925,7 +2923,8 @@ Return ONLY a valid JSON object with the following structure:
             { "role": "system", "content": system_prompt },
             { "role": "user", "content": format!("Create a course about: {}", payload.prompt) }
         ],
-        "response_format": { "type": "json_object" }
+        "response_format": { "type": "json_object" },
+        "temperature": 0.1
     }));
 
     if !auth_header.is_empty() {