diff --git a/packages/frontend-plugin-api/api-report.md b/packages/frontend-plugin-api/api-report.md
index 951922447d..f1537fd5b7 100644
--- a/packages/frontend-plugin-api/api-report.md
+++ b/packages/frontend-plugin-api/api-report.md
@@ -5,80 +5,76 @@
 ```ts
 /// <reference types="react" />
 
-import { AlertApi } from '../../../../core-plugin-api';
-import { alertApiRef } from '../../../../core-plugin-api';
-import { AlertMessage } from '../../../../core-plugin-api';
-import { AnyApiFactory } from '../../../../core-plugin-api';
-import { AnyApiFactory as AnyApiFactory_2 } from '@backstage/core-plugin-api';
-import { AnyApiRef } from '../../../../core-plugin-api';
-import { AnyApiRef as AnyApiRef_2 } from '@backstage/core-plugin-api';
-import { ApiFactory } from '../../../../core-plugin-api';
-import { ApiHolder } from '../../../../core-plugin-api';
-import { ApiRef } from '../../../../core-plugin-api';
-import { ApiRef as ApiRef_2 } from '@backstage/core-plugin-api';
-import { ApiRefConfig } from '../../../../core-plugin-api';
-import { AppTheme } from '../../../../core-plugin-api';
-import { AppTheme as AppTheme_2 } from '@backstage/core-plugin-api';
-import { AppThemeApi } from '../../../../core-plugin-api';
-import { appThemeApiRef } from '../../../../core-plugin-api';
-import { atlassianAuthApiRef } from '../../../../core-plugin-api';
-import { AuthProviderInfo } from '../../../../core-plugin-api';
-import { AuthRequestOptions } from '../../../../core-plugin-api';
-import { BackstageIdentityApi } from '../../../../core-plugin-api';
-import { BackstageIdentityResponse } from '../../../../core-plugin-api';
-import { BackstageUserIdentity } from '../../../../core-plugin-api';
-import { bitbucketAuthApiRef } from '../../../../core-plugin-api';
-import { bitbucketServerAuthApiRef } from '../../../../core-plugin-api';
+import { AlertApi } from '@backstage/core-plugin-api';
+import { alertApiRef } from '@backstage/core-plugin-api';
+import { AlertMessage } from '@backstage/core-plugin-api';
+import { AnyApiFactory } from '@backstage/core-plugin-api';
+import { AnyApiRef } from '@backstage/core-plugin-api';
+import { ApiFactory } from '@backstage/core-plugin-api';
+import { ApiHolder } from '@backstage/core-plugin-api';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { ApiRefConfig } from '@backstage/core-plugin-api';
+import { AppTheme } from '@backstage/core-plugin-api';
+import { AppThemeApi } from '@backstage/core-plugin-api';
+import { appThemeApiRef } from '@backstage/core-plugin-api';
+import { atlassianAuthApiRef } from '@backstage/core-plugin-api';
+import { AuthProviderInfo } from '@backstage/core-plugin-api';
+import { AuthRequestOptions } from '@backstage/core-plugin-api';
+import { BackstageIdentityApi } from '@backstage/core-plugin-api';
+import { BackstageIdentityResponse } from '@backstage/core-plugin-api';
+import { BackstageUserIdentity } from '@backstage/core-plugin-api';
+import { bitbucketAuthApiRef } from '@backstage/core-plugin-api';
+import { bitbucketServerAuthApiRef } from '@backstage/core-plugin-api';
 import { ComponentType } from 'react';
-import { ConfigApi } from '../../../../core-plugin-api';
-import { configApiRef } from '../../../../core-plugin-api';
-import { createApiFactory } from '../../../../core-plugin-api';
-import { createApiRef } from '../../../../core-plugin-api';
-import { DiscoveryApi } from '../../../../core-plugin-api';
-import { discoveryApiRef } from '../../../../core-plugin-api';
-import { ErrorApi } from '../../../../core-plugin-api';
-import { ErrorApiError } from '../../../../core-plugin-api';
-import { ErrorApiErrorContext } from '../../../../core-plugin-api';
-import { errorApiRef } from '../../../../core-plugin-api';
-import { FeatureFlag } from '../../../../core-plugin-api';
-import { FeatureFlagsApi } from '../../../../core-plugin-api';
-import { featureFlagsApiRef } from '../../../../core-plugin-api';
-import { FeatureFlagsSaveOptions } from '../../../../core-plugin-api';
-import { FeatureFlagState } from '../../../../core-plugin-api';
-import { FetchApi } from '../../../../core-plugin-api';
-import { fetchApiRef } from '../../../../core-plugin-api';
-import { githubAuthApiRef } from '../../../../core-plugin-api';
-import { gitlabAuthApiRef } from '../../../../core-plugin-api';
-import { googleAuthApiRef } from '../../../../core-plugin-api';
+import { ConfigApi } from '@backstage/core-plugin-api';
+import { configApiRef } from '@backstage/core-plugin-api';
+import { createApiFactory } from '@backstage/core-plugin-api';
+import { createApiRef } from '@backstage/core-plugin-api';
+import { DiscoveryApi } from '@backstage/core-plugin-api';
+import { discoveryApiRef } from '@backstage/core-plugin-api';
+import { ErrorApi } from '@backstage/core-plugin-api';
+import { ErrorApiError } from '@backstage/core-plugin-api';
+import { ErrorApiErrorContext } from '@backstage/core-plugin-api';
+import { errorApiRef } from '@backstage/core-plugin-api';
+import { FeatureFlag } from '@backstage/core-plugin-api';
+import { FeatureFlagsApi } from '@backstage/core-plugin-api';
+import { featureFlagsApiRef } from '@backstage/core-plugin-api';
+import { FeatureFlagsSaveOptions } from '@backstage/core-plugin-api';
+import { FeatureFlagState } from '@backstage/core-plugin-api';
+import { FetchApi } from '@backstage/core-plugin-api';
+import { fetchApiRef } from '@backstage/core-plugin-api';
+import { githubAuthApiRef } from '@backstage/core-plugin-api';
+import { gitlabAuthApiRef } from '@backstage/core-plugin-api';
+import { googleAuthApiRef } from '@backstage/core-plugin-api';
 import { IconComponent as IconComponent_2 } from '@backstage/core-plugin-api';
-import { IdentityApi } from '../../../../core-plugin-api';
-import { identityApiRef } from '../../../../core-plugin-api';
+import { IdentityApi } from '@backstage/core-plugin-api';
+import { identityApiRef } from '@backstage/core-plugin-api';
 import { JsonObject } from '@backstage/types';
 import { JSX as JSX_2 } from 'react';
-import { microsoftAuthApiRef } from '../../../../core-plugin-api';
-import { OAuthApi } from '../../../../core-plugin-api';
-import { OAuthRequestApi } from '../../../../core-plugin-api';
-import { oauthRequestApiRef } from '../../../../core-plugin-api';
-import { OAuthRequester } from '../../../../core-plugin-api';
-import { OAuthRequesterOptions } from '../../../../core-plugin-api';
-import { OAuthScope } from '../../../../core-plugin-api';
-import { oktaAuthApiRef } from '../../../../core-plugin-api';
-import { oneloginAuthApiRef } from '../../../../core-plugin-api';
-import { OpenIdConnectApi } from '../../../../core-plugin-api';
-import { PendingOAuthRequest } from '../../../../core-plugin-api';
-import { ProfileInfo } from '../../../../core-plugin-api';
-import { ProfileInfoApi } from '../../../../core-plugin-api';
+import { microsoftAuthApiRef } from '@backstage/core-plugin-api';
+import { OAuthApi } from '@backstage/core-plugin-api';
+import { OAuthRequestApi } from '@backstage/core-plugin-api';
+import { oauthRequestApiRef } from '@backstage/core-plugin-api';
+import { OAuthRequester } from '@backstage/core-plugin-api';
+import { OAuthRequesterOptions } from '@backstage/core-plugin-api';
+import { OAuthScope } from '@backstage/core-plugin-api';
+import { oktaAuthApiRef } from '@backstage/core-plugin-api';
+import { oneloginAuthApiRef } from '@backstage/core-plugin-api';
+import { OpenIdConnectApi } from '@backstage/core-plugin-api';
+import { PendingOAuthRequest } from '@backstage/core-plugin-api';
+import { ProfileInfo } from '@backstage/core-plugin-api';
+import { ProfileInfoApi } from '@backstage/core-plugin-api';
 import { default as React_2 } from 'react';
 import { ReactNode } from 'react';
-import { SessionApi } from '../../../../core-plugin-api';
-import { SessionState } from '../../../../core-plugin-api';
-import { StorageApi } from '../../../../core-plugin-api';
-import { storageApiRef } from '../../../../core-plugin-api';
-import { StorageValueSnapshot } from '../../../../core-plugin-api';
-import { TypesToApiRefs } from '../../../../core-plugin-api';
-import { useApi } from '../../../../core-plugin-api';
-import { useApiHolder } from '../../../../core-plugin-api';
-import { withApis } from '../../../../core-plugin-api';
+import { SessionApi } from '@backstage/core-plugin-api';
+import { SessionState } from '@backstage/core-plugin-api';
+import { StorageApi } from '@backstage/core-plugin-api';
+import { storageApiRef } from '@backstage/core-plugin-api';
+import { StorageValueSnapshot } from '@backstage/core-plugin-api';
+import { TypesToApiRefs } from '@backstage/core-plugin-api';
+import { useApi } from '@backstage/core-plugin-api';
+import { useApiHolder } from '@backstage/core-plugin-api';
+import { withApis } from '@backstage/core-plugin-api';
 import { z } from 'zod';
 import { ZodSchema } from 'zod';
 import { ZodTypeDef } from 'zod';
@@ -203,7 +199,7 @@ export interface AppTreeApi {
 }
 
 // @public
-export const appTreeApiRef: ApiRef_2<AppTreeApi>;
+export const appTreeApiRef: ApiRef<AppTreeApi>;
 
 export { atlassianAuthApiRef };
 
@@ -262,10 +258,10 @@ export interface ConfigurableExtensionDataRef<
 export const coreExtensionData: {
   reactElement: ConfigurableExtensionDataRef<JSX_2.Element, {}>;
   routePath: ConfigurableExtensionDataRef<string, {}>;
-  apiFactory: ConfigurableExtensionDataRef<AnyApiFactory_2, {}>;
+  apiFactory: ConfigurableExtensionDataRef<AnyApiFactory, {}>;
   routeRef: ConfigurableExtensionDataRef<RouteRef<AnyRouteRefParams>, {}>;
   navTarget: ConfigurableExtensionDataRef<NavTarget, {}>;
-  theme: ConfigurableExtensionDataRef<AppTheme_2, {}>;
+  theme: ConfigurableExtensionDataRef<AppTheme, {}>;
 };
 
 // @public (undocumented)
@@ -275,14 +271,14 @@ export function createApiExtension<
 >(
   options: (
     | {
-        api: AnyApiRef_2;
+        api: AnyApiRef;
         factory: (options: {
           config: TConfig;
           inputs: Expand<ExtensionInputValues<TInputs>>;
-        }) => AnyApiFactory_2;
+        }) => AnyApiFactory;
       }
     | {
-        factory: AnyApiFactory_2;
+        factory: AnyApiFactory;
       }
   ) & {
     configSchema?: PortableSchema<TConfig>;
@@ -468,7 +464,7 @@ export function createSubRouteRef<
 }): MakeSubRouteRef<PathParams<Path>, ParentParams>;
 
 // @public (undocumented)
-export function createThemeExtension(theme: AppTheme_2): Extension<never>;
+export function createThemeExtension(theme: AppTheme): Extension<never>;
 
 export { DiscoveryApi };
 
diff --git a/packages/frontend-plugin-api/src/apis/definitions/AlertApi.ts b/packages/frontend-plugin-api/src/apis/definitions/AlertApi.ts
index eb42477f77..649a930b50 100644
--- a/packages/frontend-plugin-api/src/apis/definitions/AlertApi.ts
+++ b/packages/frontend-plugin-api/src/apis/definitions/AlertApi.ts
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-// eslint-disable-next-line @backstage/no-relative-monorepo-imports
 export {
   type AlertApi,
   type AlertMessage,
   alertApiRef,
-} from '../../../../core-plugin-api';
+} from '@backstage/core-plugin-api';
diff --git a/packages/frontend-plugin-api/src/apis/definitions/AppLanguageApi.ts b/packages/frontend-plugin-api/src/apis/definitions/AppLanguageApi.ts
index 020742f9e4..37ffcfa820 100644
--- a/packages/frontend-plugin-api/src/apis/definitions/AppLanguageApi.ts
+++ b/packages/frontend-plugin-api/src/apis/definitions/AppLanguageApi.ts
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-// eslint-disable-next-line @backstage/no-relative-monorepo-imports
 export {
   type AppLanguageApi,
   appLanguageApiRef,
-} from '../../../../core-plugin-api/src/alpha';
+} from '@backstage/core-plugin-api/alpha';
diff --git a/packages/frontend-plugin-api/src/apis/definitions/AppThemeApi.ts b/packages/frontend-plugin-api/src/apis/definitions/AppThemeApi.ts
index 0764cfa6eb..ce62cd72c3 100644
--- a/packages/frontend-plugin-api/src/apis/definitions/AppThemeApi.ts
+++ b/packages/frontend-plugin-api/src/apis/definitions/AppThemeApi.ts
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-// eslint-disable-next-line @backstage/no-relative-monorepo-imports
 export {
   type AppTheme,
   type AppThemeApi,
   appThemeApiRef,
-} from '../../../../core-plugin-api';
+} from '@backstage/core-plugin-api';
diff --git a/packages/frontend-plugin-api/src/apis/definitions/ConfigApi.ts b/packages/frontend-plugin-api/src/apis/definitions/ConfigApi.ts
index dc28ff2980..968a2843ba 100644
--- a/packages/frontend-plugin-api/src/apis/definitions/ConfigApi.ts
+++ b/packages/frontend-plugin-api/src/apis/definitions/ConfigApi.ts
@@ -14,5 +14,4 @@
  * limitations under the License.
  */
 
-// eslint-disable-next-line @backstage/no-relative-monorepo-imports
-export { type ConfigApi, configApiRef } from '../../../../core-plugin-api';
+export { type ConfigApi, configApiRef } from '@backstage/core-plugin-api';
diff --git a/packages/frontend-plugin-api/src/apis/definitions/DiscoveryApi.ts b/packages/frontend-plugin-api/src/apis/definitions/DiscoveryApi.ts
index db0edc3d20..98b3f0bbf0 100644
--- a/packages/frontend-plugin-api/src/apis/definitions/DiscoveryApi.ts
+++ b/packages/frontend-plugin-api/src/apis/definitions/DiscoveryApi.ts
@@ -14,8 +14,4 @@
  * limitations under the License.
  */
 
-// eslint-disable-next-line @backstage/no-relative-monorepo-imports
-export {
-  type DiscoveryApi,
-  discoveryApiRef,
-} from '../../../../core-plugin-api';
+export { type DiscoveryApi, discoveryApiRef } from '@backstage/core-plugin-api';
diff --git a/packages/frontend-plugin-api/src/apis/definitions/ErrorApi.ts b/packages/frontend-plugin-api/src/apis/definitions/ErrorApi.ts
index 0e77faa4df..57782a05dc 100644
--- a/packages/frontend-plugin-api/src/apis/definitions/ErrorApi.ts
+++ b/packages/frontend-plugin-api/src/apis/definitions/ErrorApi.ts
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-// eslint-disable-next-line @backstage/no-relative-monorepo-imports
 export {
   type ErrorApiError,
   type ErrorApiErrorContext,
   type ErrorApi,
   errorApiRef,
-} from '../../../../core-plugin-api';
+} from '@backstage/core-plugin-api';
diff --git a/packages/frontend-plugin-api/src/apis/definitions/FeatureFlagsApi.ts b/packages/frontend-plugin-api/src/apis/definitions/FeatureFlagsApi.ts
index 02ff3fd9ee..820efc0a25 100644
--- a/packages/frontend-plugin-api/src/apis/definitions/FeatureFlagsApi.ts
+++ b/packages/frontend-plugin-api/src/apis/definitions/FeatureFlagsApi.ts
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-// eslint-disable-next-line @backstage/no-relative-monorepo-imports
 export {
   type FeatureFlag,
   type FeatureFlagState,
   type FeatureFlagsSaveOptions,
   type FeatureFlagsApi,
   featureFlagsApiRef,
-} from '../../../../core-plugin-api';
+} from '@backstage/core-plugin-api';
diff --git a/packages/frontend-plugin-api/src/apis/definitions/FetchApi.ts b/packages/frontend-plugin-api/src/apis/definitions/FetchApi.ts
index 8d090fc6cc..bcc9bc6a91 100644
--- a/packages/frontend-plugin-api/src/apis/definitions/FetchApi.ts
+++ b/packages/frontend-plugin-api/src/apis/definitions/FetchApi.ts
@@ -14,5 +14,4 @@
  * limitations under the License.
  */
 
-// eslint-disable-next-line @backstage/no-relative-monorepo-imports
-export { type FetchApi, fetchApiRef } from '../../../../core-plugin-api';
+export { type FetchApi, fetchApiRef } from '@backstage/core-plugin-api';
diff --git a/packages/frontend-plugin-api/src/apis/definitions/IdentityApi.ts b/packages/frontend-plugin-api/src/apis/definitions/IdentityApi.ts
index 72ca324f32..03503a8fba 100644
--- a/packages/frontend-plugin-api/src/apis/definitions/IdentityApi.ts
+++ b/packages/frontend-plugin-api/src/apis/definitions/IdentityApi.ts
@@ -14,5 +14,4 @@
  * limitations under the License.
  */
 
-// eslint-disable-next-line @backstage/no-relative-monorepo-imports
-export { type IdentityApi, identityApiRef } from '../../../../core-plugin-api';
+export { type IdentityApi, identityApiRef } from '@backstage/core-plugin-api';
diff --git a/packages/frontend-plugin-api/src/apis/definitions/OAuthRequestApi.ts b/packages/frontend-plugin-api/src/apis/definitions/OAuthRequestApi.ts
index 2b22625873..ff7a0f2852 100644
--- a/packages/frontend-plugin-api/src/apis/definitions/OAuthRequestApi.ts
+++ b/packages/frontend-plugin-api/src/apis/definitions/OAuthRequestApi.ts
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-// eslint-disable-next-line @backstage/no-relative-monorepo-imports
 export {
   type OAuthRequesterOptions,
   type OAuthRequester,
   type PendingOAuthRequest,
   type OAuthRequestApi,
   oauthRequestApiRef,
-} from '../../../../core-plugin-api';
+} from '@backstage/core-plugin-api';
diff --git a/packages/frontend-plugin-api/src/apis/definitions/StorageApi.ts b/packages/frontend-plugin-api/src/apis/definitions/StorageApi.ts
index 346912e9d7..2309d2414c 100644
--- a/packages/frontend-plugin-api/src/apis/definitions/StorageApi.ts
+++ b/packages/frontend-plugin-api/src/apis/definitions/StorageApi.ts
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-// eslint-disable-next-line @backstage/no-relative-monorepo-imports
 export {
   type StorageValueSnapshot,
   type StorageApi,
   storageApiRef,
-} from '../../../../core-plugin-api';
+} from '@backstage/core-plugin-api';
diff --git a/packages/frontend-plugin-api/src/apis/definitions/auth.ts b/packages/frontend-plugin-api/src/apis/definitions/auth.ts
index 60ce40c6ad..d27aebbf47 100644
--- a/packages/frontend-plugin-api/src/apis/definitions/auth.ts
+++ b/packages/frontend-plugin-api/src/apis/definitions/auth.ts
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-// eslint-disable-next-line @backstage/no-relative-monorepo-imports
 export {
   type BackstageIdentityApi,
   type BackstageIdentityResponse,
@@ -37,4 +36,4 @@ export {
   oktaAuthApiRef,
   microsoftAuthApiRef,
   oneloginAuthApiRef,
-} from '../../../../core-plugin-api';
+} from '@backstage/core-plugin-api';
diff --git a/packages/frontend-plugin-api/src/apis/system/ApiRef.ts b/packages/frontend-plugin-api/src/apis/system/ApiRef.ts
index c60bb5f111..0d1f8312cb 100644
--- a/packages/frontend-plugin-api/src/apis/system/ApiRef.ts
+++ b/packages/frontend-plugin-api/src/apis/system/ApiRef.ts
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-// eslint-disable-next-line @backstage/no-relative-monorepo-imports
 export {
   type ApiRef,
   type ApiRefConfig,
   createApiRef,
-} from '../../../../core-plugin-api';
+} from '@backstage/core-plugin-api';
diff --git a/packages/frontend-plugin-api/src/apis/system/helpers.ts b/packages/frontend-plugin-api/src/apis/system/helpers.ts
index 53dbcfb4e3..5de265be99 100644
--- a/packages/frontend-plugin-api/src/apis/system/helpers.ts
+++ b/packages/frontend-plugin-api/src/apis/system/helpers.ts
@@ -14,5 +14,4 @@
  * limitations under the License.
  */
 
-// eslint-disable-next-line @backstage/no-relative-monorepo-imports
-export { createApiFactory } from '../../../../core-plugin-api';
+export { createApiFactory } from '@backstage/core-plugin-api';
diff --git a/packages/frontend-plugin-api/src/apis/system/types.ts b/packages/frontend-plugin-api/src/apis/system/types.ts
index d56674625e..cc44e19e3f 100644
--- a/packages/frontend-plugin-api/src/apis/system/types.ts
+++ b/packages/frontend-plugin-api/src/apis/system/types.ts
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-// eslint-disable-next-line @backstage/no-relative-monorepo-imports
 export type {
   ApiRef,
   AnyApiRef,
@@ -22,4 +21,4 @@ export type {
   ApiHolder,
   ApiFactory,
   AnyApiFactory,
-} from '../../../../core-plugin-api';
+} from '@backstage/core-plugin-api';
diff --git a/packages/frontend-plugin-api/src/apis/system/useApi.tsx b/packages/frontend-plugin-api/src/apis/system/useApi.tsx
index bb0f816cfc..d2efa49fa1 100644
--- a/packages/frontend-plugin-api/src/apis/system/useApi.tsx
+++ b/packages/frontend-plugin-api/src/apis/system/useApi.tsx
@@ -14,5 +14,4 @@
  * limitations under the License.
  */
 
-// eslint-disable-next-line @backstage/no-relative-monorepo-imports
-export { useApiHolder, useApi, withApis } from '../../../../core-plugin-api';
+export { useApiHolder, useApi, withApis } from '@backstage/core-plugin-api';