diff --git a/src/fireedge/src/server/routes/entrypoints/App.js b/src/fireedge/src/server/routes/entrypoints/App.js
index eefa7661e79..43a4c3a0c8d 100644
--- a/src/fireedge/src/server/routes/entrypoints/App.js
+++ b/src/fireedge/src/server/routes/entrypoints/App.js
@@ -57,9 +57,6 @@ router.get('*', (req, res) => {
 
   // production
   if (env && (!env.NODE_ENV || (env.NODE_ENV && env.NODE_ENV !== defaultWebpackMode))) {
-    const App = require('../../../client/dev/_app.js').default
-    const sheets = new ServerStyleSheets()
-    const composeEnhancer = (root && root.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) || compose
     const apps = Object.keys(defaultApps)
     const parseUrl = req.url.split(/\//gi).filter(sub => sub && sub.length > 0)
 
@@ -70,6 +67,10 @@ router.get('*', (req, res) => {
       }
     })
 
+    const App = require(`../../../client/apps/${app}/index.js`).default
+    const sheets = new ServerStyleSheets()
+    const composeEnhancer = (root && root.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) || compose
+
     // loadable
     const statsFile = path.resolve(__dirname, 'client', app + defaultFileStats)
     const extractor = new ChunkExtractor({ statsFile })
diff --git a/src/fireedge/webpack.config.prod.client.js b/src/fireedge/webpack.config.prod.client.js
index 1758acab77a..1cd51bb459a 100644
--- a/src/fireedge/webpack.config.prod.client.js
+++ b/src/fireedge/webpack.config.prod.client.js
@@ -31,7 +31,7 @@ const js = {
  * @param {object} {assets, appname}
  * @returns {object} webpack config
  */
-const bundle = ({ assets = false, name = 'flow' }) => {
+const bundle = ({ assets = false, name = 'sunstone' }) => {
   const plugins = [
     new TimeFixPlugin(),
     new webpack.DefinePlugin({