diff --git a/packages/atlas-service/src/util.ts b/packages/atlas-service/src/util.ts
index 0e4590ead17..5d505d0af7f 100644
--- a/packages/atlas-service/src/util.ts
+++ b/packages/atlas-service/src/util.ts
@@ -143,7 +143,7 @@ const config = {
       issuer: 'https://auth-qa.mongodb.com/oauth2/default',
     },
     authPortalUrl: 'https://account-dev.mongodb.com/account/login',
-    assistantApiBaseUrl: 'https://knowledge.staging.corp.mongodb.com/api/v1',
+    assistantApiBaseUrl: 'https://knowledge.mongodb.com/api/v1',
   },
   'atlas-dev': {
     ccsBaseUrl: '',
@@ -154,7 +154,7 @@ const config = {
       issuer: 'https://auth-qa.mongodb.com/oauth2/default',
     },
     authPortalUrl: 'https://account-dev.mongodb.com/account/login',
-    assistantApiBaseUrl: 'https://knowledge.staging.corp.mongodb.com/api/v1',
+    assistantApiBaseUrl: 'https://knowledge.mongodb.com/api/v1',
   },
   'atlas-qa': {
     ccsBaseUrl: '',
@@ -165,7 +165,7 @@ const config = {
       issuer: 'https://auth-qa.mongodb.com/oauth2/default',
     },
     authPortalUrl: 'https://account-qa.mongodb.com/account/login',
-    assistantApiBaseUrl: 'https://knowledge.staging.corp.mongodb.com/api/v1',
+    assistantApiBaseUrl: 'https://knowledge.mongodb.com/api/v1',
   },
   atlas: {
     ccsBaseUrl: '',
@@ -176,7 +176,7 @@ const config = {
       issuer: 'https://auth.mongodb.com/oauth2/default',
     },
     authPortalUrl: 'https://account.mongodb.com/account/login',
-    assistantApiBaseUrl: 'https://knowledge.staging.corp.mongodb.com/api/v1',
+    assistantApiBaseUrl: 'https://knowledge.mongodb.com/api/v1',
   },
   'web-sandbox-atlas-local': {
     ccsBaseUrl: '/ccs',
@@ -187,7 +187,7 @@ const config = {
       issuer: 'https://auth-qa.mongodb.com/oauth2/default',
     },
     authPortalUrl: 'https://account-dev.mongodb.com/account/login',
-    assistantApiBaseUrl: 'https://knowledge.staging.corp.mongodb.com/api/v1',
+    assistantApiBaseUrl: 'https://knowledge.mongodb.com/api/v1',
   },
   'web-sandbox-atlas-dev': {
     ccsBaseUrl: '/ccs',
@@ -198,7 +198,7 @@ const config = {
       issuer: 'https://auth-qa.mongodb.com/oauth2/default',
     },
     authPortalUrl: 'https://account-dev.mongodb.com/account/login',
-    assistantApiBaseUrl: 'https://knowledge.staging.corp.mongodb.com/api/v1',
+    assistantApiBaseUrl: 'https://knowledge.mongodb.com/api/v1',
   },
   'web-sandbox-atlas-qa': {
     ccsBaseUrl: '/ccs',
@@ -209,7 +209,7 @@ const config = {
       issuer: 'https://auth-qa.mongodb.com/oauth2/default',
     },
     authPortalUrl: 'https://account-dev.mongodb.com/account/login',
-    assistantApiBaseUrl: 'https://knowledge.staging.corp.mongodb.com/api/v1',
+    assistantApiBaseUrl: 'https://knowledge.mongodb.com/api/v1',
   },
   'web-sandbox-atlas': {
     ccsBaseUrl: '/ccs',
@@ -220,7 +220,7 @@ const config = {
       issuer: 'https://auth.mongodb.com/oauth2/default',
     },
     authPortalUrl: 'https://account.mongodb.com/account/login',
-    assistantApiBaseUrl: 'https://knowledge.staging.corp.mongodb.com/api/v1',
+    assistantApiBaseUrl: 'https://knowledge.mongodb.com/api/v1',
   },
 } as const;
 
diff --git a/packages/compass-assistant/test/assistant.eval.ts b/packages/compass-assistant/test/assistant.eval.ts
index 8ef4a340426..7be232006dc 100644
--- a/packages/compass-assistant/test/assistant.eval.ts
+++ b/packages/compass-assistant/test/assistant.eval.ts
@@ -103,7 +103,7 @@ async function makeAssistantCall(
   const openai = createOpenAI({
     baseURL:
       process.env.COMPASS_ASSISTANT_BASE_URL_OVERRIDE ??
-      'https://knowledge.staging.corp.mongodb.com/api/v1',
+      'https://knowledge.mongodb.com/api/v1',
     apiKey: '',
     headers: {
       'User-Agent': 'mongodb-compass/x.x.x',
diff --git a/packages/compass/src/app/utils/csp.ts b/packages/compass/src/app/utils/csp.ts
index 0b76da8dfa3..cc653534016 100644
--- a/packages/compass/src/app/utils/csp.ts
+++ b/packages/compass/src/app/utils/csp.ts
@@ -57,7 +57,7 @@ const defaultCSP = {
     'https://compass.mongodb.com',
     'https://ip-ranges.amazonaws.com',
     'https://knowledge.staging.corp.mongodb.com',
-    'https://knowledge.corp.mongodb.com',
+    'https://knowledge.mongodb.com',
   ],
   'child-src': [
     'blob:',