diff --git a/v1/lib/server/docs.js b/v1/lib/server/docs.js
index 394a242f1621..dd9549c17505 100644
--- a/v1/lib/server/docs.js
+++ b/v1/lib/server/docs.js
@@ -111,7 +111,10 @@ function getMarkup(rawContent, mdToHtml, metadata) {
   content = mdToHtmlify(content, mdToHtml, metadata);
 
   // replace any relative links to static assets (not in fenced code blocks) to absolute links
-  content = replaceAssetsLink(content, `${siteConfig.baseUrl}docs`);
+  const docsAssetsLocation = siteConfig.docsUrl
+    ? `${siteConfig.baseUrl}${siteConfig.docsUrl}`
+    : siteConfig.baseUrl.substring(0, siteConfig.baseUrl.length - 1);
+  content = replaceAssetsLink(content, docsAssetsLocation);
 
   const DocsLayout = require('../core/DocsLayout.js');
   return renderToStaticMarkupWithDoctype(
diff --git a/v1/lib/server/generate.js b/v1/lib/server/generate.js
index ff3019843788..a41850e92a4a 100644
--- a/v1/lib/server/generate.js
+++ b/v1/lib/server/generate.js
@@ -101,7 +101,7 @@ async function execute() {
   if (fs.existsSync(join(CWD, '..', readMetadata.getDocsPath(), 'assets'))) {
     fs.copySync(
       join(CWD, '..', readMetadata.getDocsPath(), 'assets'),
-      join(buildDir, 'docs', 'assets'),
+      join(buildDir, siteConfig.docsUrl, 'assets'),
     );
   }