diff --git a/packages/techdocs-common/src/stages/publish/local.ts b/packages/techdocs-common/src/stages/publish/local.ts
index b8ccf7df8a..76489ce01a 100644
--- a/packages/techdocs-common/src/stages/publish/local.ts
+++ b/packages/techdocs-common/src/stages/publish/local.ts
@@ -23,7 +23,6 @@ import { Entity, EntityName } from '@backstage/catalog-model';
 import {
   resolvePackagePath,
   PluginEndpointDiscovery,
-  SingleHostDiscovery,
 } from '@backstage/backend-common';
 import { Config } from '@backstage/config';
 import {
@@ -143,10 +142,9 @@ export class LocalPublish implements PublisherBase {
   }
 
   async getStorageUrl() {
-    const discoveryApi = SingleHostDiscovery.fromConfig(this.config);
     return (
       this.config.getOptionalString('techdocs.storageUrl') ??
-      (await discoveryApi.getBaseUrl('techdocs'))
+      (await this.discovery.getBaseUrl('techdocs'))
     );
   }
 
diff --git a/plugins/techdocs-backend/src/service/router.ts b/plugins/techdocs-backend/src/service/router.ts
index 7d232e9ea1..fe7b52ab52 100644
--- a/plugins/techdocs-backend/src/service/router.ts
+++ b/plugins/techdocs-backend/src/service/router.ts
@@ -26,10 +26,7 @@ import {
   PublisherBase,
   getLocationForEntity,
 } from '@backstage/techdocs-common';
-import {
-  PluginEndpointDiscovery,
-  SingleHostDiscovery,
-} from '@backstage/backend-common';
+import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { Entity } from '@backstage/catalog-model';
 import { getEntityNameFromUrlPath } from './helpers';
 import { DocsBuilder } from '../DocsBuilder';
@@ -105,10 +102,9 @@ export async function createRouter({
 
   router.get('/docs/:namespace/:kind/:name/*', async (req, res) => {
     const { kind, namespace, name } = req.params;
-    const discoveryApi = SingleHostDiscovery.fromConfig(config);
     const storageUrl =
       config.getOptionalString('techdocs.storageUrl') ??
-      `${await discoveryApi.getBaseUrl('techdocs')}/static/docs`;
+      `${await discovery.getBaseUrl('techdocs')}/static/docs`;
 
     const catalogUrl = await discovery.getBaseUrl('catalog');
     const triple = [kind, namespace, name].map(encodeURIComponent).join('/');