diff --git a/config/serverless.oblt.logs_essentials.yml b/config/serverless.oblt.logs_essentials.yml
index aec9ece04b877..1793cd3813d74 100644
--- a/config/serverless.oblt.logs_essentials.yml
+++ b/config/serverless.oblt.logs_essentials.yml
@@ -2,4 +2,5 @@
 
 ## Disable xpack plugins
 xpack.infra.enabled: false
-xpack.slo.enabled: false
\ No newline at end of file
+xpack.slo.enabled: false
+xpack.observabilityAIAssistant.enabled: false
diff --git a/src/platform/packages/shared/serverless/settings/observability_project/index.ts b/src/platform/packages/shared/serverless/settings/observability_project/index.ts
index af0e0d955bb51..419f532e3c8f2 100644
--- a/src/platform/packages/shared/serverless/settings/observability_project/index.ts
+++ b/src/platform/packages/shared/serverless/settings/observability_project/index.ts
@@ -22,8 +22,11 @@ export const OBSERVABILITY_PROJECT_SETTINGS = [
   settings.OBSERVABILITY_APM_ENABLE_TABLE_SEARCH_BAR,
   settings.OBSERVABILITY_APM_ENABLE_SERVICE_INVENTORY_TABLE_SEARCH_BAR,
   settings.OBSERVABILITY_ENTITY_CENTRIC_EXPERIENCE,
-  settings.OBSERVABILITY_AI_ASSISTANT_SIMULATED_FUNCTION_CALLING,
-  settings.OBSERVABILITY_AI_ASSISTANT_SEARCH_CONNECTOR_INDEX_PATTERN,
   settings.OBSERVABILITY_LOGS_DATA_ACCESS_LOG_SOURCES_ID,
   settings.OBSERVABILITY_ENABLE_STREAMS_UI,
 ];
+
+export const OBSERVABILITY_AI_ASSISTANT_PROJECT_SETTINGS = [
+  settings.OBSERVABILITY_AI_ASSISTANT_SIMULATED_FUNCTION_CALLING,
+  settings.OBSERVABILITY_AI_ASSISTANT_SEARCH_CONNECTOR_INDEX_PATTERN,
+];
diff --git a/x-pack/platform/plugins/shared/observability_ai_assistant/tsconfig.json b/x-pack/platform/plugins/shared/observability_ai_assistant/tsconfig.json
index 19b3f274a4f7b..f22ff5093521d 100644
--- a/x-pack/platform/plugins/shared/observability_ai_assistant/tsconfig.json
+++ b/x-pack/platform/plugins/shared/observability_ai_assistant/tsconfig.json
@@ -59,7 +59,5 @@
     "@kbn/i18n-react",
     "@kbn/inference-tracing"
   ],
-  "exclude": [
-    "target/**/*"
-  ]
+  "exclude": ["target/**/*"]
 }
diff --git a/x-pack/solutions/observability/plugins/serverless_observability/kibana.jsonc b/x-pack/solutions/observability/plugins/serverless_observability/kibana.jsonc
index d7d2284257874..af2a084279acb 100644
--- a/x-pack/solutions/observability/plugins/serverless_observability/kibana.jsonc
+++ b/x-pack/solutions/observability/plugins/serverless_observability/kibana.jsonc
@@ -1,9 +1,7 @@
 {
   "type": "plugin",
   "id": "@kbn/serverless-observability",
-  "owner": [
-    "@elastic/obs-ux-management-team"
-  ],
+  "owner": ["@elastic/obs-ux-management-team"],
   "group": "observability",
   "visibility": "private",
   "description": "Serverless customizations for observability.",
@@ -11,11 +9,7 @@
     "id": "serverlessObservability",
     "browser": true,
     "server": true,
-    "configPath": [
-      "xpack",
-      "serverless",
-      "observability"
-    ],
+    "configPath": ["xpack", "serverless", "observability"],
     "requiredPlugins": [
       "serverless",
       "observability",
@@ -24,9 +18,7 @@
       "discover",
       "security"
     ],
-    "optionalPlugins": [
-      "streams"
-    ],
+    "optionalPlugins": ["streams", "observabilityAIAssistant"],
     "requiredBundles": []
   }
 }
diff --git a/x-pack/solutions/observability/plugins/serverless_observability/server/plugin.ts b/x-pack/solutions/observability/plugins/serverless_observability/server/plugin.ts
index 973bfde638e8c..0757ddd6093e7 100644
--- a/x-pack/solutions/observability/plugins/serverless_observability/server/plugin.ts
+++ b/x-pack/solutions/observability/plugins/serverless_observability/server/plugin.ts
@@ -7,7 +7,10 @@
 
 import type { PluginInitializerContext, Plugin, CoreSetup } from '@kbn/core/server';
 
-import { OBSERVABILITY_PROJECT_SETTINGS } from '@kbn/serverless-observability-settings';
+import {
+  OBSERVABILITY_PROJECT_SETTINGS,
+  OBSERVABILITY_AI_ASSISTANT_PROJECT_SETTINGS,
+} from '@kbn/serverless-observability-settings';
 import type {
   ServerlessObservabilityPluginSetup,
   ServerlessObservabilityPluginStart,
@@ -27,7 +30,11 @@ export class ServerlessObservabilityPlugin
   constructor(_initializerContext: PluginInitializerContext) {}
 
   public setup(_coreSetup: CoreSetup, pluginsSetup: SetupDependencies) {
-    pluginsSetup.serverless.setupProjectSettings(OBSERVABILITY_PROJECT_SETTINGS);
+    pluginsSetup.serverless.setupProjectSettings([
+      ...OBSERVABILITY_PROJECT_SETTINGS,
+      ...(pluginsSetup.observabilityAIAssistant ? OBSERVABILITY_AI_ASSISTANT_PROJECT_SETTINGS : []),
+    ]);
+
     return {};
   }
 
diff --git a/x-pack/solutions/observability/plugins/serverless_observability/server/types.ts b/x-pack/solutions/observability/plugins/serverless_observability/server/types.ts
index 347415d17c454..203b554145ea9 100644
--- a/x-pack/solutions/observability/plugins/serverless_observability/server/types.ts
+++ b/x-pack/solutions/observability/plugins/serverless_observability/server/types.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { ObservabilityAIAssistantServerSetup } from '@kbn/observability-ai-assistant-plugin/server';
 import { ServerlessPluginSetup } from '@kbn/serverless/server';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
@@ -17,4 +18,5 @@ export interface StartDependencies {}
 
 export interface SetupDependencies {
   serverless: ServerlessPluginSetup;
+  observabilityAIAssistant?: ObservabilityAIAssistantServerSetup;
 }
diff --git a/x-pack/solutions/observability/plugins/serverless_observability/tsconfig.json b/x-pack/solutions/observability/plugins/serverless_observability/tsconfig.json
index d848ab2938e7e..27e616dd4e9d1 100644
--- a/x-pack/solutions/observability/plugins/serverless_observability/tsconfig.json
+++ b/x-pack/solutions/observability/plugins/serverless_observability/tsconfig.json
@@ -28,5 +28,6 @@
     "@kbn/discover-plugin",
     "@kbn/security-plugin",
     "@kbn/streams-plugin",
+    "@kbn/observability-ai-assistant-plugin",
   ]
 }