diff --git a/apps/studio/lib/ai/model.utils.test.ts b/apps/studio/lib/ai/model.utils.test.ts
index 8d7af1b987e..b0968dc6ca8 100644
--- a/apps/studio/lib/ai/model.utils.test.ts
+++ b/apps/studio/lib/ai/model.utils.test.ts
@@ -47,7 +47,7 @@ describe('model.utils', () => {
     it('should have openai provider with models', () => {
       expect(PROVIDERS.openai).toBeDefined()
       expect(PROVIDERS.openai.models).toBeDefined()
-      expect(Object.keys(PROVIDERS.openai.models)).toContain('gpt-5.6-luna')
+      expect(Object.keys(PROVIDERS.openai.models)).toContain('gpt-6-luna')
       expect(Object.keys(PROVIDERS.openai.models)).toContain('gpt-5.4-nano')
       expect(Object.keys(PROVIDERS.openai.models)).toContain('gpt-5.3-codex')
     })
@@ -112,36 +112,37 @@ describe('model.utils', () => {
     })
 
     it('defaults should satisfy unions', () => {
-      expect(DEFAULT_ASSISTANT_BASE_MODEL_ID).toBe('gpt-5.6-luna')
+      expect(DEFAULT_ASSISTANT_BASE_MODEL_ID).toBe('gpt-6-luna')
       expect(DEFAULT_ASSISTANT_ADVANCE_MODEL_ID).toBe('gpt-5.3-codex')
       expect(defaultAssistantModelId(false)).toBe(DEFAULT_ASSISTANT_BASE_MODEL_ID)
       expect(defaultAssistantModelId(true)).toBe(DEFAULT_ASSISTANT_BASE_MODEL_ID)
     })
 
     it('isAssistantBaseModelId / isAdvanceOnlyModelId', () => {
-      expect(isAssistantBaseModelId('gpt-5.6-luna')).toBe(true)
+      expect(isAssistantBaseModelId('gpt-6-luna')).toBe(true)
       expect(isAssistantBaseModelId('gpt-5.4-nano')).toBe(true)
       expect(isAssistantBaseModelId('gpt-5.3-codex')).toBe(false)
       expect(isAdvanceOnlyModelId('gpt-5.3-codex')).toBe(true)
       expect(isAdvanceOnlyModelId('gpt-5.4-nano')).toBe(false)
-      expect(isAdvanceOnlyModelId('gpt-5.6-luna')).toBe(false)
+      expect(isAdvanceOnlyModelId('gpt-6-luna')).toBe(false)
     })
 
     it('isKnownAssistantModelId', () => {
-      expect(isKnownAssistantModelId('gpt-5.6-luna')).toBe(true)
+      expect(isKnownAssistantModelId('gpt-6-luna')).toBe(true)
       expect(isKnownAssistantModelId('gpt-5.4-nano')).toBe(true)
       expect(isKnownAssistantModelId('gpt-5.3-codex')).toBe(true)
+      expect(isKnownAssistantModelId('gpt-5.6-luna')).toBe(false)
       expect(isKnownAssistantModelId('gpt-5')).toBe(false)
       expect(isKnownAssistantModelId('gpt-5-mini')).toBe(false)
       expect(isKnownAssistantModelId('unknown')).toBe(false)
     })
 
     it('getAssistantModelEntry returns config for known ids', () => {
-      expect(getAssistantModelEntry('gpt-5.6-luna').reasoningEffort).toBe('medium')
+      expect(getAssistantModelEntry('gpt-6-luna').reasoningEffort).toBe('medium')
       expect(getAssistantModelEntry('gpt-5.4-nano').reasoningEffort).toBe('low')
       expect(getAssistantModelEntry('gpt-5.3-codex').reasoningEffort).toBe('low')
-      expect(getAssistantModelEntry('gpt-5.6-luna')).toEqual(
-        ASSISTANT_MODELS.find((m) => m.id === 'gpt-5.6-luna')
+      expect(getAssistantModelEntry('gpt-6-luna')).toEqual(
+        ASSISTANT_MODELS.find((m) => m.id === 'gpt-6-luna')
       )
     })
 
@@ -152,12 +153,12 @@ describe('model.utils', () => {
 
     it('openaiModelEntry enforces valid reasoning effort at compile time', () => {
       const withEffort = openaiModelEntry({
-        id: 'gpt-5.6-luna',
+        id: 'gpt-6-luna',
         reasoningEffort: 'low',
       })
       expect(withEffort.reasoningEffort).toBe('low')
 
-      const withoutEffort = openaiModelEntry({ id: 'gpt-5.6-luna' })
+      const withoutEffort = openaiModelEntry({ id: 'gpt-6-luna' })
       expect(withoutEffort.reasoningEffort).toBeUndefined()
     })
   })
diff --git a/apps/studio/lib/ai/model.utils.ts b/apps/studio/lib/ai/model.utils.ts
index ef83acc60b2..17474d7c250 100644
--- a/apps/studio/lib/ai/model.utils.ts
+++ b/apps/studio/lib/ai/model.utils.ts
@@ -2,7 +2,7 @@ export type ProviderName = 'bedrock' | 'openai'
 
 export type BedrockModel = 'anthropic.claude-3-7-sonnet-20250219-v1:0' | 'openai.gpt-oss-120b-1:0'
 
-export type OpenAIModelId = 'gpt-5.4-nano' | 'gpt-5.3-codex' | 'gpt-5.6-luna'
+export type OpenAIModelId = 'gpt-5.4-nano' | 'gpt-5.3-codex' | 'gpt-6-luna'
 
 // Source: https://developers.openai.com/api/docs/guides/reasoning + per-model pages
 export type ReasoningEffort = 'none' | 'minimal' | 'low' | 'medium' | 'high' | 'xhigh' | 'max'
@@ -10,11 +10,11 @@ export type ReasoningEffort = 'none' | 'minimal' | 'low' | 'medium' | 'high' | '
 // Per-model reasoning effort compatibility.
 // Sources: https://developers.openai.com/api/docs/models/gpt-5.4-nano
 //          https://developers.openai.com/api/docs/models/gpt-5.3-codex
-//          https://developers.openai.com/api/docs/models/gpt-5.6-luna
+//          https://developers.openai.com/api/docs/models/gpt-6-luna
 type ModelReasoningSupport = {
   'gpt-5.4-nano': 'none' | 'low' | 'medium' | 'high' | 'xhigh'
   'gpt-5.3-codex': 'low' | 'medium' | 'high' | 'xhigh'
-  'gpt-5.6-luna': 'none' | 'low' | 'medium' | 'high' | 'xhigh' | 'max'
+  'gpt-6-luna': 'none' | 'low' | 'medium' | 'high' | 'xhigh' | 'max'
 }
 
 type ReasoningEffortFor<ModelId extends OpenAIModelId> = ModelId extends keyof ModelReasoningSupport
@@ -62,7 +62,7 @@ export const LOGS_REWRITE_MODEL = openaiModelEntry({
 // Models with requiresAdvanceModelEntitlement false are available to all users; true requires the assistant.advance_model entitlement.
 export const ASSISTANT_MODELS = [
   openaiModelEntry({
-    id: 'gpt-5.6-luna',
+    id: 'gpt-6-luna',
     requiresAdvanceModelEntitlement: false,
     reasoningEffort: 'medium',
   }),
@@ -89,7 +89,7 @@ const ASSISTANT_MODELS_MAP = Object.fromEntries(ASSISTANT_MODELS.map((m) => [m.i
   (typeof ASSISTANT_MODELS)[number]
 >
 
-export const DEFAULT_ASSISTANT_BASE_MODEL_ID = 'gpt-5.6-luna' satisfies AssistantBaseModelId
+export const DEFAULT_ASSISTANT_BASE_MODEL_ID = 'gpt-6-luna' satisfies AssistantBaseModelId
 
 export const DEFAULT_ASSISTANT_ADVANCE_MODEL_ID = 'gpt-5.3-codex' satisfies AssistantModelId
 
@@ -158,7 +158,7 @@ export const PROVIDERS: ProviderRegistry = {
   },
   openai: {
     models: {
-      'gpt-5.6-luna': { default: false },
+      'gpt-6-luna': { default: false },
       'gpt-5.3-codex': { default: false },
       'gpt-5.4-nano': { default: true },
     },