diff --git a/Dockerfile.codex-automation b/Dockerfile.codex-automation
deleted file mode 100644
index 3f50ea8..0000000
--- a/Dockerfile.codex-automation
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM node:22-alpine
-
-# Install system dependencies
-RUN apk add --no-cache \
-    bash \
-    git \
-    curl \
-    openssh-client \
-    python3 \
-    py3-pip
-
-# Install Codex CLI globally
-# Requires Node.js 22+ according to their documentation
-RUN npm install -g @openai/codex
-
-# Create workspace directory
-WORKDIR /workspace
-
-# Configure git (default values, will be overridden)
-RUN git config --global user.email "codex-automation@automation.com" && \
-    git config --global user.name "Codex Code Automation" && \
-    git config --global init.defaultBranch main
-
-# Set up environment
-ENV NODE_ENV=production
-
-# Default command
-CMD ["bash"] 
\ No newline at end of file
diff --git a/README.md b/README.md
index 811e8b5..6bc6967 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# Async Code Agent
+# Claude Code UI
 
-Use Claude Code / CodeX CLI to perform multiple tasks in parallel with a Codex-style UI.
+Use Claude Code to perform multiple tasks in parallel with a Claude Code-style UI.
 
-A code agent task management system that provides parallel execution of AI-powered coding tasks. Users can run multiple Claude Code agents simultaneously through a Codex-style web interface, with support for different agents for comparison and evaluation.
+A code agent task management system that provides parallel execution of Claude Code automation tasks. Users can run multiple Claude Code agents simultaneously through a web interface focused on Claude Code integration.
 
 ![async-code-ui](https://github.com/user-attachments/assets/e490c605-681a-4abb-a440-323e15f1a90d)
 
@@ -12,19 +12,18 @@ A code agent task management system that provides parallel execution of AI-power
 
 ## Key Features
 
-- 🤖 **Multi-Agent Support**: Run Claude Code and other AI agents in parallel
+- 🤖 **Claude Code Integration**: Run Claude Code automation tasks in parallel
 - 🔄 **Parallel Task Management**: Execute multiple coding tasks simultaneously  
-- 🌐 **Codex-Style Web UI**: Clean interface for managing agent tasks
-- 🔍 **Agent Comparison**: Compare outputs from different AI models
+- 🌐 **Clean Web UI**: Modern interface for managing Claude Code tasks
 - 🐳 **Containerized Execution**: Secure sandboxed environment for each task
 - 🔗 **Git Integration**: Automatic repository cloning, commits, and PR creation
-- **Selfhost**: Deploy you rown parallel code agent platform.
+- **Selfhost**: Deploy your own parallel code agent platform.
 
 ## Architecture
 
 - **Frontend**: Next.js with TypeScript and TailwindCSS
 - **Backend**: Python Flask API with Docker orchestration
-- **Agents**: Claude Code (Anthropic) with extensible support for other models
+- **Agent**: Claude Code (Anthropic)
 - **Task Management**: Parallel execution system based on container
 
 ## Quick Start
@@ -72,10 +71,9 @@ See `db/README.md` for detailed database setup instructions.
 
 1. **Setup GitHub Token**: Enter your GitHub token in the web interface
 2. **Configure Repository**: Specify target repository and branch
-3. **Select Agent**: Choose your preferred AI agent (Claude Code, etc.)
-4. **Submit Tasks**: Start multiple coding tasks in parallel
-5. **Compare Results**: Review and compare outputs from different agents
-6. **Create PRs**: Generate pull requests from successful tasks
+3. **Submit Tasks**: Start multiple Claude Code tasks in parallel
+4. **Review Results**: Review outputs from Claude Code automation
+5. **Create PRs**: Generate pull requests from successful tasks
 
 ## Environment Variables
 
diff --git a/async-code-web/app/page.tsx b/async-code-web/app/page.tsx
index caa1910..bc7ec4e 100644
--- a/async-code-web/app/page.tsx
+++ b/async-code-web/app/page.tsx
@@ -22,7 +22,6 @@ import { ApiService } from "@/lib/api-service";
 import { SupabaseService } from "@/lib/supabase-service";
 import { Project, Task } from "@/types";
 import { ClaudeIcon } from "@/components/icon/claude";
-import { OpenAIIcon } from "@/components/icon/openai";
 import { toast } from "sonner";
 
 interface TaskWithProject extends Task {
@@ -264,7 +263,6 @@ export default function Home() {
     const getAgentIcon = (agent: string) => {
         switch (agent) {
             case "claude": return <ClaudeIcon className="w-3 h-3" />;
-            case "codex": return <OpenAIIcon className="w-3 h-3" />;
             default: return null;
         }
     };
@@ -297,8 +295,8 @@ export default function Home() {
                                 <Code2 className="w-4 h-4 text-white" />
                             </div>
                             <div>
-                                <h1 className="text-xl font-semibold text-slate-900">Async Code</h1>
-                                <p className="text-sm text-slate-500">Manage parallel AI code agents (Codex & Claude)</p>
+                                <h1 className="text-xl font-semibold text-slate-900">Claude Code UI</h1>
+                                <p className="text-sm text-slate-500">Manage parallel Claude Code automation tasks</p>
                             </div>
                         </div>
                         <div className="flex items-center gap-4">
@@ -462,15 +460,6 @@ export default function Home() {
                                                             </div>
                                                         </div>
                                                     </SelectItem>
-                                                    <SelectItem value="codex">
-                                                        <div className="flex items-center gap-3">
-                                                            <OpenAIIcon className="w-4 h-4 flex-shrink-0" />
-                                                            <div className="flex items-center gap-2">
-                                                                <span className="font-medium">Codex</span>
-                                                                <span className="text-xs text-slate-500">• OpenAI's lightweight coding agent</span>
-                                                            </div>
-                                                        </div>
-                                                    </SelectItem>
                                                 </SelectContent>
                                             </Select>
                                         </div>
diff --git a/async-code-web/app/signin/page.tsx b/async-code-web/app/signin/page.tsx
index c318f93..0bc3e4a 100644
--- a/async-code-web/app/signin/page.tsx
+++ b/async-code-web/app/signin/page.tsx
@@ -40,10 +40,10 @@ export default function SignIn() {
                         <Code2 className="w-6 h-6 text-white" />
                     </div>
                     <h1 className="text-2xl font-bold text-slate-900 mb-2">
-                        Welcome to AI Code Automation
+                        Welcome to Claude Code Automation
                     </h1>
                     <p className="text-slate-600">
-                        Sign in to start automating your code with Claude Code & Codex CLI
+                        Sign in to start automating your code with Claude Code
                     </p>
                 </div>
 
diff --git a/async-code-web/components/code-agent-settings.tsx b/async-code-web/components/code-agent-settings.tsx
index d3e1dfd..78e79ca 100644
--- a/async-code-web/components/code-agent-settings.tsx
+++ b/async-code-web/components/code-agent-settings.tsx
@@ -18,9 +18,6 @@ interface CodeAgentConfig {
         env?: Record<string, string>;
         credentials?: Record<string, any> | null;
     };
-    codex?: {
-        env?: Record<string, string>;
-    };
 }
 
 const DEFAULT_CLAUDE_ENV = {
@@ -32,13 +29,6 @@ const DEFAULT_CLAUDE_CREDENTIALS = {
     // Example structure - user can customize
 };
 
-const DEFAULT_CODEX_ENV = {
-    OPENAI_API_KEY: "",
-    DISABLE_SANDBOX: "yes",
-    CONTINUE_ON_BROWSER: "no",
-    // Add other Codex-specific env vars here if needed
-};
-
 // Helper function to check if credentials is meaningful (not empty/null/undefined)
 const hasMeaningfulCredentials = (creds: any): boolean => {
     if (!creds || creds === null || creds === undefined || creds === '') {
@@ -54,12 +44,10 @@ export function CodeAgentSettings() {
     const { profile, refreshProfile } = useUserProfile();
     const [claudeEnv, setClaudeEnv] = useState("");
     const [claudeCredentials, setClaudeCredentials] = useState("");
-    const [codexEnv, setCodexEnv] = useState("");
     const [isLoading, setIsLoading] = useState(false);
     const [errors, setErrors] = useState<{ 
         claudeEnv?: string; 
         claudeCredentials?: string; 
-        codexEnv?: string; 
     }>({});
 
     // Load settings from profile on mount
@@ -84,28 +72,11 @@ export function CodeAgentSettings() {
                 }
             }
             
-            // Handle backward compatibility for Codex config  
-            let codexConfig: any = {};
-            if (prefs.codex) {
-                // Check if it's the new structure
-                if (prefs.codex.env) {
-                    codexConfig = prefs.codex;
-                } else {
-                    // New structure for codex
-                    codexConfig = { env: prefs.codex };
-                }
-            } else if (prefs.codexCLI) {
-                // Old codexCLI key - migrate to new codex key
-                codexConfig = { env: prefs.codexCLI };
-            }
-            
             setClaudeEnv(JSON.stringify(claudeConfig.env || DEFAULT_CLAUDE_ENV, null, 2));
             setClaudeCredentials(JSON.stringify(claudeConfig.credentials || DEFAULT_CLAUDE_CREDENTIALS, null, 2));
-            setCodexEnv(JSON.stringify(codexConfig.env || DEFAULT_CODEX_ENV, null, 2));
         } else {
             setClaudeEnv(JSON.stringify(DEFAULT_CLAUDE_ENV, null, 2));
             setClaudeCredentials(JSON.stringify(DEFAULT_CLAUDE_CREDENTIALS, null, 2));
-            setCodexEnv(JSON.stringify(DEFAULT_CODEX_ENV, null, 2));
         }
     }, [profile]);
 
@@ -124,9 +95,8 @@ export function CodeAgentSettings() {
         // Validate all JSONs
         const isClaudeEnvValid = validateJSON(claudeEnv, "claudeEnv");
         const isClaudeCredentialsValid = validateJSON(claudeCredentials, "claudeCredentials");
-        const isCodexEnvValid = validateJSON(codexEnv, "codexEnv");
 
-        if (!isClaudeEnvValid || !isClaudeCredentialsValid || !isCodexEnvValid) {
+        if (!isClaudeEnvValid || !isClaudeCredentialsValid) {
             toast.error("Please fix JSON errors before saving");
             return;
         }
@@ -135,23 +105,19 @@ export function CodeAgentSettings() {
         try {
             const claudeEnvConfig = JSON.parse(claudeEnv);
             const claudeCredentialsConfig = JSON.parse(claudeCredentials);
-            const codexEnvConfig = JSON.parse(codexEnv);
 
             const preferences: CodeAgentConfig = {
                 claudeCode: {
                     env: claudeEnvConfig,
                     credentials: hasMeaningfulCredentials(claudeCredentialsConfig) ? claudeCredentialsConfig : null,
                 },
-                codex: {
-                    env: codexEnvConfig,
-                },
             };
 
             // Merge with existing preferences if any
             const existingPrefs = (profile?.preferences || {}) as Record<string, any>;
             
-            // Clean up old keys during migration
-            const { codexCLI, ...cleanedPrefs } = existingPrefs;
+            // Clean up old Codex keys during migration
+            const { codexCLI, codex, ...cleanedPrefs } = existingPrefs;
             
             const mergedPrefs = {
                 ...cleanedPrefs,
@@ -166,7 +132,7 @@ export function CodeAgentSettings() {
                 ? "Claude credentials will be configured" 
                 : "Claude credentials are empty and will be skipped";
             
-            toast.success(`Code agent settings saved successfully. ${credentialsMessage}`);
+            toast.success(`Claude Code settings saved successfully. ${credentialsMessage}`);
         } catch (error) {
             console.error("Failed to save settings:", error);
             toast.error("Failed to save settings");
@@ -179,9 +145,9 @@ export function CodeAgentSettings() {
         <div className="space-y-6">
             <Card>
                 <CardHeader>
-                    <CardTitle>Code Agent Settings</CardTitle>
+                    <CardTitle>Claude Code Settings</CardTitle>
                     <CardDescription>
-                        Configure environment variables and credentials for each code agent. These settings will be used when creating containers.
+                        Configure environment variables and credentials for Claude Code. These settings will be used when creating containers.
                     </CardDescription>
                 </CardHeader>
                 <CardContent className="space-y-8">
@@ -256,51 +222,9 @@ export function CodeAgentSettings() {
                         </div>
                     </div>
 
-                    {/* Codex CLI Settings */}
-                    <div className="space-y-6">
-                        <div className="flex items-center gap-2 pb-2 border-b">
-                            <Settings2 className="w-5 h-5 text-green-600" />
-                            <h3 className="text-lg font-semibold">Codex CLI Configuration</h3>
-                        </div>
-                        
-                        {/* Codex Environment Variables */}
-                        <div className="space-y-2">
-                            <Label htmlFor="codex-env" className="flex items-center gap-2">
-                                <Settings2 className="w-4 h-4" />
-                                Environment Variables
-                            </Label>
-                            <div className="border rounded-lg overflow-hidden">
-                                <CodeMirror
-                                    id="codex-env"
-                                    value={codexEnv}
-                                    height="200px"
-                                    extensions={[javascript({ jsx: false })]}
-                                    theme={githubLight}
-                                    onChange={(value) => {
-                                        setCodexEnv(value);
-                                        validateJSON(value, "codexEnv");
-                                    }}
-                                    placeholder={JSON.stringify(DEFAULT_CODEX_ENV, null, 2)}
-                                />
-                            </div>
-                            {errors.codexEnv && (
-                                <p className="text-sm text-red-500 mt-1">{errors.codexEnv}</p>
-                            )}
-                            <p className="text-sm text-muted-foreground">
-                                Configure environment variables for Codex CLI (@openai/codex)
-                            </p>
-                        </div>
-                        
-                        <div className="p-3 bg-yellow-50 border border-yellow-200 rounded-md">
-                            <p className="text-sm text-yellow-800">
-                                <strong>Note:</strong> Codex CLI does not require separate credentials configuration. All settings are handled via environment variables.
-                            </p>
-                        </div>
-                    </div>
-
                     <Button
                         onClick={handleSave}
-                        disabled={isLoading || !!errors.claudeEnv || !!errors.claudeCredentials || !!errors.codexEnv}
+                        disabled={isLoading || !!errors.claudeEnv || !!errors.claudeCredentials}
                         className="w-full"
                     >
                         <Save className="w-4 h-4 mr-2" />
diff --git a/server/tasks.py b/server/tasks.py
index 1d685f4..67ac2e6 100644
--- a/server/tasks.py
+++ b/server/tasks.py
@@ -35,9 +35,9 @@ def start_task():
         if not all([prompt, repo_url, github_token]):
             return jsonify({'error': 'prompt, repo_url, and github_token are required'}), 400
         
-        # Validate model selection
-        if model not in ['claude', 'codex']:
-            return jsonify({'error': 'model must be either "claude" or "codex"'}), 400
+        # Validate model selection - only claude is supported
+        if model != 'claude':
+            return jsonify({'error': 'model must be "claude"'}), 400
         
         # Create initial chat message
         chat_messages = [{
diff --git a/server/utils/code_task_v2.py b/server/utils/code_task_v2.py
index 9cf4d98..917a300 100644
--- a/server/utils/code_task_v2.py
+++ b/server/utils/code_task_v2.py
@@ -65,7 +65,7 @@ def cleanup_orphaned_containers():
         logger.warning(f"⚠️  Failed to cleanup orphaned containers: {e}")
 
 def run_ai_code_task_v2(task_id: int, user_id: str, github_token: str):
-    """Run AI Code automation (Claude or Codex) in a container - Supabase version"""
+    """Run Claude Code automation in a container - Supabase version"""
     try:
         # Get task from database to check the model type
         task = DatabaseOperations.get_task_by_id(task_id, user_id)
@@ -75,8 +75,16 @@ def run_ai_code_task_v2(task_id: int, user_id: str, github_token: str):
         
         model_cli = task.get('agent', 'claude')
         
-        # With comprehensive sandboxing fixes, both Claude and Codex can now run in parallel
-        logger.info(f"🚀 Running {model_cli.upper()} task {task_id} directly in parallel mode")
+        # Only Claude is supported
+        if model_cli != 'claude':
+            logger.error(f"Unsupported model: {model_cli}. Only Claude is supported.")
+            DatabaseOperations.update_task(task_id, user_id, {
+                'status': 'failed',
+                'error': f'Unsupported model: {model_cli}. Only Claude is supported.'
+            })
+            return
+        
+        logger.info(f"🚀 Running Claude Code task {task_id}")
         return _run_ai_code_task_v2_internal(task_id, user_id, github_token)
             
     except Exception as e:
@@ -90,7 +98,7 @@ def run_ai_code_task_v2(task_id: int, user_id: str, github_token: str):
             logger.error(f"Failed to update task {task_id} status after exception")
 
 def _run_ai_code_task_v2_internal(task_id: int, user_id: str, github_token: str):
-    """Internal implementation of AI Code automation - called directly for Claude or via queue for Codex"""
+    """Internal implementation of Claude Code automation"""
     try:
         # Clean up any orphaned containers before starting new task
         cleanup_orphaned_containers()
@@ -140,7 +148,7 @@ def _run_ai_code_task_v2_internal(task_id: int, user_id: str, github_token: str)
             'DEBIAN_FRONTEND': 'noninteractive',  # Non-interactive package installs
         }
         
-        # Add model-specific API keys and environment variables
+        # Add Claude-specific API keys and environment variables
         model_cli = task.get('agent', 'claude')
         
         # Get user preferences for custom environment variables
@@ -148,95 +156,54 @@ def _run_ai_code_task_v2_internal(task_id: int, user_id: str, github_token: str)
         user_preferences = user.get('preferences', {}) if user else {}
         
         if user_preferences:
-            logger.info(f"🔧 Found user preferences for {model_cli}: {list(user_preferences.keys())}")
-        
-        if model_cli == 'claude':
-            # Start with default Claude environment
-            claude_env = {
-                'ANTHROPIC_API_KEY': os.getenv('ANTHROPIC_API_KEY'),
-                'ANTHROPIC_NONINTERACTIVE': '1'  # Custom flag for Anthropic tools
-            }
-            # Merge with user's custom Claude environment variables
-            claude_config = user_preferences.get('claudeCode', {})
-            if claude_config and claude_config.get('env'):
-                claude_env.update(claude_config['env'])
-            env_vars.update(claude_env)
-        elif model_cli == 'codex':
-            # Start with default Codex environment
-            codex_env = {
-                'OPENAI_API_KEY': os.getenv('OPENAI_API_KEY'),
-                'OPENAI_NONINTERACTIVE': '1',  # Custom flag for OpenAI tools
-                'CODEX_QUIET_MODE': '1',  # Official Codex non-interactive flag
-                'CODEX_UNSAFE_ALLOW_NO_SANDBOX': '1',  # Disable Codex internal sandboxing to prevent Docker conflicts
-                'CODEX_DISABLE_SANDBOX': '1',  # Alternative sandbox disable flag
-                'CODEX_NO_SANDBOX': '1'  # Another potential sandbox disable flag
-            }
-            # Merge with user's custom Codex environment variables
-            codex_config = user_preferences.get('codex', {})
-            if codex_config and codex_config.get('env'):
-                codex_env.update(codex_config['env'])
-            env_vars.update(codex_env)
-        
-        # Use specialized container images based on model
-        if model_cli == 'codex':
-            container_image = 'codex-automation:latest'
-        else:
-            container_image = 'claude-code-automation:latest'
-        
-        # Add staggered start to prevent race conditions with parallel Codex tasks
-        if model_cli == 'codex':
-            # Random delay between 0.5-2 seconds for Codex containers to prevent resource conflicts
-            stagger_delay = random.uniform(0.5, 2.0)
-            logger.info(f"🕐 Adding {stagger_delay:.1f}s staggered start delay for Codex task {task_id}")
-            time.sleep(stagger_delay)
-            
-            # Add file-based locking for Codex to prevent parallel execution conflicts
-            lock_file_path = '/tmp/codex_execution_lock'
-            try:
-                logger.info(f"🔒 Acquiring Codex execution lock for task {task_id}")
-                with open(lock_file_path, 'w') as lock_file:
-                    fcntl.flock(lock_file.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
-                    logger.info(f"✅ Codex execution lock acquired for task {task_id}")
-                    # Continue with container creation while holding the lock
-            except (IOError, OSError) as e:
-                logger.warning(f"⚠️  Could not acquire Codex execution lock for task {task_id}: {e}")
-                # Add additional delay if lock fails
-                additional_delay = random.uniform(1.0, 3.0)
-                logger.info(f"🕐 Adding additional {additional_delay:.1f}s delay due to lock conflict")
-                time.sleep(additional_delay)
+            logger.info(f"🔧 Found user preferences for Claude: {list(user_preferences.keys())}")
+        
+        # Start with default Claude environment
+        claude_env = {
+            'ANTHROPIC_API_KEY': os.getenv('ANTHROPIC_API_KEY'),
+            'ANTHROPIC_NONINTERACTIVE': '1'  # Custom flag for Anthropic tools
+        }
+        # Merge with user's custom Claude environment variables
+        claude_config = user_preferences.get('claudeCode', {})
+        if claude_config and claude_config.get('env'):
+            claude_env.update(claude_config['env'])
+        env_vars.update(claude_env)
+        
+        # Use Claude Code container image
+        container_image = 'claude-code-automation:latest'
+        
         
         # Load Claude credentials from user preferences in Supabase
         credentials_content = ""
         escaped_credentials = ""
-        if model_cli == 'claude':
-            logger.info(f"🔍 Looking for Claude credentials in user preferences for task {task_id}")
-            
-            # Check if user has Claude credentials in their preferences
-            claude_config = user_preferences.get('claudeCode', {})
-            credentials_json = claude_config.get('credentials') if claude_config else None
-            
-            # Check if credentials is meaningful (not empty object, null, undefined, or empty string)
-            has_meaningful_credentials = (
-                credentials_json is not None and 
-                credentials_json != {} and 
-                credentials_json != "" and
-                (isinstance(credentials_json, dict) and len(credentials_json) > 0)
-            )
-            
-            if has_meaningful_credentials:
-                try:
-                    # Convert JSON object to string for writing to container
-                    credentials_content = json.dumps(credentials_json)
-                    logger.info(f"📋 Successfully loaded Claude credentials from user preferences and stringified ({len(credentials_content)} characters) for task {task_id}")
-                    # Escape credentials content for shell
-                    escaped_credentials = credentials_content.replace("'", "'\"'\"'").replace('\n', '\\n')
-                    logger.info(f"📋 Credentials content escaped for shell injection")
-                except Exception as e:
-                    logger.error(f"❌ Failed to process Claude credentials from user preferences: {e}")
-                    credentials_content = ""
-                    escaped_credentials = ""
-            else:
-                logger.info(f"ℹ️  No meaningful Claude credentials found in user preferences for task {task_id} - skipping credentials setup (credentials: {credentials_json})")
+        logger.info(f"🔍 Looking for Claude credentials in user preferences for task {task_id}")
+        
+        # Check if user has Claude credentials in their preferences
+        claude_config = user_preferences.get('claudeCode', {})
+        credentials_json = claude_config.get('credentials') if claude_config else None
+        
+        # Check if credentials is meaningful (not empty object, null, undefined, or empty string)
+        has_meaningful_credentials = (
+            credentials_json is not None and 
+            credentials_json != {} and 
+            credentials_json != "" and
+            (isinstance(credentials_json, dict) and len(credentials_json) > 0)
+        )
+        
+        if has_meaningful_credentials:
+            try:
+                # Convert JSON object to string for writing to container
+                credentials_content = json.dumps(credentials_json)
+                logger.info(f"📋 Successfully loaded Claude credentials from user preferences and stringified ({len(credentials_content)} characters) for task {task_id}")
+                # Escape credentials content for shell
+                escaped_credentials = credentials_content.replace("'", "'\"'\"'").replace('\n', '\\n')
+                logger.info(f"📋 Credentials content escaped for shell injection")
+            except Exception as e:
+                logger.error(f"❌ Failed to process Claude credentials from user preferences: {e}")
+                credentials_content = ""
+                escaped_credentials = ""
+        else:
+            logger.info(f"ℹ️  No meaningful Claude credentials found in user preferences for task {task_id} - skipping credentials setup (credentials: {credentials_json})")
         
         # Create the command to run in container (v2 function)
         container_command = f'''
@@ -254,99 +221,34 @@ def _run_ai_code_task_v2_internal(task_id: int, user_id: str, github_token: str)
 # We'll extract the patch instead of pushing directly
 echo "📋 Will extract changes as patch for later PR creation..."
 
-echo "Starting {model_cli.upper()} Code with prompt..."
+echo "Starting Claude Code with prompt..."
 
 # Create a temporary file with the prompt using heredoc for proper handling
 cat << 'PROMPT_EOF' > /tmp/prompt.txt
 {prompt}
 PROMPT_EOF
 
-# Setup Claude credentials for Claude tasks
-if [ "{model_cli}" = "claude" ]; then
-    echo "Setting up Claude credentials..."
-    
-    # Create ~/.claude directory if it doesn't exist
-    mkdir -p ~/.claude
-    
-    # Write credentials content directly to file
-    if [ ! -z '{escaped_credentials}' ]; then
-        echo "📋 Writing credentials to ~/.claude/.credentials.json"
-        cat << 'CREDENTIALS_EOF' > ~/.claude/.credentials.json
+# Setup Claude credentials
+echo "Setting up Claude credentials..."
+
+# Create ~/.claude directory if it doesn't exist
+mkdir -p ~/.claude
+
+# Write credentials content directly to file
+if [ ! -z '{escaped_credentials}' ]; then
+    echo "📋 Writing credentials to ~/.claude/.credentials.json"
+    cat << 'CREDENTIALS_EOF' > ~/.claude/.credentials.json
 {credentials_content}
 CREDENTIALS_EOF
-        echo "✅ Claude credentials configured"
-    else
-        echo "⚠️  No credentials content available"
-    fi
+    echo "✅ Claude credentials configured"
+else
+    echo "⚠️  No credentials content available"
 fi
 
-# Check which CLI tool to use based on model selection
-if [ "{model_cli}" = "codex" ]; then
-    echo "Using Codex (OpenAI Codex) CLI..."
-    
-    # Set environment variables for non-interactive mode
-    export CODEX_QUIET_MODE=1
-    export CODEX_UNSAFE_ALLOW_NO_SANDBOX=1
-    export CODEX_DISABLE_SANDBOX=1
-    export CODEX_NO_SANDBOX=1
-    
-    # Debug: Verify environment variables are set
-    echo "=== CODEX DEBUG INFO ==="
-    echo "CODEX_QUIET_MODE: $CODEX_QUIET_MODE"
-    echo "CODEX_UNSAFE_ALLOW_NO_SANDBOX: $CODEX_UNSAFE_ALLOW_NO_SANDBOX"
-    echo "OPENAI_API_KEY: $(echo $OPENAI_API_KEY | head -c 8)..."
-    echo "USING OFFICIAL CODEX FLAGS: --approval-mode full-auto --quiet for non-interactive operation"
-    echo "======================="
-    
-    # Read the prompt from file
-    PROMPT_TEXT=$(cat /tmp/prompt.txt)
-    
-    # Check for codex installation
-    if [ -f /usr/local/bin/codex ]; then
-        echo "Found codex at /usr/local/bin/codex"
-        echo "Running Codex in non-interactive mode..."
-        
-        # Use official non-interactive flags for Docker environment
-        # Using --approval-mode full-auto as per official Codex documentation
-        # Also disable Codex's internal sandboxing to prevent conflicts with Docker
-        /usr/local/bin/codex --approval-mode full-auto --quiet "$PROMPT_TEXT"
-        CODEX_EXIT_CODE=$?
-        echo "Codex finished with exit code: $CODEX_EXIT_CODE"
-        
-        if [ $CODEX_EXIT_CODE -ne 0 ]; then
-            echo "ERROR: Codex failed with exit code $CODEX_EXIT_CODE"
-            exit $CODEX_EXIT_CODE
-        fi
-        
-        echo "✅ Codex completed successfully"
-    elif command -v codex >/dev/null 2>&1; then
-        echo "Using codex from PATH..."
-        echo "Running Codex in non-interactive mode..."
-        
-        # Use official non-interactive flags for Docker environment
-        # Using --approval-mode full-auto as per official Codex documentation
-        # Also disable Codex's internal sandboxing to prevent conflicts with Docker
-        codex --approval-mode full-auto --quiet "$PROMPT_TEXT"
-        CODEX_EXIT_CODE=$?
-        echo "Codex finished with exit code: $CODEX_EXIT_CODE"
-        
-        if [ $CODEX_EXIT_CODE -ne 0 ]; then
-            echo "ERROR: Codex failed with exit code $CODEX_EXIT_CODE"
-            exit $CODEX_EXIT_CODE
-        fi
-        
-        echo "✅ Codex completed successfully"
-    else
-        echo "ERROR: codex command not found anywhere"
-        echo "Please ensure Codex CLI is installed in the container"
-        exit 1
-    fi
-    
-else
-    echo "Using Claude CLI..."
-    
-    # Try different ways to invoke claude
-    echo "Checking claude installation..."
+echo "Using Claude CLI..."
+
+# Try different ways to invoke claude
+echo "Checking claude installation..."
 
 if [ -f /usr/local/bin/claude ]; then
     echo "Found claude at /usr/local/bin/claude"
@@ -449,13 +351,11 @@ def _run_ai_code_task_v2_internal(task_id: int, user_id: str, github_token: str)
     which node 2>/dev/null && echo "node: available" || echo "node: not found"
     which sh 2>/dev/null && echo "sh: available" || echo "sh: not found"
     exit 1
-fi
-
-fi  # End of model selection (claude vs codex)
+fi  # End of Claude CLI setup
 
 # Check if there are changes
 if git diff --quiet; then
-    echo "ℹ️  No changes made by {model_cli.upper()} - this is a valid outcome"
+    echo "ℹ️  No changes made by Claude - this is a valid outcome"
     echo "The AI tool ran successfully but decided not to make changes"
     
     # Create empty patch and diff for consistency
@@ -480,7 +380,7 @@ def _run_ai_code_task_v2_internal(task_id: int, user_id: str, github_token: str)
 else
     # Commit changes locally
     git add .
-    git commit -m "{model_cli.capitalize()}: {escaped_prompt[:100]}"
+    git commit -m "Claude: {escaped_prompt[:100]}"
 
     # Get commit info
     COMMIT_HASH=$(git rev-parse HEAD)
@@ -526,7 +426,7 @@ def _run_ai_code_task_v2_internal(task_id: int, user_id: str, github_token: str)
         # Run container with unified AI Code tools (supports both Claude and Codex)
         logger.info(f"🐳 Creating Docker container for task {task_id} using {container_image} (model: {model_name})")
         
-        # Configure Docker security options for Codex compatibility
+        # Configure Docker security options
         container_kwargs = {
             'image': container_image,
             'command': ['bash', '-c', container_command],
@@ -537,26 +437,12 @@ def _run_ai_code_task_v2_internal(task_id: int, user_id: str, github_token: str)
             'network_mode': 'bridge',  # Ensure proper networking
             'tty': False,  # Don't allocate TTY - may prevent clean exit
             'stdin_open': False,  # Don't keep stdin open - may prevent clean exit
-            'name': f'ai-code-task-{task_id}-{int(time.time())}-{uuid.uuid4().hex[:8]}',  # Highly unique container name with UUID
+            'name': f'claude-code-task-{task_id}-{int(time.time())}-{uuid.uuid4().hex[:8]}',  # Highly unique container name with UUID
             'mem_limit': '2g',  # Limit memory usage to prevent resource conflicts
             'cpu_shares': 1024,  # Standard CPU allocation
             'ulimits': [docker.types.Ulimit(name='nofile', soft=1024, hard=2048)]  # File descriptor limits
         }
         
-        # Add essential Docker configuration for Codex compatibility
-        if model_cli == 'codex':
-            logger.warning(f"⚠️  Running Codex with enhanced Docker privileges to bypass seccomp/landlock restrictions")
-            container_kwargs.update({
-                # Essential security options for Codex compatibility
-                'security_opt': [
-                    'seccomp=unconfined',      # Disable seccomp to prevent syscall filtering conflicts
-                    'apparmor=unconfined',     # Disable AppArmor MAC controls
-                    'no-new-privileges=false'  # Allow privilege escalation needed by Codex
-                ],
-                'cap_add': ['ALL'],            # Grant all Linux capabilities
-                'privileged': True,            # Run in fully privileged mode
-                'pid_mode': 'host'            # Share host PID namespace
-            })
         
         # Retry container creation with enhanced conflict handling
         container = None
@@ -572,7 +458,7 @@ def _run_ai_code_task_v2_internal(task_id: int, user_id: str, github_token: str)
                 if "Conflict" in error_msg and "already in use" in error_msg:
                     # Handle container name conflicts by generating a new unique name
                     logger.warning(f"🔄 Container name conflict on attempt {attempt + 1}, generating new name...")
-                    new_name = f'ai-code-task-{task_id}-{int(time.time())}-{uuid.uuid4().hex[:8]}'
+                    new_name = f'claude-code-task-{task_id}-{int(time.time())}-{uuid.uuid4().hex[:8]}'
                     container_kwargs['name'] = new_name
                     logger.info(f"🆔 New container name: {new_name}")
                     # Try to clean up any conflicting containers
diff --git a/test-model-selection.sh b/test-model-selection.sh
old mode 100755
new mode 100644
index 9668a24..fa1fd7b
--- a/test-model-selection.sh
+++ b/test-model-selection.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-echo "Testing Model Selection API..."
+echo "Testing Claude Code Model Selection API..."
 
 # Test Claude model
 echo "Testing Claude Code model..."
@@ -14,18 +14,18 @@ curl -X POST http://localhost:5000/start-task \
     "model": "claude"
   }'
 
-echo -e "\n\nTesting Codex CLI model..."
+echo -e "\n\nTesting invalid model (should fail)..."
 curl -X POST http://localhost:5000/start-task \
   -H "Content-Type: application/json" \
   -d '{
     "prompt": "Add a test comment to README",
     "repo_url": "https://github.com/test/repo",
-    "branch": "main", 
+    "branch": "main",
     "github_token": "test_token",
     "model": "codex"
   }'
 
-echo -e "\n\nTesting invalid model..."
+echo -e "\n\nTesting another invalid model..."
 curl -X POST http://localhost:5000/start-task \
   -H "Content-Type: application/json" \
   -d '{