diff --git a/packages/backend-common/api-report.md b/packages/backend-common/api-report.md
index f9fd164787..1b901ea5ac 100644
--- a/packages/backend-common/api-report.md
+++ b/packages/backend-common/api-report.md
@@ -24,7 +24,7 @@ import { isChildPath } from '@backstage/cli-common';
 import { JsonValue } from '@backstage/types';
 import { Knex } from 'knex';
 import { LoadConfigOptionsRemote } from '@backstage/config-loader';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 import { MergeResult } from 'isomorphic-git';
 import { PushResult } from 'isomorphic-git';
 import { Readable } from 'stream';
@@ -135,7 +135,7 @@ export class CacheManager {
 
 // @public
 export type CacheManagerOptions = {
-  logger?: Logger_2;
+  logger?: Logger;
   onError?: (err: Error) => void;
 };
 
@@ -187,7 +187,7 @@ export function createServiceBuilder(_module: NodeModule): ServiceBuilder;
 
 // @public
 export function createStatusCheckRouter(options: {
-  logger: Logger_2;
+  logger: Logger;
   path?: string;
   statusCheck?: StatusCheck;
 }): Promise<express.Router>;
@@ -227,7 +227,7 @@ export function errorHandler(
 // @public
 export type ErrorHandlerOptions = {
   showStackTraces?: boolean;
-  logger?: Logger_2;
+  logger?: Logger;
   logClientErrors?: boolean;
 };
 
@@ -297,7 +297,7 @@ export class Git {
   static fromAuth: (options: {
     username?: string;
     password?: string;
-    logger?: Logger_2;
+    logger?: Logger;
   }) => Git;
   // (undocumented)
   init(options: { dir: string; defaultBranch?: string }): Promise<void>;
@@ -373,7 +373,7 @@ export function isDatabaseConflictError(e: unknown): boolean;
 
 // @public
 export function loadBackendConfig(options: {
-  logger: Logger_2;
+  logger: Logger;
   remote?: LoadConfigOptionsRemote;
   argv: string[];
 }): Promise<Config>;
@@ -403,7 +403,7 @@ export type PluginEndpointDiscovery = {
 // @public
 export type ReaderFactory = (options: {
   config: Config;
-  logger: Logger_2;
+  logger: Logger;
   treeResponseFactory: ReadTreeResponseFactory;
 }) => UrlReaderPredicateTuple[];
 
@@ -480,12 +480,10 @@ export type ReadUrlResponse = {
 };
 
 // @public
-export function requestLoggingHandler(logger?: Logger_2): RequestHandler;
+export function requestLoggingHandler(logger?: Logger): RequestHandler;
 
 // @public
-export type RequestLoggingHandlerFactory = (
-  logger?: Logger_2,
-) => RequestHandler;
+export type RequestLoggingHandlerFactory = (logger?: Logger) => RequestHandler;
 
 // @public
 export function resolvePackagePath(name: string, ...paths: string[]): string;
@@ -531,7 +529,7 @@ export class ServerTokenManager implements TokenManager {
   static fromConfig(
     config: Config,
     options: {
-      logger: Logger_2;
+      logger: Logger;
     },
   ): ServerTokenManager;
   // (undocumented)
@@ -547,7 +545,7 @@ export type ServiceBuilder = {
   loadConfig(config: Config): ServiceBuilder;
   setPort(port: number): ServiceBuilder;
   setHost(host: string): ServiceBuilder;
-  setLogger(logger: Logger_2): ServiceBuilder;
+  setLogger(logger: Logger): ServiceBuilder;
   enableCors(options: cors.CorsOptions): ServiceBuilder;
   setHttpsSettings(settings: {
     certificate:
@@ -631,7 +629,7 @@ export class UrlReaders {
 // @public
 export type UrlReadersOptions = {
   config: Config;
-  logger: Logger_2;
+  logger: Logger;
   factories?: ReaderFactory[];
 };
 
diff --git a/packages/backend-tasks/api-report.md b/packages/backend-tasks/api-report.md
index eeb6412840..82b2ca9b0c 100644
--- a/packages/backend-tasks/api-report.md
+++ b/packages/backend-tasks/api-report.md
@@ -7,7 +7,7 @@ import { AbortSignal as AbortSignal_2 } from 'node-abort-controller';
 import { Config } from '@backstage/config';
 import { DatabaseManager } from '@backstage/backend-common';
 import { Duration } from 'luxon';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 
 // @public
 export interface PluginTaskScheduler {
@@ -31,14 +31,14 @@ export type TaskFunction =
 
 // @public
 export class TaskScheduler {
-  constructor(databaseManager: DatabaseManager, logger: Logger_2);
+  constructor(databaseManager: DatabaseManager, logger: Logger);
   forPlugin(pluginId: string): PluginTaskScheduler;
   // (undocumented)
   static fromConfig(
     config: Config,
     options?: {
       databaseManager?: DatabaseManager;
-      logger?: Logger_2;
+      logger?: Logger;
     },
   ): TaskScheduler;
 }
diff --git a/plugins/airbrake-backend/api-report.md b/plugins/airbrake-backend/api-report.md
index b9e9a50e0b..3ad74e2506 100644
--- a/plugins/airbrake-backend/api-report.md
+++ b/plugins/airbrake-backend/api-report.md
@@ -5,7 +5,7 @@
 ```ts
 import { Config } from '@backstage/config';
 import express from 'express';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 
 // @public
 export interface AirbrakeConfig {
@@ -21,6 +21,6 @@ export function extractAirbrakeConfig(config: Config): AirbrakeConfig;
 // @public
 export interface RouterOptions {
   airbrakeConfig: AirbrakeConfig;
-  logger: Logger_2;
+  logger: Logger;
 }
 ```
diff --git a/plugins/app-backend/api-report.md b/plugins/app-backend/api-report.md
index 50d1b7bc34..e1b0c63469 100644
--- a/plugins/app-backend/api-report.md
+++ b/plugins/app-backend/api-report.md
@@ -5,7 +5,7 @@
 ```ts
 import { Config } from '@backstage/config';
 import express from 'express';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 import { PluginDatabaseManager } from '@backstage/backend-common';
 
 // Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -23,7 +23,7 @@ export interface RouterOptions {
   database?: PluginDatabaseManager;
   disableConfigInjection?: boolean;
   // (undocumented)
-  logger: Logger_2;
+  logger: Logger;
   staticFallbackHandler?: express.Handler;
 }
 ```
diff --git a/plugins/auth-backend/api-report.md b/plugins/auth-backend/api-report.md
index 416da59b46..4227f1db0a 100644
--- a/plugins/auth-backend/api-report.md
+++ b/plugins/auth-backend/api-report.md
@@ -11,7 +11,7 @@ import { CatalogApi } from '@backstage/catalog-client';
 import { Config } from '@backstage/config';
 import express from 'express';
 import { JsonValue } from '@backstage/types';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 import { PluginDatabaseManager } from '@backstage/backend-common';
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { Profile } from 'passport';
@@ -85,7 +85,7 @@ export type AuthProviderFactoryOptions = {
   providerId: string;
   globalConfig: AuthProviderConfig;
   config: Config;
-  logger: Logger_2;
+  logger: Logger;
   tokenManager: TokenManager;
   tokenIssuer: TokenIssuer;
   discovery: PluginEndpointDiscovery;
@@ -106,7 +106,7 @@ export interface AuthProviderRouteHandlers {
 export type AuthResolverContext = {
   tokenIssuer: TokenIssuer;
   catalogIdentityClient: CatalogIdentityClient;
-  logger: Logger_2;
+  logger: Logger;
 };
 
 // Warning: (ae-missing-release-tag) "AuthResponse" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -642,7 +642,7 @@ export interface RouterOptions {
   // (undocumented)
   discovery: PluginEndpointDiscovery;
   // (undocumented)
-  logger: Logger_2;
+  logger: Logger;
   // Warning: (ae-forgotten-export) The symbol "ProviderFactories" needs to be exported by the entry point index.d.ts
   //
   // (undocumented)
diff --git a/plugins/azure-devops-backend/api-report.md b/plugins/azure-devops-backend/api-report.md
index 579367e2dd..f9b8b75b82 100644
--- a/plugins/azure-devops-backend/api-report.md
+++ b/plugins/azure-devops-backend/api-report.md
@@ -10,7 +10,7 @@ import { Config } from '@backstage/config';
 import { DashboardPullRequest } from '@backstage/plugin-azure-devops-common';
 import express from 'express';
 import { GitRepository } from 'azure-devops-node-api/interfaces/GitInterfaces';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 import { PullRequest } from '@backstage/plugin-azure-devops-common';
 import { PullRequestOptions } from '@backstage/plugin-azure-devops-common';
 import { RepoBuild } from '@backstage/plugin-azure-devops-common';
@@ -22,7 +22,7 @@ import { WebApi } from 'azure-devops-node-api';
 //
 // @public (undocumented)
 export class AzureDevOpsApi {
-  constructor(logger: Logger_2, webApi: WebApi);
+  constructor(logger: Logger, webApi: WebApi);
   // (undocumented)
   getAllTeams(): Promise<Team[]>;
   // (undocumented)
@@ -96,7 +96,7 @@ export interface RouterOptions {
   // (undocumented)
   config: Config;
   // (undocumented)
-  logger: Logger_2;
+  logger: Logger;
 }
 
 // (No @packageDocumentation comment for this package)
diff --git a/plugins/bazaar-backend/api-report.md b/plugins/bazaar-backend/api-report.md
index 89f6da5305..b50994b15d 100644
--- a/plugins/bazaar-backend/api-report.md
+++ b/plugins/bazaar-backend/api-report.md
@@ -5,7 +5,7 @@
 ```ts
 import { Config } from '@backstage/config';
 import express from 'express';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 import { PluginDatabaseManager } from '@backstage/backend-common';
 
 // Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -22,7 +22,7 @@ export interface RouterOptions {
   // (undocumented)
   database: PluginDatabaseManager;
   // (undocumented)
-  logger: Logger_2;
+  logger: Logger;
 }
 
 // (No @packageDocumentation comment for this package)
diff --git a/plugins/catalog-backend-module-ldap/api-report.md b/plugins/catalog-backend-module-ldap/api-report.md
index f6b2475e65..79646aab01 100644
--- a/plugins/catalog-backend-module-ldap/api-report.md
+++ b/plugins/catalog-backend-module-ldap/api-report.md
@@ -12,7 +12,7 @@ import { EntityProviderConnection } from '@backstage/plugin-catalog-backend';
 import { GroupEntity } from '@backstage/catalog-model';
 import { JsonValue } from '@backstage/types';
 import { LocationSpec } from '@backstage/plugin-catalog-backend';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 import { SearchEntry } from 'ldapjs';
 import { SearchOptions } from 'ldapjs';
 import { UserEntity } from '@backstage/catalog-model';
@@ -75,10 +75,10 @@ export const LDAP_UUID_ANNOTATION = 'backstage.io/ldap-uuid';
 
 // @public
 export class LdapClient {
-  constructor(client: Client, logger: Logger_2);
+  constructor(client: Client, logger: Logger);
   // (undocumented)
   static create(
-    logger: Logger_2,
+    logger: Logger,
     target: string,
     bind?: BindConfig,
   ): Promise<LdapClient>;
@@ -97,7 +97,7 @@ export class LdapOrgEntityProvider implements EntityProvider {
   constructor(options: {
     id: string;
     provider: LdapProviderConfig;
-    logger: Logger_2;
+    logger: Logger;
     userTransformer?: UserTransformer;
     groupTransformer?: GroupTransformer;
   });
@@ -111,7 +111,7 @@ export class LdapOrgEntityProvider implements EntityProvider {
       target: string;
       userTransformer?: UserTransformer;
       groupTransformer?: GroupTransformer;
-      logger: Logger_2;
+      logger: Logger;
     },
   ): LdapOrgEntityProvider;
   // (undocumented)
@@ -123,7 +123,7 @@ export class LdapOrgEntityProvider implements EntityProvider {
 export class LdapOrgReaderProcessor implements CatalogProcessor {
   constructor(options: {
     providers: LdapProviderConfig[];
-    logger: Logger_2;
+    logger: Logger;
     groupTransformer?: GroupTransformer;
     userTransformer?: UserTransformer;
   });
@@ -131,7 +131,7 @@ export class LdapOrgReaderProcessor implements CatalogProcessor {
   static fromConfig(
     config: Config,
     options: {
-      logger: Logger_2;
+      logger: Logger;
       groupTransformer?: GroupTransformer;
       userTransformer?: UserTransformer;
     },
@@ -180,7 +180,7 @@ export function readLdapOrg(
   options: {
     groupTransformer?: GroupTransformer;
     userTransformer?: UserTransformer;
-    logger: Logger_2;
+    logger: Logger;
   },
 ): Promise<{
   users: UserEntity[];
diff --git a/plugins/catalog-backend-module-msgraph/api-report.md b/plugins/catalog-backend-module-msgraph/api-report.md
index 8df06f54b1..f7d0f112ad 100644
--- a/plugins/catalog-backend-module-msgraph/api-report.md
+++ b/plugins/catalog-backend-module-msgraph/api-report.md
@@ -10,7 +10,7 @@ import { EntityProvider } from '@backstage/plugin-catalog-backend';
 import { EntityProviderConnection } from '@backstage/plugin-catalog-backend';
 import { GroupEntity } from '@backstage/catalog-model';
 import { LocationSpec } from '@backstage/plugin-catalog-backend';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 import * as MicrosoftGraph from '@microsoft/microsoft-graph-types';
 import * as msal from '@azure/msal-node';
 import { Response as Response_2 } from 'node-fetch';
@@ -100,7 +100,7 @@ export class MicrosoftGraphOrgEntityProvider implements EntityProvider {
   constructor(options: {
     id: string;
     provider: MicrosoftGraphProviderConfig;
-    logger: Logger_2;
+    logger: Logger;
     userTransformer?: UserTransformer;
     groupTransformer?: GroupTransformer;
     organizationTransformer?: OrganizationTransformer;
@@ -113,7 +113,7 @@ export class MicrosoftGraphOrgEntityProvider implements EntityProvider {
     options: {
       id: string;
       target: string;
-      logger: Logger_2;
+      logger: Logger;
       userTransformer?: UserTransformer;
       groupTransformer?: GroupTransformer;
       organizationTransformer?: OrganizationTransformer;
@@ -128,7 +128,7 @@ export class MicrosoftGraphOrgEntityProvider implements EntityProvider {
 export class MicrosoftGraphOrgReaderProcessor implements CatalogProcessor {
   constructor(options: {
     providers: MicrosoftGraphProviderConfig[];
-    logger: Logger_2;
+    logger: Logger;
     userTransformer?: UserTransformer;
     groupTransformer?: GroupTransformer;
     organizationTransformer?: OrganizationTransformer;
@@ -137,7 +137,7 @@ export class MicrosoftGraphOrgReaderProcessor implements CatalogProcessor {
   static fromConfig(
     config: Config,
     options: {
-      logger: Logger_2;
+      logger: Logger;
       userTransformer?: UserTransformer;
       groupTransformer?: GroupTransformer;
       organizationTransformer?: OrganizationTransformer;
@@ -205,7 +205,7 @@ export function readMicrosoftGraphOrg(
     userTransformer?: UserTransformer;
     groupTransformer?: GroupTransformer;
     organizationTransformer?: OrganizationTransformer;
-    logger: Logger_2;
+    logger: Logger;
   },
 ): Promise<{
   users: UserEntity[];
diff --git a/plugins/catalog-graphql/api-report.md b/plugins/catalog-graphql/api-report.md
index 019f9c279f..e14fd988d0 100644
--- a/plugins/catalog-graphql/api-report.md
+++ b/plugins/catalog-graphql/api-report.md
@@ -4,7 +4,7 @@
 
 ```ts
 import { Config } from '@backstage/config';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 import { Module } from 'graphql-modules';
 
 // Warning: (ae-missing-release-tag) "createModule" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -19,6 +19,6 @@ export interface ModuleOptions {
   // (undocumented)
   config: Config;
   // (undocumented)
-  logger: Logger_2;
+  logger: Logger;
 }
 ```
diff --git a/plugins/code-coverage-backend/api-report.md b/plugins/code-coverage-backend/api-report.md
index 9e6a84f542..437c48227f 100644
--- a/plugins/code-coverage-backend/api-report.md
+++ b/plugins/code-coverage-backend/api-report.md
@@ -5,7 +5,7 @@
 ```ts
 import { Config } from '@backstage/config';
 import express from 'express';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 import { PluginDatabaseManager } from '@backstage/backend-common';
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { UrlReader } from '@backstage/backend-common';
@@ -39,7 +39,7 @@ export interface RouterOptions {
   // (undocumented)
   discovery: PluginEndpointDiscovery;
   // (undocumented)
-  logger: Logger_2;
+  logger: Logger;
   // (undocumented)
   urlReader: UrlReader;
 }
diff --git a/plugins/graphql-backend/api-report.md b/plugins/graphql-backend/api-report.md
index e6f292c20a..f1707288b7 100644
--- a/plugins/graphql-backend/api-report.md
+++ b/plugins/graphql-backend/api-report.md
@@ -5,7 +5,7 @@
 ```ts
 import { Config } from '@backstage/config';
 import express from 'express';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 
 // Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
@@ -19,6 +19,6 @@ export interface RouterOptions {
   // (undocumented)
   config: Config;
   // (undocumented)
-  logger: Logger_2;
+  logger: Logger;
 }
 ```
diff --git a/plugins/jenkins-backend/api-report.md b/plugins/jenkins-backend/api-report.md
index 264d3912c8..fb155bafe2 100644
--- a/plugins/jenkins-backend/api-report.md
+++ b/plugins/jenkins-backend/api-report.md
@@ -7,7 +7,7 @@ import { CatalogApi } from '@backstage/catalog-client';
 import { CompoundEntityRef } from '@backstage/catalog-model';
 import { Config } from '@backstage/config';
 import express from 'express';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 import { PermissionAuthorizer } from '@backstage/plugin-permission-common';
 
 // Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -94,7 +94,7 @@ export interface RouterOptions {
   // (undocumented)
   jenkinsInfoProvider: JenkinsInfoProvider;
   // (undocumented)
-  logger: Logger_2;
+  logger: Logger;
   // (undocumented)
   permissions?: PermissionAuthorizer;
 }
diff --git a/plugins/kafka-backend/api-report.md b/plugins/kafka-backend/api-report.md
index 26a3a44ee4..e73d8e9e03 100644
--- a/plugins/kafka-backend/api-report.md
+++ b/plugins/kafka-backend/api-report.md
@@ -5,7 +5,7 @@
 ```ts
 import { Config } from '@backstage/config';
 import express from 'express';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 
 // Warning: (ae-forgotten-export) The symbol "RouterOptions" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
diff --git a/plugins/kubernetes-backend/api-report.md b/plugins/kubernetes-backend/api-report.md
index ea273d7632..8a3b64bd93 100644
--- a/plugins/kubernetes-backend/api-report.md
+++ b/plugins/kubernetes-backend/api-report.md
@@ -9,7 +9,7 @@ import type { FetchResponse } from '@backstage/plugin-kubernetes-common';
 import type { JsonObject } from '@backstage/types';
 import type { KubernetesFetchError } from '@backstage/plugin-kubernetes-common';
 import type { KubernetesRequestBody } from '@backstage/plugin-kubernetes-common';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 import type { ObjectsByEntityResponse } from '@backstage/plugin-kubernetes-common';
 import { PodStatus } from '@kubernetes/client-node/dist/top';
 
@@ -160,7 +160,7 @@ export interface KubernetesEnvironment {
   // (undocumented)
   config: Config;
   // (undocumented)
-  logger: Logger_2;
+  logger: Logger;
 }
 
 // Warning: (ae-missing-release-tag) "KubernetesFetcher" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -197,7 +197,7 @@ export interface KubernetesObjectsProviderOptions {
   // (undocumented)
   fetcher: KubernetesFetcher;
   // (undocumented)
-  logger: Logger_2;
+  logger: Logger;
   // (undocumented)
   objectTypesToFetch?: ObjectToFetch[];
   // (undocumented)
@@ -275,7 +275,7 @@ export interface RouterOptions {
   // (undocumented)
   config: Config;
   // (undocumented)
-  logger: Logger_2;
+  logger: Logger;
 }
 
 // Warning: (ae-missing-release-tag) "ServiceAccountClusterDetails" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
diff --git a/plugins/permission-backend/api-report.md b/plugins/permission-backend/api-report.md
index 2b59113535..3c606e3cb9 100644
--- a/plugins/permission-backend/api-report.md
+++ b/plugins/permission-backend/api-report.md
@@ -6,7 +6,7 @@
 import { Config } from '@backstage/config';
 import express from 'express';
 import { IdentityClient } from '@backstage/plugin-auth-node';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 import { PermissionPolicy } from '@backstage/plugin-permission-node';
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 
@@ -22,7 +22,7 @@ export interface RouterOptions {
   // (undocumented)
   identity: IdentityClient;
   // (undocumented)
-  logger: Logger_2;
+  logger: Logger;
   // (undocumented)
   policy: PermissionPolicy;
 }
diff --git a/plugins/proxy-backend/api-report.md b/plugins/proxy-backend/api-report.md
index b71783cabf..45ef63f4d9 100644
--- a/plugins/proxy-backend/api-report.md
+++ b/plugins/proxy-backend/api-report.md
@@ -5,7 +5,7 @@
 ```ts
 import { Config } from '@backstage/config';
 import express from 'express';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 
 // Warning: (ae-forgotten-export) The symbol "RouterOptions" needs to be exported by the entry point index.d.ts
diff --git a/plugins/rollbar-backend/api-report.md b/plugins/rollbar-backend/api-report.md
index d51292121f..1c0800a393 100644
--- a/plugins/rollbar-backend/api-report.md
+++ b/plugins/rollbar-backend/api-report.md
@@ -5,7 +5,7 @@
 ```ts
 import { Config } from '@backstage/config';
 import express from 'express';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 
 // Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
@@ -25,7 +25,7 @@ export function getRequestHeaders(token: string): {
 //
 // @public (undocumented)
 export class RollbarApi {
-  constructor(accessToken: string, logger: Logger_2);
+  constructor(accessToken: string, logger: Logger);
   // (undocumented)
   getActivatedCounts(
     projectName: string,
@@ -107,7 +107,7 @@ export interface RouterOptions {
   // (undocumented)
   config: Config;
   // (undocumented)
-  logger: Logger_2;
+  logger: Logger;
   // (undocumented)
   rollbarApi?: RollbarApi;
 }
diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index 612ddedecc..d57cd4b2b8 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -17,7 +17,7 @@ import { JsonObject } from '@backstage/types';
 import { JsonValue } from '@backstage/types';
 import { Knex } from 'knex';
 import { LocationSpec } from '@backstage/plugin-catalog-backend';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 import { Observable } from '@backstage/types';
 import { PluginDatabaseManager } from '@backstage/backend-common';
 import { Schema } from 'jsonschema';
@@ -25,22 +25,21 @@ import { ScmIntegrationRegistry } from '@backstage/integration';
 import { ScmIntegrations } from '@backstage/integration';
 import { SpawnOptionsWithoutStdio } from 'child_process';
 import { TaskSpec } from '@backstage/plugin-scaffolder-common';
+import { TaskSpecV1beta3 } from '@backstage/plugin-scaffolder-common';
 import { TemplateInfo } from '@backstage/plugin-scaffolder-common';
-import { TemplateMetadata } from '@backstage/plugin-scaffolder-common';
 import { UrlReader } from '@backstage/backend-common';
 import { Writable } from 'stream';
 
 // @public
 export type ActionContext<Input extends JsonObject> = {
   baseUrl?: string;
-  logger: Logger_2;
+  logger: Logger;
   logStream: Writable;
   secrets?: TaskSecrets;
   workspacePath: string;
   input: Input;
   output(name: string, value: JsonValue): void;
   createTemporaryDirectory(): Promise<string>;
-  metadata?: TemplateMetadata;
   templateInfo?: TemplateInfo;
 };
 
@@ -297,7 +296,7 @@ export type CreateWorkerOptions = {
   actionRegistry: TemplateActionRegistry;
   integrations: ScmIntegrations;
   workingDirectory: string;
-  logger: Logger_2;
+  logger: Logger;
   additionalTemplateFilters?: Record<string, TemplateFilter>;
 };
 
@@ -404,7 +403,7 @@ export interface RouterOptions {
   // (undocumented)
   database: PluginDatabaseManager;
   // (undocumented)
-  logger: Logger_2;
+  logger: Logger;
   // (undocumented)
   reader: UrlReader;
   // (undocumented)
@@ -519,7 +518,7 @@ export class TaskManager implements TaskContext {
   static create(
     task: CurrentClaimedTask,
     storage: TaskStore,
-    logger: Logger_2,
+    logger: Logger,
   ): TaskManager;
   // (undocumented)
   get done(): boolean;
@@ -530,7 +529,7 @@ export class TaskManager implements TaskContext {
   // (undocumented)
   get secrets(): TaskSecrets | undefined;
   // (undocumented)
-  get spec(): TaskSpec;
+  get spec(): TaskSpecV1beta3;
 }
 
 // @public
diff --git a/plugins/scaffolder-common/api-report.md b/plugins/scaffolder-common/api-report.md
index 1872aa3ed8..6148440e6d 100644
--- a/plugins/scaffolder-common/api-report.md
+++ b/plugins/scaffolder-common/api-report.md
@@ -9,36 +9,12 @@ import { JsonValue } from '@backstage/types';
 import { KindValidator } from '@backstage/catalog-model';
 
 // @public
-export type TaskSpec = TaskSpecV1beta2 | TaskSpecV1beta3;
-
-// @public @deprecated
-export interface TaskSpecV1beta2 {
-  // (undocumented)
-  apiVersion: 'backstage.io/v1beta2';
-  // @deprecated (undocumented)
-  baseUrl?: string;
-  // @deprecated (undocumented)
-  metadata?: TemplateMetadata;
-  // (undocumented)
-  output: {
-    [name: string]: string;
-  };
-  // (undocumented)
-  steps: TaskStep[];
-  // (undocumented)
-  templateInfo?: TemplateInfo;
-  // (undocumented)
-  values: JsonObject;
-}
+export type TaskSpec = TaskSpecV1beta3;
 
 // @public
 export interface TaskSpecV1beta3 {
   // (undocumented)
   apiVersion: 'scaffolder.backstage.io/v1beta3';
-  // @deprecated (undocumented)
-  baseUrl?: string;
-  // @deprecated (undocumented)
-  metadata?: TemplateMetadata;
   // (undocumented)
   output: {
     [name: string]: JsonValue;
@@ -65,33 +41,6 @@ export interface TaskStep {
   name: string;
 }
 
-// @public @deprecated
-export interface TemplateEntityV1beta2 extends Entity {
-  // (undocumented)
-  apiVersion: 'backstage.io/v1beta2';
-  // (undocumented)
-  kind: 'Template';
-  // (undocumented)
-  spec: {
-    type: string;
-    parameters?: JsonObject | JsonObject[];
-    steps: Array<{
-      id?: string;
-      name?: string;
-      action: string;
-      input?: JsonObject;
-      if?: string | boolean;
-    }>;
-    output?: {
-      [name: string]: string;
-    };
-    owner?: string;
-  };
-}
-
-// @public @deprecated
-export const templateEntityV1beta2Validator: KindValidator;
-
 // @public
 export interface TemplateEntityV1beta3 extends Entity {
   // (undocumented)
@@ -124,9 +73,4 @@ export type TemplateInfo = {
   entityRef: string;
   baseUrl?: string;
 };
-
-// @public @deprecated
-export type TemplateMetadata = {
-  name: string;
-};
 ```
diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md
index 9326a61fd5..cc6fc0f3df 100644
--- a/plugins/scaffolder/api-report.md
+++ b/plugins/scaffolder/api-report.md
@@ -24,7 +24,7 @@ import { default as React_2 } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { TaskSpec } from '@backstage/plugin-scaffolder-common';
-import { TemplateEntityV1beta2 } from '@backstage/plugin-scaffolder-common';
+import { TemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common';
 
 // @public
 export function createScaffolderFieldExtension<
@@ -222,14 +222,14 @@ export interface RepoUrlPickerUiOptions {
 export type RouterProps = {
   TemplateCardComponent?:
     | ComponentType<{
-        template: TemplateEntityV1beta2;
+        template: TemplateEntityV1beta3;
       }>
     | undefined;
   TaskPageComponent?: ComponentType<{}>;
   components?: {
     TemplateCardComponent?:
       | ComponentType<{
-          template: TemplateEntityV1beta2;
+          template: TemplateEntityV1beta3;
         }>
       | undefined;
     TaskPageComponent?: ComponentType<{}>;
@@ -427,7 +427,7 @@ export const TemplateList: ({
 export type TemplateListProps = {
   TemplateCardComponent?:
     | ComponentType<{
-        template: TemplateEntityV1beta2;
+        template: TemplateEntityV1beta3;
       }>
     | undefined;
   group?: {
diff --git a/plugins/search-backend/api-report.md b/plugins/search-backend/api-report.md
index d9d408395f..3c7f9c2754 100644
--- a/plugins/search-backend/api-report.md
+++ b/plugins/search-backend/api-report.md
@@ -6,7 +6,7 @@
 import { Config } from '@backstage/config';
 import { DocumentTypeInfo } from '@backstage/plugin-search-common';
 import express from 'express';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 import { PermissionAuthorizer } from '@backstage/plugin-permission-common';
 import { SearchEngine } from '@backstage/plugin-search-backend-node';
 
@@ -23,6 +23,6 @@ export type RouterOptions = {
   types: Record<string, DocumentTypeInfo>;
   permissions: PermissionAuthorizer;
   config: Config;
-  logger: Logger_2;
+  logger: Logger;
 };
 ```
diff --git a/plugins/tech-insights-backend-module-jsonfc/api-report.md b/plugins/tech-insights-backend-module-jsonfc/api-report.md
index 2e62e7d6a0..69e4054170 100644
--- a/plugins/tech-insights-backend-module-jsonfc/api-report.md
+++ b/plugins/tech-insights-backend-module-jsonfc/api-report.md
@@ -7,7 +7,7 @@ import { BooleanCheckResult } from '@backstage/plugin-tech-insights-common';
 import { CheckResponse } from '@backstage/plugin-tech-insights-common';
 import { CheckValidationResponse } from '@backstage/plugin-tech-insights-node';
 import { FactChecker } from '@backstage/plugin-tech-insights-node';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 import { Operator } from 'json-rules-engine';
 import { TechInsightCheck } from '@backstage/plugin-tech-insights-node';
 import { TechInsightCheckRegistry } from '@backstage/plugin-tech-insights-node';
@@ -79,7 +79,7 @@ export class JsonRulesEngineFactCheckerFactory {
 // @public
 export type JsonRulesEngineFactCheckerFactoryOptions = {
   checks: TechInsightJsonRuleCheck[];
-  logger: Logger_2;
+  logger: Logger;
   checkRegistry?: TechInsightCheckRegistry<TechInsightJsonRuleCheck>;
   operators?: Operator[];
 };
@@ -88,7 +88,7 @@ export type JsonRulesEngineFactCheckerFactoryOptions = {
 export type JsonRulesEngineFactCheckerOptions = {
   checks: TechInsightJsonRuleCheck[];
   repository: TechInsightsStore;
-  logger: Logger_2;
+  logger: Logger;
   checkRegistry?: TechInsightCheckRegistry<any>;
   operators?: Operator[];
 };
diff --git a/plugins/tech-insights-backend/api-report.md b/plugins/tech-insights-backend/api-report.md
index 1d19123a00..d56e3c8082 100644
--- a/plugins/tech-insights-backend/api-report.md
+++ b/plugins/tech-insights-backend/api-report.md
@@ -11,7 +11,7 @@ import { FactCheckerFactory } from '@backstage/plugin-tech-insights-node';
 import { FactLifecycle } from '@backstage/plugin-tech-insights-node';
 import { FactRetriever } from '@backstage/plugin-tech-insights-node';
 import { FactRetrieverRegistration } from '@backstage/plugin-tech-insights-node';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 import { PluginDatabaseManager } from '@backstage/backend-common';
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { TechInsightCheck } from '@backstage/plugin-tech-insights-node';
@@ -63,7 +63,7 @@ export interface RouterOptions<
 > {
   config: Config;
   factChecker?: FactChecker<CheckType, CheckResultType>;
-  logger: Logger_2;
+  logger: Logger;
   persistenceContext: PersistenceContext;
 }
 
@@ -93,7 +93,7 @@ export interface TechInsightsOptions<
   factCheckerFactory?: FactCheckerFactory<CheckType, CheckResultType>;
   factRetrievers: FactRetrieverRegistration[];
   // (undocumented)
-  logger: Logger_2;
+  logger: Logger;
 }
 
 // (No @packageDocumentation comment for this package)
diff --git a/plugins/tech-insights-node/api-report.md b/plugins/tech-insights-node/api-report.md
index 77a9d77871..45426587e3 100644
--- a/plugins/tech-insights-node/api-report.md
+++ b/plugins/tech-insights-node/api-report.md
@@ -7,7 +7,7 @@ import { CheckResult } from '@backstage/plugin-tech-insights-common';
 import { Config } from '@backstage/config';
 import { DateTime } from 'luxon';
 import { DurationLike } from 'luxon';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 
 // @public
@@ -56,7 +56,7 @@ export interface FactRetriever {
 export type FactRetrieverContext = {
   config: Config;
   discovery: PluginEndpointDiscovery;
-  logger: Logger_2;
+  logger: Logger;
   entityFilter?:
     | Record<string, string | symbol | (string | symbol)[]>[]
     | Record<string, string | symbol | (string | symbol)[]>;
diff --git a/plugins/techdocs-backend/api-report.md b/plugins/techdocs-backend/api-report.md
index f306ce4f35..157f049953 100644
--- a/plugins/techdocs-backend/api-report.md
+++ b/plugins/techdocs-backend/api-report.md
@@ -12,7 +12,7 @@ import { Entity } from '@backstage/catalog-model';
 import express from 'express';
 import { GeneratorBuilder } from '@backstage/plugin-techdocs-node';
 import { Knex } from 'knex';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 import { Permission } from '@backstage/plugin-permission-common';
 import { PluginCacheManager } from '@backstage/backend-common';
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
@@ -71,7 +71,7 @@ export type OutOfTheBoxDeploymentOptions = {
   preparers: PreparerBuilder;
   generators: GeneratorBuilder;
   publisher: PublisherBase;
-  logger: Logger_2;
+  logger: Logger;
   discovery: PluginEndpointDiscovery;
   database?: Knex;
   config: Config;
@@ -82,7 +82,7 @@ export type OutOfTheBoxDeploymentOptions = {
 // @public
 export type RecommendedDeploymentOptions = {
   publisher: PublisherBase;
-  logger: Logger_2;
+  logger: Logger;
   discovery: PluginEndpointDiscovery;
   config: Config;
   cache: PluginCacheManager;
@@ -102,7 +102,7 @@ export type ShouldBuildParameters = {
 // @public
 export type TechDocsCollatorFactoryOptions = {
   discovery: PluginEndpointDiscovery;
-  logger: Logger_2;
+  logger: Logger;
   tokenManager: TokenManager;
   locationTemplate?: string;
   catalogClient?: CatalogApi;
@@ -113,7 +113,7 @@ export type TechDocsCollatorFactoryOptions = {
 // @public
 export type TechDocsCollatorOptions = {
   discovery: PluginEndpointDiscovery;
-  logger: Logger_2;
+  logger: Logger;
   tokenManager: TokenManager;
   locationTemplate?: string;
   catalogClient?: CatalogApi;
diff --git a/plugins/todo-backend/api-report.md b/plugins/todo-backend/api-report.md
index f3f2af3fb9..277c87fea9 100644
--- a/plugins/todo-backend/api-report.md
+++ b/plugins/todo-backend/api-report.md
@@ -7,7 +7,7 @@ import { CatalogApi } from '@backstage/catalog-client';
 import { CompoundEntityRef } from '@backstage/catalog-model';
 import { Config } from '@backstage/config';
 import express from 'express';
-import { Logger as Logger_2 } from 'winston';
+import { Logger } from 'winston';
 import { ScmIntegrations } from '@backstage/integration';
 import { UrlReader } from '@backstage/backend-common';
 
@@ -127,7 +127,7 @@ export class TodoScmReader implements TodoReader {
 
 // @public (undocumented)
 export type TodoScmReaderOptions = {
-  logger: Logger_2;
+  logger: Logger;
   reader: UrlReader;
   integrations: ScmIntegrations;
   parser?: TodoParser;