diff --git a/packages/cli/src/commands/build/buildFrontend.ts b/packages/cli/src/commands/build/buildFrontend.ts
index 931a3b376a..62da74e6d3 100644
--- a/packages/cli/src/commands/build/buildFrontend.ts
+++ b/packages/cli/src/commands/build/buildFrontend.ts
@@ -19,29 +19,52 @@ import { resolve as resolvePath } from 'path';
 import { buildBundle } from '../../lib/bundler';
 import { getEnvironmentParallelism } from '../../lib/parallel';
 import { loadCliConfig } from '../../lib/config';
+import chalk from 'chalk';
+import { BuildOptions } from '../../lib/bundler/types';
 
 interface BuildAppOptions {
   targetDir: string;
   writeStats: boolean;
   configPaths: string[];
-  moduleFederationMode?: 'host' | 'remote';
+  isModuleFederationRemote?: true;
+}
+
+function getModuleFederationOptions(
+  name: string,
+  isRemote?: boolean,
+): BuildOptions['moduleFederation'] {
+  if (!isRemote && !process.env.EXPERIMENTAL_MODULE_FEDERATION) {
+    return undefined;
+  }
+
+  console.log(
+    chalk.yellow(
+      `⚠️  WARNING: Module federation is experimental and will receive immediate breaking changes in the future.`,
+    ),
+  );
+
+  return {
+    mode: isRemote ? 'remote' : 'host',
+    // The default output mode requires the name to be a usable as a code
+    // symbol, there might be better options here but for now we need to
+    // sanitize the name.
+    name: name.replaceAll('@', '').replaceAll('/', '__').replaceAll('-', '_'),
+  };
 }
 
 export async function buildFrontend(options: BuildAppOptions) {
   const { targetDir, writeStats, configPaths } = options;
   const { name } = await fs.readJson(resolvePath(targetDir, 'package.json'));
+
   await buildBundle({
     targetDir,
     entry: 'src/index',
     parallelism: getEnvironmentParallelism(),
     statsJsonEnabled: writeStats,
-    moduleFederation: options.moduleFederationMode && {
-      // The default output mode requires the name to be a usable as a code
-      // symbol, there might be better options here but for now we need to
-      // sanitize the name.
-      name: name.replaceAll('@', '').replaceAll(/[/\\_-]/g, '_'),
-      mode: options.moduleFederationMode,
-    },
+    moduleFederation: getModuleFederationOptions(
+      name,
+      options.isModuleFederationRemote,
+    ),
     ...(await loadCliConfig({
       args: configPaths,
       fromPackage: name,
diff --git a/packages/cli/src/commands/build/command.ts b/packages/cli/src/commands/build/command.ts
index f868ca462c..c0ad3c912b 100644
--- a/packages/cli/src/commands/build/command.ts
+++ b/packages/cli/src/commands/build/command.ts
@@ -36,19 +36,10 @@ export async function command(opts: OptionValues): Promise<void> {
     });
 
     if (role === 'frontend') {
-      const enableModuleFederation = process.env.EXPERIMENTAL_MODULE_FEDERATION;
-      if (enableModuleFederation) {
-        console.log(
-          chalk.yellow(
-            `⚠️  WARNING: Module federation is experimental and will receive immediate breaking changes in the future.`,
-          ),
-        );
-      }
       return buildFrontend({
         targetDir: paths.targetDir,
         configPaths,
         writeStats: Boolean(opts.stats),
-        moduleFederationMode: enableModuleFederation ? 'host' : undefined,
       });
     }
     return buildBackend({
@@ -70,7 +61,7 @@ export async function command(opts: OptionValues): Promise<void> {
       targetDir: paths.targetDir,
       configPaths: [],
       writeStats: Boolean(opts.stats),
-      moduleFederationMode: 'remote',
+      isModuleFederationRemote: true,
     });
   }