diff --git a/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte b/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte
index 1b2b4b99a7..39c0972027 100644
--- a/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/ai/AIConfigTile.svelte
@@ -1,5 +1,6 @@
 <script>
   import { Body, Label, Icon } from "@budibase/bbui"
+  import BudibaseLogo from "./logos/Budibase.svelte"
   import OpenAILogo from "./logos/OpenAI.svelte"
   import AnthropicLogo from "./logos/Anthropic.svelte"
   import TogetherAILogo from "./logos/TogetherAI.svelte"
@@ -7,6 +8,7 @@
 
   export let config
   export let disabled
+  export let budibaseAIDefault
 
   export let editHandler
   export let deleteHandler
@@ -16,7 +18,9 @@
 <!-- svelte-ignore a11y-click-events-have-key-events -->
 <div on:click class:disabled class="option">
   <div class="icon">
-    {#if config.provider === Providers.OpenAI.name}
+    {#if config.name === "Budibase AI"}
+      <BudibaseLogo height="30" width="30"/>
+    {:else if config.provider === Providers.OpenAI.name}
       <OpenAILogo height="30" width="30"/>
     {:else if config.provider === Providers.Anthropic.name}
       <AnthropicLogo height="30" width="30"/>
diff --git a/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte b/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte
index cac8f74786..73db61161b 100644
--- a/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/ai/ConfigModal.svelte
@@ -19,7 +19,7 @@
   let validation
 
   $: {
-    const {provider, defaultModel, name, apiKey} = config
+    const { provider, defaultModel, name, apiKey } = config
     validation = provider && defaultModel && name && apiKey
   }
   $: canEditBaseUrl = config.provider && ConfigMap[config.provider].baseUrl === ""
@@ -49,10 +49,6 @@
   title="Custom AI Configuration"
 >
   <div class="form-row">
-    <div class="form-row">
-      <Label size="M">Name</Label>
-      <Input placeholder={"Test 1"} bind:value={config.name}/>
-    </div>
     <Label size="M">Provider</Label>
     <Select
       placeholder={null}
@@ -61,6 +57,10 @@
       on:change={prefillConfig}
     />
   </div>
+  <div class="form-row">
+    <Label size="M">Name</Label>
+    <Input placeholder={"Enter a name"} bind:value={config.name}/>
+  </div>
   <div class="form-row">
     <Label size="M">Default Model</Label>
     {#if config.provider !== Providers.Custom.name}
diff --git a/packages/builder/src/pages/builder/portal/settings/ai/constants.ts b/packages/builder/src/pages/builder/portal/settings/ai/constants.ts
index d0db0d0d9b..f4f93f3114 100644
--- a/packages/builder/src/pages/builder/portal/settings/ai/constants.ts
+++ b/packages/builder/src/pages/builder/portal/settings/ai/constants.ts
@@ -33,24 +33,31 @@ export const Providers = {
   },
   AzureOpenAI: {
     name: "Azure Open AI",
-    models: ["whatever"]
+    models: [
+      "gpt-4o-mini",
+    ]
   },
   Custom: {
     name: "Custom",
-    // TODO: too many - probably need to use an autocomplete for this
-    models: [""]
   },
 }
 
 export const ConfigMap = {
   OpenAI: {
-    baseUrl: "https://api.openai.com"
+    name: "OpenAI",
+    baseUrl: "https://api.openai.com",
   },
   Anthropic: {
-    baseUrl: ""
+    name: "Anthropic",
+    baseUrl: "",
   },
   TogetherAI: {
-    baseUrl: "https://api.together.xyz/v1"
+    name: "TogetherAI",
+    baseUrl: "https://api.together.xyz/v1",
+  },
+  AzureOpenAI: {
+    name: "Azure OpenAI",
+    baseUrl: "",
   },
   Custom: {
     baseUrl: ""
diff --git a/packages/types/src/documents/global/config.ts b/packages/types/src/documents/global/config.ts
index 35caedef63..2b0b97ccc0 100644
--- a/packages/types/src/documents/global/config.ts
+++ b/packages/types/src/documents/global/config.ts
@@ -111,16 +111,16 @@ export interface SCIMInnerConfig {
 
 export interface SCIMConfig extends Config<SCIMInnerConfig> {}
 
+type AIProvider = "OpenAI" | "Anthropic" | "AzureOpenAI" | "Custom"
+
 export interface AIInnerConfig {
   [key: string]: {
-    // TODO: should be enum
-    provider: string
+    provider: AIProvider
     isDefault: boolean
     name: string
     active: boolean
-    baseUrl: string
-    apiKey: string
-    // TODO: should be enum
+    baseUrl?: string
+    apiKey?: string
     defaultModel: string
   }
 }
diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts
index 1b66289f47..087feede3c 100644
--- a/packages/worker/src/api/controllers/global/configs.ts
+++ b/packages/worker/src/api/controllers/global/configs.ts
@@ -320,12 +320,26 @@ function enrichOIDCLogos(oidcLogos: OIDCLogosConfig) {
   )
 }
 
-function sanitizeAIConfig(aiConfig: AIConfig) {
+async function enrichAIConfig(aiConfig: AIConfig) {
+  // Strip out the API Keys from the response so they don't show in the UI
   for (let key in aiConfig.config) {
     if (aiConfig.config[key].apiKey) {
       aiConfig.config[key].apiKey = PASSWORD_REPLACEMENT
     }
   }
+
+  // Return the Budibase AI data source as part of the response if licensing allows
+  const budibaseAIEnabled = await pro.features.isBudibaseAIEnabled()
+  if (budibaseAIEnabled) {
+    aiConfig.config["budibase_ai"] = {
+      provider: "OpenAI",
+      active: true,
+      isDefault: true,
+      defaultModel: env.BUDIBASE_AI_DEFAULT_MODEL,
+      name: "Budibase AI",
+    }
+  }
+
   return aiConfig
 }
 
@@ -341,8 +355,7 @@ export async function find(ctx: UserCtx) {
       }
 
       if (type === ConfigType.AI) {
-        // TODO: do the licensing checks here and return the right things based on the license
-        sanitizeAIConfig(scopedConfig)
+        await enrichAIConfig(scopedConfig)
       }
       ctx.body = scopedConfig
     } else {
diff --git a/packages/worker/src/environment.ts b/packages/worker/src/environment.ts
index ed618f7c71..3a9efd70ce 100644
--- a/packages/worker/src/environment.ts
+++ b/packages/worker/src/environment.ts
@@ -70,6 +70,9 @@ const environment = {
   PASSPORT_OIDCAUTH_FAILURE_REDIRECT:
     process.env.PASSPORT_OIDCAUTH_FAILURE_REDIRECT || "/error",
 
+  // Budibase AI
+  BUDIBASE_AI_API_KEY: process.env.BUDIBASE_AI_API_KEY,
+  BUDIBASE_AI_DEFAULT_MODEL: process.env.BUDIBASE_AI_DEFAULT_MODEL,
   _set(key: any, value: any) {
     process.env[key] = value
     // @ts-ignore