diff --git a/packages/app/src/apis.ts b/packages/app/src/apis.ts
index a21ecebb9d..12d3594921 100644
--- a/packages/app/src/apis.ts
+++ b/packages/app/src/apis.ts
@@ -38,6 +38,7 @@ import {
 } from '@roadiehq/backstage-plugin-github-pull-requests';
 
 export const apis = [
+  // TODO(Rugvip): migrate to use /api
   createApiFactory({
     implements: discoveryApiRef,
     deps: { configApi: configApiRef },
diff --git a/packages/core/src/api-wrappers/defaultApis.ts b/packages/core/src/api-wrappers/defaultApis.ts
index 7c471ce25e..82b60d31e6 100644
--- a/packages/core/src/api-wrappers/defaultApis.ts
+++ b/packages/core/src/api-wrappers/defaultApis.ts
@@ -42,9 +42,19 @@ import {
   storageApiRef,
   WebStorage,
   createApiFactory,
+  configApiRef,
+  UrlPatternDiscovery,
 } from '@backstage/core-api';
 
 export const defaultApis = [
+  createApiFactory({
+    implements: discoveryApiRef,
+    deps: { configApi: configApiRef },
+    factory: ({ configApi }) =>
+      UrlPatternDiscovery.compile(
+        `${configApi.getString('backend.baseUrl')}/api/{{ pluginId }}`,
+      ),
+  }),
   createApiFactory(alertApiRef, new AlertApiForwarder()),
   createApiFactory({
     implements: errorApiRef,