diff --git a/plugins/adr/api-report.md b/plugins/adr/api-report.md
index 6ed7b68196..9ce5834574 100644
--- a/plugins/adr/api-report.md
+++ b/plugins/adr/api-report.md
@@ -72,7 +72,6 @@ export const adrPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/airbrake/api-report.md b/plugins/airbrake/api-report.md
index a04d57d7e9..66f9b19bc8 100644
--- a/plugins/airbrake/api-report.md
+++ b/plugins/airbrake/api-report.md
@@ -13,7 +13,6 @@ export const airbrakePlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/allure/api-report.md b/plugins/allure/api-report.md
index a192851f26..69bb740271 100644
--- a/plugins/allure/api-report.md
+++ b/plugins/allure/api-report.md
@@ -18,7 +18,6 @@ export const allurePlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/analytics-module-ga/api-report.md b/plugins/analytics-module-ga/api-report.md
index f28c919f33..1846211e72 100644
--- a/plugins/analytics-module-ga/api-report.md
+++ b/plugins/analytics-module-ga/api-report.md
@@ -10,7 +10,7 @@ import { Config } from '@backstage/config';
 import { IdentityApi } from '@backstage/core-plugin-api';
 
 // @public @deprecated (undocumented)
-export const analyticsModuleGA: BackstagePlugin<{}, {}, {}>;
+export const analyticsModuleGA: BackstagePlugin<{}, {}>;
 
 // @public
 export class GoogleAnalytics implements AnalyticsApi {
diff --git a/plugins/apache-airflow/api-report.md b/plugins/apache-airflow/api-report.md
index be2a208bd4..922ad4e868 100644
--- a/plugins/apache-airflow/api-report.md
+++ b/plugins/apache-airflow/api-report.md
@@ -22,7 +22,6 @@ export const apacheAirflowPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 ```
diff --git a/plugins/api-docs/api-report.md b/plugins/api-docs/api-report.md
index 59d490a1fe..2254bf96cd 100644
--- a/plugins/api-docs/api-report.md
+++ b/plugins/api-docs/api-report.md
@@ -54,8 +54,7 @@ const apiDocsPlugin: BackstagePlugin<
   },
   {
     registerApi: ExternalRouteRef<undefined, true>;
-  },
-  {}
+  }
 >;
 export { apiDocsPlugin };
 export { apiDocsPlugin as plugin };
diff --git a/plugins/apollo-explorer/api-report.md b/plugins/apollo-explorer/api-report.md
index 2dd6c14a90..7d06876e89 100644
--- a/plugins/apollo-explorer/api-report.md
+++ b/plugins/apollo-explorer/api-report.md
@@ -38,7 +38,6 @@ export const apolloExplorerPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 ```
diff --git a/plugins/azure-devops/api-report.md b/plugins/azure-devops/api-report.md
index 2c916ec33b..6b33762639 100644
--- a/plugins/azure-devops/api-report.md
+++ b/plugins/azure-devops/api-report.md
@@ -162,7 +162,7 @@ export class AzureDevOpsClient implements AzureDevOpsApi {
 }
 
 // @public (undocumented)
-export const azureDevOpsPlugin: BackstagePlugin<{}, {}, {}>;
+export const azureDevOpsPlugin: BackstagePlugin<{}, {}>;
 
 // @public (undocumented)
 export const AzurePullRequestsIcon: (
diff --git a/plugins/azure-sites/api-report.md b/plugins/azure-sites/api-report.md
index bec89e17bc..abc10ec723 100644
--- a/plugins/azure-sites/api-report.md
+++ b/plugins/azure-sites/api-report.md
@@ -49,7 +49,6 @@ export const azureSitesPlugin: BackstagePlugin<
   {
     entityContent: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/badges/api-report.md b/plugins/badges/api-report.md
index e73a887316..c32b901058 100644
--- a/plugins/badges/api-report.md
+++ b/plugins/badges/api-report.md
@@ -9,7 +9,7 @@ import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { JSX as JSX_2 } from 'react';
 
 // @public (undocumented)
-export const badgesPlugin: BackstagePlugin<{}, {}, {}>;
+export const badgesPlugin: BackstagePlugin<{}, {}>;
 
 // @public (undocumented)
 export const EntityBadgesDialog: (props: {
diff --git a/plugins/bazaar/api-report.md b/plugins/bazaar/api-report.md
index 282983b378..ba0396f81e 100644
--- a/plugins/bazaar/api-report.md
+++ b/plugins/bazaar/api-report.md
@@ -41,7 +41,6 @@ export const bazaarPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/bitrise/api-report.md b/plugins/bitrise/api-report.md
index 7f2e44f04f..cb68d79c51 100644
--- a/plugins/bitrise/api-report.md
+++ b/plugins/bitrise/api-report.md
@@ -13,7 +13,7 @@ import { JSX as JSX_2 } from 'react';
 export const BITRISE_APP_ANNOTATION = 'bitrise.io/app';
 
 // @public (undocumented)
-export const bitrisePlugin: BackstagePlugin<{}, {}, {}>;
+export const bitrisePlugin: BackstagePlugin<{}, {}>;
 
 // @public (undocumented)
 export const EntityBitriseContent: () => JSX_2.Element;
diff --git a/plugins/catalog-graph/api-report.md b/plugins/catalog-graph/api-report.md
index ce56245c49..98a68d8aa2 100644
--- a/plugins/catalog-graph/api-report.md
+++ b/plugins/catalog-graph/api-report.md
@@ -53,8 +53,7 @@ export const catalogGraphPlugin: BackstagePlugin<
       },
       true
     >;
-  },
-  {}
+  }
 >;
 
 // @public
diff --git a/plugins/catalog-import/api-report.md b/plugins/catalog-import/api-report.md
index 7397bfad1d..a513cfe87a 100644
--- a/plugins/catalog-import/api-report.md
+++ b/plugins/catalog-import/api-report.md
@@ -134,7 +134,6 @@ const catalogImportPlugin: BackstagePlugin<
   {
     importPage: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 export { catalogImportPlugin };
diff --git a/plugins/catalog-unprocessed-entities/api-report.md b/plugins/catalog-unprocessed-entities/api-report.md
index 3ded42785a..cc4d6bba88 100644
--- a/plugins/catalog-unprocessed-entities/api-report.md
+++ b/plugins/catalog-unprocessed-entities/api-report.md
@@ -34,7 +34,6 @@ export const catalogUnprocessedEntitiesPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/cicd-statistics/api-report.md b/plugins/cicd-statistics/api-report.md
index b0966aa281..70895d6a63 100644
--- a/plugins/cicd-statistics/api-report.md
+++ b/plugins/cicd-statistics/api-report.md
@@ -85,7 +85,6 @@ export const cicdStatisticsPlugin: BackstagePlugin<
   {
     entityContent: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/circleci/api-report.md b/plugins/circleci/api-report.md
index d706115610..3bb8d4b6f9 100644
--- a/plugins/circleci/api-report.md
+++ b/plugins/circleci/api-report.md
@@ -63,7 +63,7 @@ export const circleCIApiRef: ApiRef<CircleCIApi>;
 export const circleCIBuildRouteRef: SubRouteRef<PathParams<'/:buildId'>>;
 
 // @public (undocumented)
-const circleCIPlugin: BackstagePlugin<{}, {}, {}>;
+const circleCIPlugin: BackstagePlugin<{}, {}>;
 export { circleCIPlugin };
 export { circleCIPlugin as plugin };
 
diff --git a/plugins/cloudbuild/api-report.md b/plugins/cloudbuild/api-report.md
index dc2aacbc18..3fbb15000d 100644
--- a/plugins/cloudbuild/api-report.md
+++ b/plugins/cloudbuild/api-report.md
@@ -104,7 +104,6 @@ const cloudbuildPlugin: BackstagePlugin<
   {
     entityContent: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 export { cloudbuildPlugin };
diff --git a/plugins/code-climate/api-report.md b/plugins/code-climate/api-report.md
index 32359f663f..8243cada75 100644
--- a/plugins/code-climate/api-report.md
+++ b/plugins/code-climate/api-report.md
@@ -42,7 +42,6 @@ export const codeClimatePlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/code-coverage/api-report.md b/plugins/code-coverage/api-report.md
index 5dcb5fcfd1..152cc93103 100644
--- a/plugins/code-coverage/api-report.md
+++ b/plugins/code-coverage/api-report.md
@@ -14,7 +14,6 @@ export const codeCoveragePlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/codescene/api-report.md b/plugins/codescene/api-report.md
index 662968d3c9..99eb2b6256 100644
--- a/plugins/codescene/api-report.md
+++ b/plugins/codescene/api-report.md
@@ -24,7 +24,6 @@ export const codescenePlugin: BackstagePlugin<
       projectId: string;
     }>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/config-schema/api-report.md b/plugins/config-schema/api-report.md
index 95d352d1b7..16630ae8d0 100644
--- a/plugins/config-schema/api-report.md
+++ b/plugins/config-schema/api-report.md
@@ -29,7 +29,6 @@ export const configSchemaPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/devtools/api-report.md b/plugins/devtools/api-report.md
index f0a9280162..21754d7c1e 100644
--- a/plugins/devtools/api-report.md
+++ b/plugins/devtools/api-report.md
@@ -36,7 +36,6 @@ export const devToolsPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/dynatrace/api-report.md b/plugins/dynatrace/api-report.md
index 0f25fc3108..f78b4060fd 100644
--- a/plugins/dynatrace/api-report.md
+++ b/plugins/dynatrace/api-report.md
@@ -10,7 +10,7 @@ import { Entity } from '@backstage/catalog-model';
 import { JSX as JSX_2 } from 'react';
 
 // @public
-export const dynatracePlugin: BackstagePlugin<{}, {}, {}>;
+export const dynatracePlugin: BackstagePlugin<{}, {}>;
 
 // @public
 export const DynatraceTab: () => JSX_2.Element;
diff --git a/plugins/entity-feedback/api-report.md b/plugins/entity-feedback/api-report.md
index d61394ab9a..27e56e5282 100644
--- a/plugins/entity-feedback/api-report.md
+++ b/plugins/entity-feedback/api-report.md
@@ -70,7 +70,6 @@ export const entityFeedbackPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/entity-validation/api-report.md b/plugins/entity-validation/api-report.md
index 48b309cfaa..9d69458ed0 100644
--- a/plugins/entity-validation/api-report.md
+++ b/plugins/entity-validation/api-report.md
@@ -20,7 +20,6 @@ export const entityValidationPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/example-todo-list/api-report.md b/plugins/example-todo-list/api-report.md
index 1b7aa49a19..2feeeb903d 100644
--- a/plugins/example-todo-list/api-report.md
+++ b/plugins/example-todo-list/api-report.md
@@ -17,7 +17,6 @@ export const todoListPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/explore/api-report.md b/plugins/explore/api-report.md
index 193efb044d..d32a133685 100644
--- a/plugins/explore/api-report.md
+++ b/plugins/explore/api-report.md
@@ -99,8 +99,7 @@ const explorePlugin: BackstagePlugin<
       },
       true
     >;
-  },
-  {}
+  }
 >;
 export { explorePlugin };
 export { explorePlugin as plugin };
diff --git a/plugins/firehydrant/api-report.md b/plugins/firehydrant/api-report.md
index 76ccd8f019..9eeac41576 100644
--- a/plugins/firehydrant/api-report.md
+++ b/plugins/firehydrant/api-report.md
@@ -18,7 +18,6 @@ export const firehydrantPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/fossa/api-report.md b/plugins/fossa/api-report.md
index ac76ff6af6..6be878d434 100644
--- a/plugins/fossa/api-report.md
+++ b/plugins/fossa/api-report.md
@@ -31,7 +31,6 @@ export const fossaPlugin: BackstagePlugin<
   {
     fossaOverview: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 ```
diff --git a/plugins/gcalendar/api-report.md b/plugins/gcalendar/api-report.md
index 3f1d42d239..f1f505fc9a 100644
--- a/plugins/gcalendar/api-report.md
+++ b/plugins/gcalendar/api-report.md
@@ -51,7 +51,6 @@ export const gcalendarPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/gcp-projects/api-report.md b/plugins/gcp-projects/api-report.md
index fd156687c0..e6938485fc 100644
--- a/plugins/gcp-projects/api-report.md
+++ b/plugins/gcp-projects/api-report.md
@@ -48,7 +48,6 @@ const gcpProjectsPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 export { gcpProjectsPlugin };
diff --git a/plugins/git-release-manager/api-report.md b/plugins/git-release-manager/api-report.md
index a3215041f0..3e4c0847a7 100644
--- a/plugins/git-release-manager/api-report.md
+++ b/plugins/git-release-manager/api-report.md
@@ -263,7 +263,6 @@ export const gitReleaseManagerPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/github-actions/api-report.md b/plugins/github-actions/api-report.md
index e7c6114c93..887556f431 100644
--- a/plugins/github-actions/api-report.md
+++ b/plugins/github-actions/api-report.md
@@ -177,7 +177,6 @@ const githubActionsPlugin: BackstagePlugin<
   {
     entityContent: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 export { githubActionsPlugin };
diff --git a/plugins/github-deployments/api-report.md b/plugins/github-deployments/api-report.md
index 669bcd74ba..26bb108d86 100644
--- a/plugins/github-deployments/api-report.md
+++ b/plugins/github-deployments/api-report.md
@@ -43,7 +43,7 @@ export type GithubDeployment = {
 };
 
 // @public (undocumented)
-export const githubDeploymentsPlugin: BackstagePlugin<{}, {}, {}>;
+export const githubDeploymentsPlugin: BackstagePlugin<{}, {}>;
 
 // @public (undocumented)
 export const GithubDeploymentsTable: {
diff --git a/plugins/github-issues/api-report.md b/plugins/github-issues/api-report.md
index 3c7b616f82..0efa863a01 100644
--- a/plugins/github-issues/api-report.md
+++ b/plugins/github-issues/api-report.md
@@ -52,7 +52,6 @@ export const githubIssuesPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/gitops-profiles/api-report.md b/plugins/gitops-profiles/api-report.md
index 3dc3c9add2..97f3a9864b 100644
--- a/plugins/gitops-profiles/api-report.md
+++ b/plugins/gitops-profiles/api-report.md
@@ -124,7 +124,6 @@ const gitopsProfilesPlugin: BackstagePlugin<
     }>;
     createPage: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 export { gitopsProfilesPlugin };
diff --git a/plugins/gocd/api-report.md b/plugins/gocd/api-report.md
index df93b5f2eb..de2c76e06b 100644
--- a/plugins/gocd/api-report.md
+++ b/plugins/gocd/api-report.md
@@ -15,7 +15,7 @@ export const EntityGoCdContent: () => JSX.Element;
 export const GOCD_PIPELINES_ANNOTATION = 'gocd.org/pipelines';
 
 // @public
-export const gocdPlugin: BackstagePlugin<{}, {}, {}>;
+export const gocdPlugin: BackstagePlugin<{}, {}>;
 
 // @public
 export const isGoCdAvailable: (entity: Entity) => boolean;
diff --git a/plugins/graphiql/api-report.md b/plugins/graphiql/api-report.md
index cbecc37006..984b90ae88 100644
--- a/plugins/graphiql/api-report.md
+++ b/plugins/graphiql/api-report.md
@@ -44,7 +44,7 @@ export const GraphiQLIcon: IconComponent;
 export const GraphiQLPage: () => JSX_2.Element;
 
 // @public (undocumented)
-const graphiqlPlugin: BackstagePlugin<{}, {}, {}>;
+const graphiqlPlugin: BackstagePlugin<{}, {}>;
 export { graphiqlPlugin };
 export { graphiqlPlugin as plugin };
 
diff --git a/plugins/graphql-voyager/api-report.md b/plugins/graphql-voyager/api-report.md
index 257a8ca7b7..e926bbd193 100644
--- a/plugins/graphql-voyager/api-report.md
+++ b/plugins/graphql-voyager/api-report.md
@@ -59,7 +59,6 @@ export const graphqlVoyagerPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/home/api-report.md b/plugins/home/api-report.md
index 450bc054fa..497b11224d 100644
--- a/plugins/home/api-report.md
+++ b/plugins/home/api-report.md
@@ -137,7 +137,6 @@ export const homePlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/ilert/api-report.md b/plugins/ilert/api-report.md
index b2081e049e..821a3a6bd0 100644
--- a/plugins/ilert/api-report.md
+++ b/plugins/ilert/api-report.md
@@ -539,7 +539,6 @@ const ilertPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 export { ilertPlugin };
diff --git a/plugins/jenkins/api-report.md b/plugins/jenkins/api-report.md
index 0782f0abd2..611a56cd5f 100644
--- a/plugins/jenkins/api-report.md
+++ b/plugins/jenkins/api-report.md
@@ -99,7 +99,6 @@ const jenkinsPlugin: BackstagePlugin<
   {
     entityContent: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 export { jenkinsPlugin };
diff --git a/plugins/kafka/api-report.md b/plugins/kafka/api-report.md
index 990a4da295..ba0c9a3820 100644
--- a/plugins/kafka/api-report.md
+++ b/plugins/kafka/api-report.md
@@ -28,7 +28,6 @@ const kafkaPlugin: BackstagePlugin<
   {
     entityContent: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 export { kafkaPlugin };
diff --git a/plugins/kubernetes/api-report.md b/plugins/kubernetes/api-report.md
index 77ec8dd19c..d1c1748758 100644
--- a/plugins/kubernetes/api-report.md
+++ b/plugins/kubernetes/api-report.md
@@ -513,7 +513,6 @@ const kubernetesPlugin: BackstagePlugin<
   {
     entityContent: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 export { kubernetesPlugin };
diff --git a/plugins/lighthouse/api-report.md b/plugins/lighthouse/api-report.md
index 9794fe1728..40a4ff514f 100644
--- a/plugins/lighthouse/api-report.md
+++ b/plugins/lighthouse/api-report.md
@@ -49,7 +49,6 @@ const lighthousePlugin: BackstagePlugin<
     root: RouteRef<undefined>;
     entityContent: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 export { lighthousePlugin };
diff --git a/plugins/linguist/api-report.md b/plugins/linguist/api-report.md
index 5182ce12f6..71e2460088 100644
--- a/plugins/linguist/api-report.md
+++ b/plugins/linguist/api-report.md
@@ -16,7 +16,7 @@ export const EntityLinguistCard: () => JSX_2.Element;
 export const isLinguistAvailable: (entity: Entity) => boolean;
 
 // @public (undocumented)
-export const linguistPlugin: BackstagePlugin<{}, {}, {}>;
+export const linguistPlugin: BackstagePlugin<{}, {}>;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/newrelic-dashboard/api-report.md b/plugins/newrelic-dashboard/api-report.md
index 2e9b11a88e..ce7b8d5b7e 100644
--- a/plugins/newrelic-dashboard/api-report.md
+++ b/plugins/newrelic-dashboard/api-report.md
@@ -31,7 +31,6 @@ export const newRelicDashboardPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/newrelic/api-report.md b/plugins/newrelic/api-report.md
index 04fd229465..a77b80c862 100644
--- a/plugins/newrelic/api-report.md
+++ b/plugins/newrelic/api-report.md
@@ -17,7 +17,6 @@ const newRelicPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 export { newRelicPlugin };
diff --git a/plugins/nomad/api-report.md b/plugins/nomad/api-report.md
index c2d06b9892..68cc47c33d 100644
--- a/plugins/nomad/api-report.md
+++ b/plugins/nomad/api-report.md
@@ -28,7 +28,6 @@ export const nomadPlugin: BackstagePlugin<
     root: RouteRef<undefined>;
     entityContent: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/octopus-deploy/api-report.md b/plugins/octopus-deploy/api-report.md
index 713d99aa8f..3d65e40c64 100644
--- a/plugins/octopus-deploy/api-report.md
+++ b/plugins/octopus-deploy/api-report.md
@@ -55,7 +55,7 @@ export type OctopusDeployment = {
 };
 
 // @public (undocumented)
-export const octopusDeployPlugin: BackstagePlugin<{}, {}, {}>;
+export const octopusDeployPlugin: BackstagePlugin<{}, {}>;
 
 // @public (undocumented)
 export type OctopusEnvironment = {
diff --git a/plugins/opencost/api-report.md b/plugins/opencost/api-report.md
index 079f394618..996bcea6ac 100644
--- a/plugins/opencost/api-report.md
+++ b/plugins/opencost/api-report.md
@@ -17,7 +17,6 @@ export const openCostPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 ```
diff --git a/plugins/org/api-report.md b/plugins/org/api-report.md
index d85df7125c..922b25b610 100644
--- a/plugins/org/api-report.md
+++ b/plugins/org/api-report.md
@@ -69,8 +69,7 @@ const orgPlugin: BackstagePlugin<
   {},
   {
     catalogIndex: ExternalRouteRef<undefined, false>;
-  },
-  {}
+  }
 >;
 export { orgPlugin };
 export { orgPlugin as plugin };
diff --git a/plugins/pagerduty/api-report.md b/plugins/pagerduty/api-report.md
index 24c2e103cf..db73259dd5 100644
--- a/plugins/pagerduty/api-report.md
+++ b/plugins/pagerduty/api-report.md
@@ -177,7 +177,7 @@ export type PagerDutyOnCallsResponse = {
 };
 
 // @public (undocumented)
-const pagerDutyPlugin: BackstagePlugin<{}, {}, {}>;
+const pagerDutyPlugin: BackstagePlugin<{}, {}>;
 export { pagerDutyPlugin };
 export { pagerDutyPlugin as plugin };
 
diff --git a/plugins/periskop/api-report.md b/plugins/periskop/api-report.md
index 578fb1dc49..607cbbb4d0 100644
--- a/plugins/periskop/api-report.md
+++ b/plugins/periskop/api-report.md
@@ -120,7 +120,7 @@ export class PeriskopClient implements PeriskopApi {
 }
 
 // @public (undocumented)
-export const periskopPlugin: BackstagePlugin<{}, {}, {}>;
+export const periskopPlugin: BackstagePlugin<{}, {}>;
 
 // @public (undocumented)
 export interface RequestHeaders {
diff --git a/plugins/playlist/api-report.md b/plugins/playlist/api-report.md
index cf0ebe8a37..be7605d1e6 100644
--- a/plugins/playlist/api-report.md
+++ b/plugins/playlist/api-report.md
@@ -101,7 +101,6 @@ export const playlistPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 ```
diff --git a/plugins/puppetdb/api-report.md b/plugins/puppetdb/api-report.md
index c7d1d0ff0e..890980591f 100644
--- a/plugins/puppetdb/api-report.md
+++ b/plugins/puppetdb/api-report.md
@@ -20,7 +20,7 @@ export const isPuppetDbAvailable: (entity: Entity) => boolean;
 export const PuppetDbPage: () => JSX_2.Element;
 
 // @public
-const puppetdbPlugin: BackstagePlugin<{}, {}, {}>;
+const puppetdbPlugin: BackstagePlugin<{}, {}>;
 export { puppetdbPlugin as plugin };
 export { puppetdbPlugin };
 
diff --git a/plugins/rollbar/api-report.md b/plugins/rollbar/api-report.md
index 45c672e7bb..c59475466f 100644
--- a/plugins/rollbar/api-report.md
+++ b/plugins/rollbar/api-report.md
@@ -196,7 +196,6 @@ const rollbarPlugin: BackstagePlugin<
   {
     entityContent: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 export { rollbarPlugin as plugin };
diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md
index a776628da5..ddda40d95f 100644
--- a/plugins/scaffolder/api-report.md
+++ b/plugins/scaffolder/api-report.md
@@ -561,8 +561,7 @@ export const scaffolderPlugin: BackstagePlugin<
       },
       true
     >;
-  },
-  {}
+  }
 >;
 
 // @public @deprecated (undocumented)
diff --git a/plugins/search/api-report.md b/plugins/search/api-report.md
index 616b63bd31..64f596ab11 100644
--- a/plugins/search/api-report.md
+++ b/plugins/search/api-report.md
@@ -71,7 +71,6 @@ const searchPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 export { searchPlugin as plugin };
diff --git a/plugins/sentry/api-report.md b/plugins/sentry/api-report.md
index 43a5caa0bd..dc5fb69556 100644
--- a/plugins/sentry/api-report.md
+++ b/plugins/sentry/api-report.md
@@ -138,7 +138,6 @@ const sentryPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 export { sentryPlugin as plugin };
diff --git a/plugins/shortcuts/api-report.md b/plugins/shortcuts/api-report.md
index ae8225d5b5..64d9d15156 100644
--- a/plugins/shortcuts/api-report.md
+++ b/plugins/shortcuts/api-report.md
@@ -58,7 +58,7 @@ export const Shortcuts: (props: ShortcutsProps) => JSX_2.Element;
 export const shortcutsApiRef: ApiRef<ShortcutApi>;
 
 // @public (undocumented)
-export const shortcutsPlugin: BackstagePlugin<{}, {}, {}>;
+export const shortcutsPlugin: BackstagePlugin<{}, {}>;
 
 // @public
 export interface ShortcutsProps {
diff --git a/plugins/sonarqube/api-report.md b/plugins/sonarqube/api-report.md
index 72f2eb1c09..32894b6eeb 100644
--- a/plugins/sonarqube/api-report.md
+++ b/plugins/sonarqube/api-report.md
@@ -71,5 +71,5 @@ export type SonarQubeContentPageProps = {
 };
 
 // @public (undocumented)
-export const sonarQubePlugin: BackstagePlugin<{}, {}, {}>;
+export const sonarQubePlugin: BackstagePlugin<{}, {}>;
 ```
diff --git a/plugins/splunk-on-call/api-report.md b/plugins/splunk-on-call/api-report.md
index 4c054e8a1a..d80ee6f874 100644
--- a/plugins/splunk-on-call/api-report.md
+++ b/plugins/splunk-on-call/api-report.md
@@ -240,7 +240,6 @@ const splunkOnCallPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 export { splunkOnCallPlugin as plugin };
diff --git a/plugins/stack-overflow/api-report.md b/plugins/stack-overflow/api-report.md
index 4277aaac24..293c2ac226 100644
--- a/plugins/stack-overflow/api-report.md
+++ b/plugins/stack-overflow/api-report.md
@@ -32,7 +32,7 @@ export const stackOverflowApiRef: ApiRef<StackOverflowApi>;
 export const StackOverflowIcon: () => React_2.JSX.Element;
 
 // @public
-export const stackOverflowPlugin: BackstagePlugin<{}, {}, {}>;
+export const stackOverflowPlugin: BackstagePlugin<{}, {}>;
 
 // @public
 export type StackOverflowQuestion = {
diff --git a/plugins/stackstorm/api-report.md b/plugins/stackstorm/api-report.md
index f6279be1bd..14f09c3202 100644
--- a/plugins/stackstorm/api-report.md
+++ b/plugins/stackstorm/api-report.md
@@ -25,7 +25,6 @@ export const stackstormPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 ```
diff --git a/plugins/tech-insights/api-report.md b/plugins/tech-insights/api-report.md
index 14fe512ba0..92f66c14b3 100644
--- a/plugins/tech-insights/api-report.md
+++ b/plugins/tech-insights/api-report.md
@@ -125,7 +125,6 @@ export const techInsightsPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 
diff --git a/plugins/tech-radar/api-report.md b/plugins/tech-radar/api-report.md
index f55f0ee39e..178fc202cd 100644
--- a/plugins/tech-radar/api-report.md
+++ b/plugins/tech-radar/api-report.md
@@ -106,7 +106,6 @@ const techRadarPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 export { techRadarPlugin as plugin };
diff --git a/plugins/techdocs-module-addons-contrib/api-report.md b/plugins/techdocs-module-addons-contrib/api-report.md
index c242bb02f2..48e6b2bcdc 100644
--- a/plugins/techdocs-module-addons-contrib/api-report.md
+++ b/plugins/techdocs-module-addons-contrib/api-report.md
@@ -34,7 +34,7 @@ export type ReportIssueTemplateBuilder = (options: {
 }) => ReportIssueTemplate;
 
 // @public
-export const techdocsModuleAddonsContribPlugin: BackstagePlugin<{}, {}, {}>;
+export const techdocsModuleAddonsContribPlugin: BackstagePlugin<{}, {}>;
 
 // @public
 export const TextSize: () => JSX.Element | null;
diff --git a/plugins/techdocs/api-report.md b/plugins/techdocs/api-report.md
index 3207a16f87..761de92f77 100644
--- a/plugins/techdocs/api-report.md
+++ b/plugins/techdocs/api-report.md
@@ -318,7 +318,6 @@ const techdocsPlugin: BackstagePlugin<
     }>;
     entityContent: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 export { techdocsPlugin as plugin };
diff --git a/plugins/todo/api-report.md b/plugins/todo/api-report.md
index ae4c4f3645..215d1730bc 100644
--- a/plugins/todo/api-report.md
+++ b/plugins/todo/api-report.md
@@ -85,7 +85,6 @@ export const todoPlugin: BackstagePlugin<
   {
     entityContent: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 ```
diff --git a/plugins/user-settings/api-report.md b/plugins/user-settings/api-report.md
index cdb576c45c..b92677f8ce 100644
--- a/plugins/user-settings/api-report.md
+++ b/plugins/user-settings/api-report.md
@@ -112,7 +112,6 @@ const userSettingsPlugin: BackstagePlugin<
   {
     settingsPage: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 export { userSettingsPlugin as plugin };
diff --git a/plugins/vault/api-report.md b/plugins/vault/api-report.md
index da13e2092d..59bcb1c527 100644
--- a/plugins/vault/api-report.md
+++ b/plugins/vault/api-report.md
@@ -33,7 +33,7 @@ export interface VaultApi {
 export const vaultApiRef: ApiRef<VaultApi>;
 
 // @public
-export const vaultPlugin: BackstagePlugin<{}, {}, {}>;
+export const vaultPlugin: BackstagePlugin<{}, {}>;
 
 // @public
 export type VaultSecret = {
diff --git a/plugins/xcmetrics/api-report.md b/plugins/xcmetrics/api-report.md
index 4cbac0683c..94a2d4afcd 100644
--- a/plugins/xcmetrics/api-report.md
+++ b/plugins/xcmetrics/api-report.md
@@ -17,7 +17,6 @@ export const xcmetricsPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
   },
-  {},
   {}
 >;
 ```