diff --git a/packages/docusaurus/src/commands/start.ts b/packages/docusaurus/src/commands/start.ts
index 4cc19f12ab8d..4d748c585c63 100644
--- a/packages/docusaurus/src/commands/start.ts
+++ b/packages/docusaurus/src/commands/start.ts
@@ -128,7 +128,7 @@ export default async function start(
       new HtmlWebpackPlugin({
         template: path.resolve(
           __dirname,
-          '../client/templates/index.html.template.ejs',
+          '../webpack/templates/index.html.template.ejs',
         ),
         // So we can define the position where the scripts are injected.
         inject: false,
diff --git a/packages/docusaurus/src/server/index.ts b/packages/docusaurus/src/server/index.ts
index 1b99a83754fd..9e5618106d8f 100644
--- a/packages/docusaurus/src/server/index.ts
+++ b/packages/docusaurus/src/server/index.ts
@@ -14,7 +14,7 @@ import {
 } from '@docusaurus/utils';
 import path from 'path';
 import logger from '@docusaurus/logger';
-import ssrDefaultTemplate from '../client/templates/ssr.html.template';
+import ssrDefaultTemplate from '../webpack/templates/ssr.html.template';
 import loadClientModules from './client-modules';
 import loadConfig from './config';
 import {loadPlugins} from './plugins';
diff --git a/packages/docusaurus/src/client/templates/index.html.template.ejs b/packages/docusaurus/src/webpack/templates/index.html.template.ejs
similarity index 100%
rename from packages/docusaurus/src/client/templates/index.html.template.ejs
rename to packages/docusaurus/src/webpack/templates/index.html.template.ejs
diff --git a/packages/docusaurus/src/client/templates/ssr.html.template.ts b/packages/docusaurus/src/webpack/templates/ssr.html.template.ts
similarity index 100%
rename from packages/docusaurus/src/client/templates/ssr.html.template.ts
rename to packages/docusaurus/src/webpack/templates/ssr.html.template.ts