diff --git a/src/backend/src/modules/puterai/ClaudeService.js b/src/backend/src/modules/puterai/ClaudeService.js
index 5de2f36e..d8fbe49b 100644
--- a/src/backend/src/modules/puterai/ClaudeService.js
+++ b/src/backend/src/modules/puterai/ClaudeService.js
@@ -219,9 +219,34 @@ class ClaudeService extends BaseService {
     */
     async models_ () {
         return [
+            {
+                id: 'claude-opus-4-20250514',
+                aliases: ['claude-opus-4', 'claude-opus-4-latest'],
+                name: 'Claude Opus 4',
+                context: 200000,
+                cost: {
+                    currency: 'usd-cents',
+                    tokens: 1_000_000,
+                    input: 1500,
+                    output: 7500,
+                },
+            },
+            {
+                id: 'claude-sonnet-4-20250514',
+                aliases: ['claude-sonnet-4', 'claude-sonnet-4-latest'],
+                name: 'Claude Sonnet 4',
+                context: 200000,
+                cost: {
+                    currency: 'usd-cents',
+                    tokens: 1_000_000,
+                    input: 300,
+                    output: 1500,
+                },
+            },
             {
                 id: 'claude-3-7-sonnet-20250219',
                 aliases: ['claude-3-7-sonnet-latest'],
+                succeeded_by: 'claude-sonnet-4-20250514',
                 context: 200000,
                 cost: {
                     currency: 'usd-cents',
diff --git a/src/puter-js/src/modules/AI.js b/src/puter-js/src/modules/AI.js
index d347833f..cc1cc55c 100644
--- a/src/puter-js/src/modules/AI.js
+++ b/src/puter-js/src/modules/AI.js
@@ -329,11 +329,7 @@ class AI{
         if (!requestParams.model || requestParams.model.startsWith('gpt-')) {
             driver = 'openai-completion';
         }else if(
-            requestParams.model === 'claude-3-haiku-20240307' ||
-            requestParams.model === 'claude-3-5-sonnet-20240620' ||
-            requestParams.model === 'claude-3-5-sonnet-20241022' ||
-            requestParams.model === 'claude-3-5-sonnet-latest' ||
-            requestParams.model === 'claude-3-7-sonnet-latest'
+            requestParams.model.startsWith('claude-')
         ){
             driver = 'claude';
         }else if(requestParams.model === 'meta-llama/Meta-Llama-3.1-8B-Instruct-Turbo' || requestParams.model === 'meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo' || requestParams.model === 'meta-llama/Meta-Llama-3.1-405B-Instruct-Turbo' || requestParams.model === `google/gemma-2-27b-it`){