diff --git a/packages/cli/src/commands/experimental/setupRscHandler.js b/packages/cli/src/commands/experimental/setupRscHandler.js
index 7be4c3a84bc8..2dac190ec12e 100644
--- a/packages/cli/src/commands/experimental/setupRscHandler.js
+++ b/packages/cli/src/commands/experimental/setupRscHandler.js
@@ -251,7 +251,6 @@ export const handler = async ({ force, verbose }) => {
           indexHtml = indexHtml.replace(
             'href="/favicon.png" />',
             'href="/favicon.png" />\n' +
-              '  <link rel="stylesheet" href="index.css" />\n' +
               '  <script type="module" src="entry.client.tsx"></script>'
           )
 
@@ -290,18 +289,6 @@ export const handler = async ({ force, verbose }) => {
           })
         },
       },
-      {
-        title: 'Updating entry.server.tsx...',
-        task: async () => {
-          let entryServer = fs.readFileSync(rwPaths.web.entryServer, 'utf-8')
-
-          entryServer = entryServer.replaceAll('App', 'HomePage')
-
-          writeFile(rwPaths.web.entryServer, entryServer, {
-            overwriteExisting: true,
-          })
-        },
-      },
       {
         title: 'Add React experimental types',
         task: async () => {
diff --git a/packages/cli/src/commands/experimental/templates/rsc/App.tsx.template b/packages/cli/src/commands/experimental/templates/rsc/App.tsx.template
index c27bb9fa9863..d95fc48fe27d 100644
--- a/packages/cli/src/commands/experimental/templates/rsc/App.tsx.template
+++ b/packages/cli/src/commands/experimental/templates/rsc/App.tsx.template
@@ -1,11 +1,15 @@
-import { FatalErrorBoundary } from '@redwoodjs/web'
+import { FatalErrorBoundary, RedwoodProvider } from '@redwoodjs/web'
 
 import FatalErrorPage from './pages/FatalErrorPage/FatalErrorPage'
 import Routes from './Routes'
 
+import './index.css'
+
 const App = () => (
   <FatalErrorBoundary page={FatalErrorPage}>
-    <Routes />
+    <RedwoodProvider titleTemplate="%PageTitle | %AppTitle">
+      <Routes />
+    </RedwoodProvider>
   </FatalErrorBoundary>
 )