From 2dac444c339f0c8803b6251f8109c28f7184bdc8 Mon Sep 17 00:00:00 2001
From: Gabriel Dugny <gabriel.dugny@believe.com>
Date: Fri, 16 Jan 2026 21:32:12 +0100
Subject: [PATCH] fix: Follow-up of #32345

Signed-off-by: Gabriel Dugny <gabriel.dugny@believe.com>
---
 packages/techdocs-cli-embedded-app/src/App.tsx | 8 +++++---
 packages/techdocs-cli-embedded-app/src/apis.ts | 5 ++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/techdocs-cli-embedded-app/src/App.tsx b/packages/techdocs-cli-embedded-app/src/App.tsx
index 455e92110c..229db3142d 100644
--- a/packages/techdocs-cli-embedded-app/src/App.tsx
+++ b/packages/techdocs-cli-embedded-app/src/App.tsx
@@ -20,7 +20,7 @@ import { createApp } from '@backstage/frontend-defaults';
 import { ConfigReader } from '@backstage/core-app-api';
 import catalogPlugin from '@backstage/plugin-catalog/alpha';
 
-import { apis } from './apis';
+import { appApis, techdocsPluginApis } from './apis';
 import { configLoader } from './config';
 
 import { createFrontendModule } from '@backstage/frontend-plugin-api';
@@ -32,13 +32,15 @@ import {
 
 const appPlugin = createFrontendModule({
   pluginId: 'app',
-  extensions: [...apis, SidebarContent],
+  extensions: [...appApis, SidebarContent],
 });
 
 const app = createApp({
   features: [
     appPlugin,
-    techdocsPlugin,
+    techdocsPlugin.withOverrides({
+      extensions: [...techdocsPluginApis],
+    }),
     catalogPlugin,
     techDocsThemeToggleAddonModule,
     techdocsLiveReloadAddonModule,
diff --git a/packages/techdocs-cli-embedded-app/src/apis.ts b/packages/techdocs-cli-embedded-app/src/apis.ts
index 1b6387938b..d6f7a2df41 100644
--- a/packages/techdocs-cli-embedded-app/src/apis.ts
+++ b/packages/techdocs-cli-embedded-app/src/apis.ts
@@ -157,7 +157,7 @@ class TechDocsDevApi implements TechDocsApi {
   }
 }
 
-export const apis = [
+export const techdocsPluginApis = [
   ApiBlueprint.make({
     name: 'techdocs-dev-storage',
     params: defineParams =>
@@ -194,6 +194,9 @@ export const apis = [
           }),
       }),
   }),
+];
+
+export const appApis = [
   ApiBlueprint.make({
     name: 'scm-integrations',
     params: defineParams =>