diff --git a/plugins/scaffolder-backend/src/lib/catalog/CatalogEntityClient.ts b/plugins/scaffolder-backend/src/lib/catalog/CatalogEntityClient.ts
index 7afbdd3fb9..56b82760bd 100644
--- a/plugins/scaffolder-backend/src/lib/catalog/CatalogEntityClient.ts
+++ b/plugins/scaffolder-backend/src/lib/catalog/CatalogEntityClient.ts
@@ -16,8 +16,11 @@
 
 import { TemplateEntityV1alpha1 } from '@backstage/catalog-model';
 import { CatalogClient } from '@backstage/catalog-client';
-import { DiscoveryApi } from '@backstage/core';
-import { ConflictError, NotFoundError } from '@backstage/backend-common';
+import {
+  ConflictError,
+  NotFoundError,
+  PluginEndpointDiscovery,
+} from '@backstage/backend-common';
 
 /**
  * A catalog client tailored for reading out entity data from the catalog.
@@ -25,7 +28,7 @@ import { ConflictError, NotFoundError } from '@backstage/backend-common';
 export class CatalogEntityClient {
   private readonly catalogClient: CatalogClient;
 
-  constructor(options: { discovery: DiscoveryApi }) {
+  constructor(options: { discovery: PluginEndpointDiscovery }) {
     this.catalogClient = new CatalogClient({
       discoveryApi: options.discovery,
     });
diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts
index 606aa05bc1..25b8c6e6f9 100644
--- a/plugins/scaffolder-backend/src/service/router.ts
+++ b/plugins/scaffolder-backend/src/service/router.ts
@@ -15,7 +15,6 @@
  */
 
 import { Config } from '@backstage/config';
-import { BackstageIdentity } from '@backstage/core';
 import Docker from 'dockerode';
 import express from 'express';
 import { resolve as resolvePath } from 'path';
@@ -46,6 +45,11 @@ export interface RouterOptions {
   entityClient: CatalogEntityClient;
 }
 
+// Avoid import of @backstage/core
+type BackstageIdentity = {
+  idToken: string;
+};
+
 export async function createRouter(
   options: RouterOptions,
 ): Promise<express.Router> {