diff --git a/packages/react-scripts/scripts/utils/frontierInit.js b/packages/react-scripts/scripts/utils/frontierInit.js
index 876e4385d86..51b6df4409b 100644
--- a/packages/react-scripts/scripts/utils/frontierInit.js
+++ b/packages/react-scripts/scripts/utils/frontierInit.js
@@ -60,7 +60,7 @@ function installFrontierDependencies(appPath, appName, answers, ownPath) {
       '@fs/zion-user',
       '@fs/zion-router',
       '@fs/zion-subnav',
-      '@fs/zion-error-boundary',
+      '@fs/zion-root',
       '@fs/zion-style-normalize',
       'http-proxy-middleware@0.19',
       '@emotion/core@10',
diff --git a/packages/react-scripts/template/src/index.js b/packages/react-scripts/template/src/index.js
index 11d1e44f253..89e59756ba0 100644
--- a/packages/react-scripts/template/src/index.js
+++ b/packages/react-scripts/template/src/index.js
@@ -1,8 +1,7 @@
-import React, { Suspense } from 'react'
+import React from 'react'
 import ReactDOM from 'react-dom'
-import { UserProvider } from '@fs/zion-user'
-import RootErrorBoundary from '@fs/zion-error-boundary'
-import { I18nProvider, addTranslations } from '@fs/zion-locale'
+import Root from '@fs/zion-root'
+import { addTranslations } from '@fs/zion-locale'
 import { Router, NotFound } from '@fs/zion-router'
 import App from './components/App'
 import * as serviceWorker from './serviceWorker'
@@ -13,18 +12,12 @@ addTranslations(translations)
 const base = window.SERVER_DATA ? new URL(window.SERVER_DATA.appPath).pathname : ''
 
 const FrontierRoot = () => (
-  <RootErrorBoundary>
-    <Suspense fallback="Loading ...">
-      <I18nProvider>
-        <UserProvider>
-          <Router>
-            <App path={`${base}/*`} />
-            <NotFound default />
-          </Router>
-        </UserProvider>
-      </I18nProvider>
-    </Suspense>
-  </RootErrorBoundary>
+  <Root>
+    <Router>
+      <App path={`${base}/*`} />
+      <NotFound default />
+    </Router>
+  </Root>
 )
 
 ReactDOM.render(<FrontierRoot />, document.getElementById('root'))