diff --git a/docker/run.sh b/docker/run.sh
index 469fdd08cf..9cecd88f63 100755
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -22,7 +22,7 @@ function inject_config() {
   >&2 echo "Runtime app config: $config"
 
   local main_js
-  if ! main_js="$(grep -l __APP_INJECTED_RUNTIME_CONFIG__ /usr/share/nginx/html/*.chunk.js)"; then
+  if ! main_js="$(grep -l __APP_INJECTED_RUNTIME_CONFIG__ /usr/share/nginx/html/static/*.js)"; then
     echo "Runtime config already written"
     return
   fi
diff --git a/packages/cli/src/lib/bundler/config.ts b/packages/cli/src/lib/bundler/config.ts
index 0eaac9ad2d..56150ad968 100644
--- a/packages/cli/src/lib/bundler/config.ts
+++ b/packages/cli/src/lib/bundler/config.ts
@@ -25,11 +25,6 @@ import { Config } from '@backstage/config';
 import { BundlingPaths } from './paths';
 import { transforms } from './transforms';
 import { BundlingOptions, BackendBundlingOptions } from './types';
-// import checkRequiredFiles from 'react-dev-utils/checkRequiredFiles';
-// import ModuleNotFoundPlugin from 'react-dev-utils/ModuleNotFoundPlugin';
-// import errorOverlayMiddleware from 'react-dev-utils/errorOverlayMiddleware';
-// import evalSourceMapMiddleware from 'react-dev-utils/evalSourceMapMiddleware';
-// import WatchMissingNodeModulesPlugin from 'react-dev-utils/WatchMissingNodeModulesPlugin';
 
 export function resolveBaseUrl(config: Config): URL {
   const baseUrl = config.getString('app.baseUrl');
@@ -126,10 +121,10 @@ export function createConfig(
     output: {
       path: paths.targetDist,
       publicPath: validBaseUrl.pathname,
-      filename: isDev ? '[name].js' : '[name].[hash:8].js',
+      filename: isDev ? '[name].js' : 'static/[name].[hash:8].js',
       chunkFilename: isDev
         ? '[name].chunk.js'
-        : '[name].[chunkhash:8].chunk.js',
+        : 'static/[name].[chunkhash:8].chunk.js',
     },
     plugins,
   };
diff --git a/packages/cli/src/lib/bundler/optimization.ts b/packages/cli/src/lib/bundler/optimization.ts
index 03168b376d..acd6a937d9 100644
--- a/packages/cli/src/lib/bundler/optimization.ts
+++ b/packages/cli/src/lib/bundler/optimization.ts
@@ -46,7 +46,7 @@ export const optimization = (
           },
           filename: isDev
             ? 'module-[name].js'
-            : 'module-[name].[chunkhash:8].js',
+            : 'static/module-[name].[chunkhash:8].js',
           priority: 10,
           minSize: 100000,
           minChunks: 1,
diff --git a/packages/cli/src/lib/bundler/transforms.ts b/packages/cli/src/lib/bundler/transforms.ts
index b498482f8a..d8186dac66 100644
--- a/packages/cli/src/lib/bundler/transforms.ts
+++ b/packages/cli/src/lib/bundler/transforms.ts
@@ -79,7 +79,7 @@ export const transforms = (
       loader: require.resolve('url-loader'),
       options: {
         limit: 10000,
-        name: 'static/media/[name].[hash:8].[ext]',
+        name: 'static/[name].[hash:8].[ext]',
       },
     },
     {
@@ -111,8 +111,8 @@ export const transforms = (
   } else {
     plugins.push(
       new MiniCssExtractPlugin({
-        filename: '[name].[contenthash:8].css',
-        chunkFilename: '[name].[id].[contenthash:8].css',
+        filename: 'static/[name].[contenthash:8].css',
+        chunkFilename: 'static/[name].[id].[contenthash:8].css',
       }),
     );
   }