diff --git a/packages/next/build/entries.ts b/packages/next/build/entries.ts
index 133b2f49ddae1..560f7da3fdaf5 100644
--- a/packages/next/build/entries.ts
+++ b/packages/next/build/entries.ts
@@ -37,11 +37,11 @@ export function createPagesMapping(
   {
     isDev,
     hasServerComponents,
-    hasConcurrentFeatures,
+    runtime,
   }: {
     isDev: boolean
     hasServerComponents: boolean
-    hasConcurrentFeatures: boolean
+    runtime?: 'nodejs' | 'edge'
   }
 ): PagesMapping {
   const previousPages: PagesMapping = {}
@@ -81,7 +81,7 @@ export function createPagesMapping(
   // we alias these in development and allow webpack to
   // allow falling back to the correct source file so
   // that HMR can work properly when a file is added/removed
-  const documentPage = `_document${hasConcurrentFeatures ? '-web' : ''}`
+  const documentPage = `_document${runtime ? '-concurrent' : ''}`
   if (isDev) {
     pages['/_app'] = `${PAGES_DIR_ALIAS}/_app`
     pages['/_error'] = `${PAGES_DIR_ALIAS}/_error`
@@ -98,7 +98,7 @@ export function createPagesMapping(
 type Entrypoints = {
   client: webpack5.EntryObject
   server: webpack5.EntryObject
-  serverWeb: webpack5.EntryObject
+  edgeServer: webpack5.EntryObject
 }
 
 export function createEntrypoints(
@@ -111,7 +111,7 @@ export function createEntrypoints(
 ): Entrypoints {
   const client: webpack5.EntryObject = {}
   const server: webpack5.EntryObject = {}
-  const serverWeb: webpack5.EntryObject = {}
+  const edgeServer: webpack5.EntryObject = {}
 
   const hasRuntimeConfig =
     Object.keys(config.publicRuntimeConfig).length > 0 ||
@@ -156,7 +156,7 @@ export function createEntrypoints(
     const isCustomError = isCustomErrorPage(page)
     const isFlight = isFlightPage(config, absolutePagePath)
 
-    const webServerRuntime = !!config.experimental.concurrentFeatures
+    const edgeRuntime = config.experimental.runtime === 'edge'
 
     if (page.match(MIDDLEWARE_ROUTE)) {
       const loaderOpts: MiddlewareLoaderOptions = {
@@ -170,9 +170,9 @@ export function createEntrypoints(
       return
     }
 
-    if (webServerRuntime && !isReserved && !isCustomError && !isApiRoute) {
+    if (edgeRuntime && !isReserved && !isCustomError && !isApiRoute) {
       ssrEntries.set(clientBundlePath, { requireFlightManifest: isFlight })
-      serverWeb[serverBundlePath] = finalizeEntrypoint({
+      edgeServer[serverBundlePath] = finalizeEntrypoint({
         name: '[name].js',
         value: `next-middleware-ssr-loader?${stringify({
           dev: false,
@@ -184,7 +184,7 @@ export function createEntrypoints(
           ...defaultServerlessOptions,
         } as any)}!`,
         isServer: false,
-        isServerWeb: true,
+        isEdgeServer: true,
       })
     }
 
@@ -198,14 +198,14 @@ export function createEntrypoints(
         serverlessLoaderOptions
       )}!`
     } else if (isApiRoute || target === 'server') {
-      if (!webServerRuntime || isReserved || isCustomError) {
+      if (!edgeRuntime || isReserved || isCustomError) {
         server[serverBundlePath] = [absolutePagePath]
       }
     } else if (
       isLikeServerless &&
       page !== '/_app' &&
       page !== '/_document' &&
-      !webServerRuntime
+      !edgeRuntime
     ) {
       const serverlessLoaderOptions: ServerlessLoaderQuery = {
         page,
@@ -244,7 +244,7 @@ export function createEntrypoints(
   return {
     client,
     server,
-    serverWeb,
+    edgeServer,
   }
 }
 
@@ -253,13 +253,13 @@ export function finalizeEntrypoint({
   value,
   isServer,
   isMiddleware,
-  isServerWeb,
+  isEdgeServer,
 }: {
   isServer: boolean
   name: string
   value: ObjectValue<webpack5.EntryObject>
   isMiddleware?: boolean
-  isServerWeb?: boolean
+  isEdgeServer?: boolean
 }): ObjectValue<webpack5.EntryObject> {
   const entry =
     typeof value !== 'object' || Array.isArray(value)
@@ -276,7 +276,7 @@ export function finalizeEntrypoint({
     }
   }
 
-  if (isServerWeb) {
+  if (isEdgeServer) {
     const ssrMiddlewareEntry = {
       library: {
         name: ['_ENTRIES', `middleware_[name]`],
diff --git a/packages/next/build/index.ts b/packages/next/build/index.ts
index 8190ae3beebfb..d72e3b461b199 100644
--- a/packages/next/build/index.ts
+++ b/packages/next/build/index.ts
@@ -151,7 +151,11 @@ export default async function build(
     setGlobal('phase', PHASE_PRODUCTION_BUILD)
     setGlobal('distDir', distDir)
 
-    const hasConcurrentFeatures = !!config.experimental.concurrentFeatures
+    // Currently, when the runtime option is set (either `nodejs` or `edge`),
+    // we enable concurrent features (Fizz-related rendering architecture).
+    const runtime = config.experimental.runtime
+    const hasConcurrentFeatures = !!runtime
+
     const hasServerComponents =
       hasConcurrentFeatures && !!config.experimental.serverComponents
 
@@ -292,7 +296,7 @@ export default async function build(
         createPagesMapping(pagePaths, config.pageExtensions, {
           isDev: false,
           hasServerComponents,
-          hasConcurrentFeatures,
+          runtime,
         })
       )
 
@@ -614,16 +618,16 @@ export default async function build(
               rewrites,
               runWebpackSpan,
             }),
-            hasConcurrentFeatures
+            runtime === 'edge'
               ? getBaseWebpackConfig(dir, {
                   buildId,
                   reactProductionProfiling,
                   isServer: true,
-                  webServerRuntime: true,
+                  isEdgeRuntime: true,
                   config,
                   target,
                   pagesDir,
-                  entrypoints: entrypoints.serverWeb,
+                  entrypoints: entrypoints.edgeServer,
                   rewrites,
                   runWebpackSpan,
                 })
@@ -657,7 +661,7 @@ export default async function build(
           }
         } else {
           const serverResult = await runCompiler(configs[1], { runWebpackSpan })
-          const serverWebResult = configs[2]
+          const edgeServerResult = configs[2]
             ? await runCompiler(configs[2], { runWebpackSpan })
             : null
 
@@ -665,12 +669,12 @@ export default async function build(
             warnings: [
               ...clientResult.warnings,
               ...serverResult.warnings,
-              ...(serverWebResult?.warnings || []),
+              ...(edgeServerResult?.warnings || []),
             ],
             errors: [
               ...clientResult.errors,
               ...serverResult.errors,
-              ...(serverWebResult?.errors || []),
+              ...(edgeServerResult?.errors || []),
             ],
           }
         }
@@ -717,7 +721,7 @@ export default async function build(
       const moduleName = getUnresolvedModuleFromError(error)
       if (hasConcurrentFeatures && moduleName) {
         const err = new Error(
-          `Native Node.js APIs are not supported in the Edge Runtime with \`concurrentFeatures\` enabled. Found \`${moduleName}\` imported.\n\n`
+          `Native Node.js APIs are not supported in the Edge Runtime. Found \`${moduleName}\` imported.\n\n`
         ) as NextError
         err.code = 'EDGE_RUNTIME_UNSUPPORTED_API'
         throw err
diff --git a/packages/next/build/output/index.ts b/packages/next/build/output/index.ts
index 6e0572bb64a8e..9da97a6581a0c 100644
--- a/packages/next/build/output/index.ts
+++ b/packages/next/build/output/index.ts
@@ -12,7 +12,7 @@ export function startedDevelopmentServer(appUrl: string, bindAddr: string) {
 
 let previousClient: webpack5.Compiler | null = null
 let previousServer: webpack5.Compiler | null = null
-let previousServerWeb: webpack5.Compiler | null = null
+let previousEdgeServer: webpack5.Compiler | null = null
 
 type CompilerDiagnostics = {
   modules: number
@@ -39,7 +39,7 @@ export type AmpPageStatus = {
 type BuildStatusStore = {
   client: WebpackStatus
   server: WebpackStatus
-  serverWeb?: WebpackStatus
+  edgeServer?: WebpackStatus
   trigger: string | undefined
   amp: AmpPageStatus
 }
@@ -102,14 +102,14 @@ const buildStore = createStore<BuildStatusStore>()
 let buildWasDone = false
 let clientWasLoading = true
 let serverWasLoading = true
-let serverWebWasLoading = false
+let edgeServerWasLoading = false
 
 buildStore.subscribe((state) => {
-  const { amp, client, server, serverWeb, trigger } = state
+  const { amp, client, server, edgeServer, trigger } = state
 
   const { appUrl } = consoleStore.getState()
 
-  if (client.loading || server.loading || serverWeb?.loading) {
+  if (client.loading || server.loading || edgeServer?.loading) {
     consoleStore.setState(
       {
         bootstrap: false,
@@ -121,12 +121,12 @@ buildStore.subscribe((state) => {
     )
     clientWasLoading = (!buildWasDone && clientWasLoading) || client.loading
     serverWasLoading = (!buildWasDone && serverWasLoading) || server.loading
-    serverWebWasLoading =
-      (!buildWasDone && serverWasLoading) || !!serverWeb?.loading
+    edgeServerWasLoading =
+      (!buildWasDone && serverWasLoading) || !!edgeServer?.loading
     buildWasDone = false
     return
   }
-  if (serverWeb?.loading) return
+  if (edgeServer?.loading) return
 
   buildWasDone = true
 
@@ -136,14 +136,14 @@ buildStore.subscribe((state) => {
     loading: false,
     typeChecking: false,
     partial:
-      clientWasLoading && (serverWasLoading || serverWebWasLoading)
+      clientWasLoading && (serverWasLoading || edgeServerWasLoading)
         ? 'client and server'
         : undefined,
     modules:
       (clientWasLoading ? client.modules : 0) +
       (serverWasLoading ? server.modules : 0) +
-      (serverWebWasLoading ? serverWeb?.modules || 0 : 0),
-    hasServerWeb: !!serverWeb,
+      (edgeServerWasLoading ? edgeServer?.modules || 0 : 0),
+    hasEdgeServer: !!edgeServer,
   }
   if (client.errors) {
     // Show only client errors
@@ -165,12 +165,12 @@ buildStore.subscribe((state) => {
       } as OutputState,
       true
     )
-  } else if (serverWeb && serverWeb.errors) {
-    // Show only serverWeb errors
+  } else if (edgeServer && edgeServer.errors) {
+    // Show only edge server errors
     consoleStore.setState(
       {
         ...partialState,
-        errors: serverWeb.errors,
+        errors: edgeServer.errors,
         warnings: null,
       } as OutputState,
       true
@@ -180,7 +180,7 @@ buildStore.subscribe((state) => {
     const warnings = [
       ...(client.warnings || []),
       ...(server.warnings || []),
-      ...((serverWeb && serverWeb.warnings) || []),
+      ...((edgeServer && edgeServer.warnings) || []),
     ].concat(formatAmpMessages(amp) || [])
 
     consoleStore.setState(
@@ -223,12 +223,12 @@ export function ampValidation(
 export function watchCompilers(
   client: webpack5.Compiler,
   server: webpack5.Compiler,
-  serverWeb: webpack5.Compiler
+  edgeServer: webpack5.Compiler
 ) {
   if (
     previousClient === client &&
     previousServer === server &&
-    previousServerWeb === serverWeb
+    previousEdgeServer === edgeServer
   ) {
     return
   }
@@ -236,7 +236,7 @@ export function watchCompilers(
   buildStore.setState({
     client: { loading: true },
     server: { loading: true },
-    serverWeb: serverWeb ? { loading: true } : undefined,
+    edgeServer: edgeServer ? { loading: true } : undefined,
     trigger: 'initial',
   })
 
@@ -295,10 +295,10 @@ export function watchCompilers(
       })
     }
   })
-  if (serverWeb) {
-    tapCompiler('serverWeb', serverWeb, (status) => {
+  if (edgeServer) {
+    tapCompiler('edgeServer', edgeServer, (status) => {
       buildStore.setState({
-        serverWeb: status,
+        edgeServer: status,
         trigger: undefined,
       })
     })
@@ -306,7 +306,7 @@ export function watchCompilers(
 
   previousClient = client
   previousServer = server
-  previousServerWeb = serverWeb
+  previousEdgeServer = edgeServer
 }
 
 export function reportTrigger(trigger: string) {
diff --git a/packages/next/build/output/store.ts b/packages/next/build/output/store.ts
index c97e47a9e9507..ff2edad64ed04 100644
--- a/packages/next/build/output/store.ts
+++ b/packages/next/build/output/store.ts
@@ -19,7 +19,7 @@ export type OutputState =
           modules: number
           errors: string[] | null
           warnings: string[] | null
-          hasServerWeb: boolean
+          hasEdgeServer: boolean
         }
     ))
 
@@ -91,9 +91,9 @@ store.subscribe((state) => {
     }
 
     const moduleName = getUnresolvedModuleFromError(cleanError)
-    if (state.hasServerWeb && moduleName) {
+    if (state.hasEdgeServer && moduleName) {
       console.error(
-        `Native Node.js APIs are not supported in the Edge Runtime with \`concurrentFeatures\` enabled. Found \`${moduleName}\` imported.\n`
+        `Native Node.js APIs are not supported in the Edge Runtime. Found \`${moduleName}\` imported.\n`
       )
       return
     }
diff --git a/packages/next/build/utils.ts b/packages/next/build/utils.ts
index 6c4ea4a0d7089..00c8d9ece3180 100644
--- a/packages/next/build/utils.ts
+++ b/packages/next/build/utils.ts
@@ -1116,7 +1116,7 @@ export function isFlightPage(
   if (
     !(
       nextConfig.experimental.serverComponents &&
-      nextConfig.experimental.concurrentFeatures
+      nextConfig.experimental.runtime
     )
   )
     return false
diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
index 6a16a2cf65f3b..235722e7d01c3 100644
--- a/packages/next/build/webpack-config.ts
+++ b/packages/next/build/webpack-config.ts
@@ -304,7 +304,7 @@ export default async function getBaseWebpackConfig(
     config,
     dev = false,
     isServer = false,
-    webServerRuntime = false,
+    isEdgeRuntime = false,
     pagesDir,
     target = 'server',
     reactProductionProfiling = false,
@@ -317,7 +317,7 @@ export default async function getBaseWebpackConfig(
     config: NextConfigComplete
     dev?: boolean
     isServer?: boolean
-    webServerRuntime?: boolean
+    isEdgeRuntime?: boolean
     pagesDir: string
     target?: string
     reactProductionProfiling?: boolean
@@ -352,6 +352,8 @@ export default async function getBaseWebpackConfig(
   const hasReactRoot: boolean =
     config.experimental.reactRoot || hasReact18 || isReactExperimental
 
+  const runtime = config.experimental.runtime
+
   // Make sure reactRoot is enabled when react 18 is detected
   if (hasReactRoot) {
     config.experimental.reactRoot = true
@@ -366,29 +368,36 @@ export default async function getBaseWebpackConfig(
     // It's fine to only mention React 18 here as we don't recommend people to try experimental.
     Log.warn('You have to use React 18 to use `experimental.reactRoot`.')
   }
-  if (!isServer && config.experimental.concurrentFeatures && !hasReactRoot) {
+  if (!isServer && runtime && !hasReactRoot) {
     throw new Error(
-      '`experimental.concurrentFeatures` requires `experimental.reactRoot` to be enabled along with React 18.'
+      '`experimental.runtime` requires `experimental.reactRoot` to be enabled along with React 18.'
     )
   }
-  if (
-    config.experimental.serverComponents &&
-    !config.experimental.concurrentFeatures
-  ) {
+  if (config.experimental.serverComponents && !runtime) {
     throw new Error(
-      '`experimental.concurrentFeatures` is required to be enabled along with `experimental.serverComponents`.'
+      '`experimental.runtime` is required to be set along with `experimental.serverComponents`.'
     )
   }
-  const hasConcurrentFeatures =
-    config.experimental.concurrentFeatures && hasReactRoot
+
+  const targetWeb = isEdgeRuntime || !isServer
+  const hasConcurrentFeatures = !!runtime && hasReactRoot
   const hasServerComponents =
     hasConcurrentFeatures && !!config.experimental.serverComponents
-  const targetWeb = webServerRuntime || !isServer
+  const disableOptimizedLoading = hasConcurrentFeatures
+    ? true
+    : config.experimental.disableOptimizedLoading
 
-  if (webServerRuntime) {
-    Log.warn(
-      'You are using the experimental Edge Runtime with `concurrentFeatures`.'
-    )
+  if (!isServer) {
+    if (runtime === 'edge') {
+      Log.warn(
+        'You are using the experimental Edge Runtime with `experimental.runtime`.'
+      )
+    }
+    if (runtime === 'nodejs') {
+      Log.warn(
+        'You are using the experimental Node.js Runtime with `experimental.runtime`.'
+      )
+    }
     if (hasServerComponents) {
       Log.warn(
         'You have experimental React Server Components enabled. Continue at your own risk.'
@@ -562,7 +571,9 @@ export default async function getBaseWebpackConfig(
         prev.push(path.join(pagesDir, `_document.${ext}`))
         return prev
       }, [] as string[]),
-      `next/dist/pages/_document${webServerRuntime ? '-web' : ''}.js`,
+      `next/dist/pages/_document${
+        hasConcurrentFeatures ? '-concurrent' : ''
+      }.js`,
     ]
   }
 
@@ -971,7 +982,7 @@ export default async function getBaseWebpackConfig(
         // TODO: should we warn/error for this instead?
         [
           'next',
-          ...(webServerRuntime
+          ...(isEdgeRuntime
             ? [
                 {
                   'next/dist/compiled/etag': '{}',
@@ -1047,7 +1058,7 @@ export default async function getBaseWebpackConfig(
         ? dev
           ? false
           : ({
-              filename: webServerRuntime ? 'chunks/[name].js' : '[name].js',
+              filename: isEdgeRuntime ? 'chunks/[name].js' : '[name].js',
               // allow to split entrypoints
               chunks: ({ name }: any) => !name?.match(MIDDLEWARE_ROUTE),
               // size of files is not so relevant for server build
@@ -1108,12 +1119,12 @@ export default async function getBaseWebpackConfig(
       // auto which doesn't work in IE11
       publicPath: `${config.assetPrefix || ''}/_next/`,
       path:
-        isServer && !dev && !webServerRuntime
+        isServer && !dev && !isEdgeRuntime
           ? path.join(outputPath, 'chunks')
           : outputPath,
       // On the server we don't use hashes
       filename: isServer
-        ? !dev && !webServerRuntime
+        ? !dev && !isEdgeRuntime
           ? `../[name].js`
           : `[name].js`
         : `static/chunks/${isDevFallback ? 'fallback/' : ''}[name]${
@@ -1178,6 +1189,7 @@ export default async function getBaseWebpackConfig(
               } as any,
             ]
           : []),
+        // Loaders for the client compilation when RSC is enabled.
         ...(hasServerComponents && !isServer
           ? [
               {
@@ -1192,7 +1204,10 @@ export default async function getBaseWebpackConfig(
               },
             ]
           : []),
-        ...(hasServerComponents && webServerRuntime
+        // Loaders for the server compilation when RSC is enabled.
+        ...(hasServerComponents &&
+        ((runtime === 'edge' && isEdgeRuntime) ||
+          (runtime === 'nodejs' && isServer))
           ? [
               {
                 ...codeCondition,
@@ -1444,21 +1459,20 @@ export default async function getBaseWebpackConfig(
           resourceRegExp: /react-is/,
           contextRegExp: /next[\\/]dist[\\/]/,
         }),
-      ((isServerless && isServer) || webServerRuntime) &&
-        new ServerlessPlugin(),
+      ((isServerless && isServer) || isEdgeRuntime) && new ServerlessPlugin(),
       isServer &&
-        !webServerRuntime &&
+        !isEdgeRuntime &&
         new PagesManifestPlugin({ serverless: isLikeServerless, dev }),
       // MiddlewarePlugin should be after DefinePlugin so  NEXT_PUBLIC_*
       // replacement is done before its process.env.* handling
-      (!isServer || webServerRuntime) &&
-        new MiddlewarePlugin({ dev, webServerRuntime }),
+      (!isServer || isEdgeRuntime) &&
+        new MiddlewarePlugin({ dev, isEdgeRuntime }),
       process.env.ENABLE_FILE_SYSTEM_API === '1' &&
-        webServerRuntime &&
+        isEdgeRuntime &&
         new FunctionsManifestPlugin({
           dev,
           pagesDir,
-          webServerRuntime,
+          isEdgeRuntime,
           pageExtensions: config.pageExtensions,
         }),
       isServer && new NextJsSsrImportPlugin(),
@@ -1473,7 +1487,7 @@ export default async function getBaseWebpackConfig(
       config.optimizeFonts &&
         !dev &&
         isServer &&
-        !webServerRuntime &&
+        !isEdgeRuntime &&
         (function () {
           const { FontStylesheetGatheringPlugin } =
             require('./webpack/plugins/font-stylesheet-gathering-plugin') as {
@@ -1498,7 +1512,7 @@ export default async function getBaseWebpackConfig(
         }),
       hasServerComponents &&
         !isServer &&
-        new FlightManifestPlugin({ dev, clientComponentsRegex }),
+        new FlightManifestPlugin({ dev, clientComponentsRegex, runtime }),
       !dev &&
         !isServer &&
         new TelemetryPlugin(
@@ -1605,14 +1619,14 @@ export default async function getBaseWebpackConfig(
     pageEnv: config.experimental.pageEnv,
     excludeDefaultMomentLocales: config.excludeDefaultMomentLocales,
     assetPrefix: config.assetPrefix,
-    disableOptimizedLoading: config.experimental.disableOptimizedLoading,
+    disableOptimizedLoading,
     target,
-    webServerRuntime,
+    isEdgeRuntime,
     reactProductionProfiling,
     webpack: !!config.webpack,
     hasRewrites,
     reactRoot: config.experimental.reactRoot,
-    concurrentFeatures: config.experimental.concurrentFeatures,
+    runtime,
     swcMinify: config.swcMinify,
     swcLoader: useSWCLoader,
     removeConsole: config.experimental.removeConsole,
@@ -1705,7 +1719,7 @@ export default async function getBaseWebpackConfig(
     customAppFile: new RegExp(escapeStringRegexp(path.join(pagesDir, `_app`))),
     isDevelopment: dev,
     isServer,
-    webServerRuntime,
+    isEdgeRuntime,
     targetWeb,
     assetPrefix: config.assetPrefix || '',
     sassOptions: config.sassOptions,
@@ -2070,7 +2084,7 @@ export default async function getBaseWebpackConfig(
       }
       delete entry['main.js']
 
-      if (!webServerRuntime) {
+      if (!isEdgeRuntime) {
         for (const name of Object.keys(entry)) {
           entry[name] = finalizeEntrypoint({
             value: entry[name],
diff --git a/packages/next/build/webpack/config/blocks/base.ts b/packages/next/build/webpack/config/blocks/base.ts
index 34ee68b412520..fe7a9ddca9e0b 100644
--- a/packages/next/build/webpack/config/blocks/base.ts
+++ b/packages/next/build/webpack/config/blocks/base.ts
@@ -8,15 +8,15 @@ export const base = curry(function base(
 ) {
   config.mode = ctx.isDevelopment ? 'development' : 'production'
   config.name = ctx.isServer
-    ? ctx.webServerRuntime
-      ? 'server-web'
+    ? ctx.isEdgeRuntime
+      ? 'edge-server'
       : 'server'
     : 'client'
 
   // @ts-ignore TODO webpack 5 typings
   config.target = !ctx.targetWeb
     ? 'node12.22'
-    : ctx.webServerRuntime
+    : ctx.isEdgeRuntime
     ? ['web', 'es6']
     : ['web', 'es5']
 
@@ -25,7 +25,7 @@ export const base = curry(function base(
     if (process.env.__NEXT_TEST_MODE && !process.env.__NEXT_TEST_WITH_DEVTOOL) {
       config.devtool = false
     } else {
-      if (!ctx.webServerRuntime) {
+      if (!ctx.isEdgeRuntime) {
         // `eval-source-map` provides full-fidelity source maps for the
         // original source, including columns and original variable names.
         // This is desirable so the in-browser debugger can correctly pause
diff --git a/packages/next/build/webpack/config/index.ts b/packages/next/build/webpack/config/index.ts
index bb30f66f79cf5..7cf5bedc109f0 100644
--- a/packages/next/build/webpack/config/index.ts
+++ b/packages/next/build/webpack/config/index.ts
@@ -13,7 +13,7 @@ export async function build(
     customAppFile,
     isDevelopment,
     isServer,
-    webServerRuntime,
+    isEdgeRuntime,
     targetWeb,
     assetPrefix,
     sassOptions,
@@ -27,7 +27,7 @@ export async function build(
     customAppFile: RegExp
     isDevelopment: boolean
     isServer: boolean
-    webServerRuntime: boolean
+    isEdgeRuntime: boolean
     targetWeb: boolean
     assetPrefix: string
     sassOptions: any
@@ -44,7 +44,7 @@ export async function build(
     isDevelopment,
     isProduction: !isDevelopment,
     isServer,
-    webServerRuntime,
+    isEdgeRuntime,
     isClient: !isServer,
     targetWeb,
     assetPrefix: assetPrefix
diff --git a/packages/next/build/webpack/config/utils.ts b/packages/next/build/webpack/config/utils.ts
index 2680efa13bb90..15de0b9a068ef 100644
--- a/packages/next/build/webpack/config/utils.ts
+++ b/packages/next/build/webpack/config/utils.ts
@@ -11,7 +11,7 @@ export type ConfigurationContext = {
 
   isServer: boolean
   isClient: boolean
-  webServerRuntime: boolean
+  isEdgeRuntime: boolean
   targetWeb: boolean
 
   assetPrefix: string
diff --git a/packages/next/build/webpack/loaders/next-flight-server-loader.ts b/packages/next/build/webpack/loaders/next-flight-server-loader.ts
index 8d5b84927e235..f3243d1dc8c72 100644
--- a/packages/next/build/webpack/loaders/next-flight-server-loader.ts
+++ b/packages/next/build/webpack/loaders/next-flight-server-loader.ts
@@ -144,22 +144,23 @@ export default async function transformSource(
     )
 
   /**
-   * Server side component module output:
+   * For .server.js files, we handle this loader differently.
    *
-   * export default function ServerComponent() { ... }
-   * + export const __rsc_noop__=()=>{ ... }
-   * + ServerComponent.__next_rsc__=1;
+   * Server compilation output:
+   *   export default function ServerComponent() { ... }
+   *   export const __rsc_noop__ = () => { ... }
+   *   ServerComponent.__next_rsc__ = 1
+   *   ServerComponent.__webpack_require__ = __webpack_require__
    *
-   * Client side component module output:
-   *
-   * The function body of ServerComponent will be removed
+   * Client compilation output:
+   *   The function body of Server Component will be removed
    */
 
   const noop = `export const __rsc_noop__=()=>{${imports.join(';')}}`
   const defaultExportNoop = isClientCompilation
     ? `export default function ${defaultExportName}(){}\n${defaultExportName}.__next_rsc__=1;`
     : defaultExportName
-    ? `${defaultExportName}.__next_rsc__=1;`
+    ? `${defaultExportName}.__next_rsc__=1;${defaultExportName}.__webpack_require__=__webpack_require__;`
     : ''
 
   const transformed = transformedSource + '\n' + noop + '\n' + defaultExportNoop
diff --git a/packages/next/build/webpack/loaders/next-middleware-ssr-loader/render.ts b/packages/next/build/webpack/loaders/next-middleware-ssr-loader/render.ts
index b74d8a3be093b..6fb65f84139b6 100644
--- a/packages/next/build/webpack/loaders/next-middleware-ssr-loader/render.ts
+++ b/packages/next/build/webpack/loaders/next-middleware-ssr-loader/render.ts
@@ -69,8 +69,8 @@ export function getRender({
     webServerConfig: {
       extendRenderOpts: {
         buildId,
+        runtime: 'edge',
         supportsDynamicHTML: true,
-        concurrentFeatures: true,
         disableOptimizedLoading: true,
         serverComponentManifest,
       },
@@ -139,7 +139,7 @@ export function getRender({
     // @TODO: We should move this into server/render.
     if (Document.getInitialProps) {
       const err = new Error(
-        '`getInitialProps` in Document component is not supported with `concurrentFeatures` enabled.'
+        '`getInitialProps` in Document component is not supported with the Edge Runtime.'
       )
       return sendError(req, err)
     }
diff --git a/packages/next/build/webpack/loaders/next-serverless-loader/page-handler.ts b/packages/next/build/webpack/loaders/next-serverless-loader/page-handler.ts
index 5c7317d38b24d..968024c4683ac 100644
--- a/packages/next/build/webpack/loaders/next-serverless-loader/page-handler.ts
+++ b/packages/next/build/webpack/loaders/next-serverless-loader/page-handler.ts
@@ -193,7 +193,6 @@ export function getPageHandler(ctx: ServerlessHandlerCtx) {
           domainLocales: i18n?.domains,
           optimizeImages: process.env.__NEXT_OPTIMIZE_IMAGES,
           optimizeCss: process.env.__NEXT_OPTIMIZE_CSS,
-          concurrentFeatures: process.env.__NEXT_CONCURRENT_FEATURES,
           crossOrigin: process.env.__NEXT_CROSS_ORIGIN,
         },
         options
diff --git a/packages/next/build/webpack/plugins/flight-manifest-plugin.ts b/packages/next/build/webpack/plugins/flight-manifest-plugin.ts
index 1a525c3fed253..ef01915b4b350 100644
--- a/packages/next/build/webpack/plugins/flight-manifest-plugin.ts
+++ b/packages/next/build/webpack/plugins/flight-manifest-plugin.ts
@@ -18,12 +18,14 @@ import { MIDDLEWARE_FLIGHT_MANIFEST } from '../../../shared/lib/constants'
 type Options = {
   dev: boolean
   clientComponentsRegex: RegExp
+  runtime?: 'nodejs' | 'edge'
 }
 
 const PLUGIN_NAME = 'FlightManifestPlugin'
 
 export class FlightManifestPlugin {
   dev: boolean = false
+  runtime?: 'nodejs' | 'edge'
   clientComponentsRegex: RegExp
 
   constructor(options: Options) {
@@ -31,6 +33,7 @@ export class FlightManifestPlugin {
       this.dev = options.dev
     }
     this.clientComponentsRegex = options.clientComponentsRegex
+    this.runtime = options.runtime
   }
 
   apply(compiler: any) {
@@ -120,9 +123,13 @@ export class FlightManifestPlugin {
       })
     })
 
-    const output = `self.__RSC_MANIFEST=` + JSON.stringify(json)
-    assets[`server/${MIDDLEWARE_FLIGHT_MANIFEST}.js`] = new sources.RawSource(
-      output
-    )
+    const output =
+      (this.runtime === 'edge' ? 'self.__RSC_MANIFEST=' : '') +
+      JSON.stringify(json)
+    assets[
+      `server/${MIDDLEWARE_FLIGHT_MANIFEST}${
+        this.runtime === 'edge' ? '.js' : '.json'
+      }`
+    ] = new sources.RawSource(output)
   }
 }
diff --git a/packages/next/build/webpack/plugins/functions-manifest-plugin.ts b/packages/next/build/webpack/plugins/functions-manifest-plugin.ts
index 6e27b84d5ab72..4a5cf366e1470 100644
--- a/packages/next/build/webpack/plugins/functions-manifest-plugin.ts
+++ b/packages/next/build/webpack/plugins/functions-manifest-plugin.ts
@@ -28,23 +28,23 @@ export default class FunctionsManifestPlugin {
   dev: boolean
   pagesDir: string
   pageExtensions: string[]
-  webServerRuntime: boolean
+  isEdgeRuntime: boolean
   pagesRuntime: Map<string, string>
 
   constructor({
     dev,
     pagesDir,
     pageExtensions,
-    webServerRuntime,
+    isEdgeRuntime,
   }: {
     dev: boolean
     pagesDir: string
     pageExtensions: string[]
-    webServerRuntime: boolean
+    isEdgeRuntime: boolean
   }) {
     this.dev = dev
     this.pagesDir = pagesDir
-    this.webServerRuntime = webServerRuntime
+    this.isEdgeRuntime = isEdgeRuntime
     this.pageExtensions = pageExtensions
     this.pagesRuntime = new Map()
   }
@@ -53,20 +53,20 @@ export default class FunctionsManifestPlugin {
     compilation: webpack5.Compilation,
     assets: any,
     envPerRoute: Map<string, string[]>,
-    webServerRuntime: boolean
+    isEdgeRuntime: boolean
   ) {
     const functionsManifest: FunctionsManifest = {
       version: 1,
       pages: {},
     }
 
-    const infos = getEntrypointInfo(compilation, envPerRoute, webServerRuntime)
+    const infos = getEntrypointInfo(compilation, envPerRoute, isEdgeRuntime)
     infos.forEach((info) => {
       const { page } = info
       // TODO: use global default runtime instead of 'web'
       const pageRuntime = this.pagesRuntime.get(page)
       const isWebRuntime =
-        pageRuntime === 'edge' || (this.webServerRuntime && !pageRuntime)
+        pageRuntime === 'edge' || (this.isEdgeRuntime && !pageRuntime)
       functionsManifest.pages[page] = {
         // Not assign if it's nodejs runtime, project configured node version is used instead
         ...(isWebRuntime && { runtime: 'web' }),
@@ -74,8 +74,7 @@ export default class FunctionsManifestPlugin {
       }
     })
 
-    const assetPath =
-      (this.webServerRuntime ? '' : 'server/') + FUNCTIONS_MANIFEST
+    const assetPath = (this.isEdgeRuntime ? '' : 'server/') + FUNCTIONS_MANIFEST
     assets[assetPath] = new sources.RawSource(
       JSON.stringify(functionsManifest, null, 2)
     )
@@ -149,7 +148,7 @@ export default class FunctionsManifestPlugin {
     collectAssets(compiler, this.createAssets.bind(this), {
       dev: this.dev,
       pluginName: PLUGIN_NAME,
-      webServerRuntime: this.webServerRuntime,
+      isEdgeRuntime: this.isEdgeRuntime,
     })
   }
 }
diff --git a/packages/next/build/webpack/plugins/middleware-plugin.ts b/packages/next/build/webpack/plugins/middleware-plugin.ts
index 07c1710528eaf..7ada45ac32d47 100644
--- a/packages/next/build/webpack/plugins/middleware-plugin.ts
+++ b/packages/next/build/webpack/plugins/middleware-plugin.ts
@@ -52,7 +52,7 @@ function getPageFromEntrypointName(pagePath: string) {
 export function getEntrypointInfo(
   compilation: webpack5.Compilation,
   envPerRoute: Map<string, string[]>,
-  webServerRuntime: boolean
+  isEdgeRuntime: boolean
 ) {
   const entrypoints = compilation.entrypoints
   const infos = []
@@ -61,8 +61,8 @@ export function getEntrypointInfo(
 
     const ssrEntryInfo = ssrEntries.get(entrypoint.name)
 
-    if (ssrEntryInfo && !webServerRuntime) continue
-    if (!ssrEntryInfo && webServerRuntime) continue
+    if (ssrEntryInfo && !isEdgeRuntime) continue
+    if (!ssrEntryInfo && isEdgeRuntime) continue
 
     const page = getPageFromEntrypointName(entrypoint.name)
 
@@ -98,26 +98,26 @@ export function getEntrypointInfo(
 
 export default class MiddlewarePlugin {
   dev: boolean
-  webServerRuntime: boolean
+  isEdgeRuntime: boolean
 
   constructor({
     dev,
-    webServerRuntime,
+    isEdgeRuntime,
   }: {
     dev: boolean
-    webServerRuntime: boolean
+    isEdgeRuntime: boolean
   }) {
     this.dev = dev
-    this.webServerRuntime = webServerRuntime
+    this.isEdgeRuntime = isEdgeRuntime
   }
 
   createAssets(
     compilation: webpack5.Compilation,
     assets: any,
     envPerRoute: Map<string, string[]>,
-    webServerRuntime: boolean
+    isEdgeRuntime: boolean
   ) {
-    const infos = getEntrypointInfo(compilation, envPerRoute, webServerRuntime)
+    const infos = getEntrypointInfo(compilation, envPerRoute, isEdgeRuntime)
     infos.forEach((info) => {
       middlewareManifest.middleware[info.page] = info
     })
@@ -134,9 +134,7 @@ export default class MiddlewarePlugin {
     )
 
     assets[
-      this.webServerRuntime
-        ? MIDDLEWARE_MANIFEST
-        : `server/${MIDDLEWARE_MANIFEST}`
+      this.isEdgeRuntime ? MIDDLEWARE_MANIFEST : `server/${MIDDLEWARE_MANIFEST}`
     ] = new sources.RawSource(JSON.stringify(middlewareManifest, null, 2))
   }
 
@@ -144,7 +142,7 @@ export default class MiddlewarePlugin {
     collectAssets(compiler, this.createAssets.bind(this), {
       dev: this.dev,
       pluginName: PLUGIN_NAME,
-      webServerRuntime: this.webServerRuntime,
+      isEdgeRuntime: this.isEdgeRuntime,
     })
   }
 }
@@ -155,12 +153,12 @@ export function collectAssets(
     compilation: webpack5.Compilation,
     assets: any,
     envPerRoute: Map<string, string[]>,
-    webServerRuntime: boolean
+    isEdgeRuntime: boolean
   ) => void,
   options: {
     dev: boolean
     pluginName: string
-    webServerRuntime: boolean
+    isEdgeRuntime: boolean
   }
 ) {
   const wp = compiler.webpack
@@ -377,12 +375,7 @@ export function collectAssets(
           stage: webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS,
         },
         (assets: any) => {
-          createAssets(
-            compilation,
-            assets,
-            envPerRoute,
-            options.webServerRuntime
-          )
+          createAssets(compilation, assets, envPerRoute, options.isEdgeRuntime)
         }
       )
     }
diff --git a/packages/next/export/index.ts b/packages/next/export/index.ts
index 36d6930318ad4..e7d7d758a26f5 100644
--- a/packages/next/export/index.ts
+++ b/packages/next/export/index.ts
@@ -381,7 +381,7 @@ export default async function exportApp(
       disableOptimizedLoading: nextConfig.experimental.disableOptimizedLoading,
       // Exported pages do not currently support dynamic HTML.
       supportsDynamicHTML: false,
-      concurrentFeatures: nextConfig.experimental.concurrentFeatures,
+      runtime: nextConfig.experimental.runtime,
       crossOrigin: nextConfig.crossOrigin,
       optimizeCss: nextConfig.experimental.optimizeCss,
       optimizeFonts: nextConfig.optimizeFonts,
diff --git a/packages/next/pages/_document-web.tsx b/packages/next/pages/_document-concurrent.tsx
similarity index 85%
rename from packages/next/pages/_document-web.tsx
rename to packages/next/pages/_document-concurrent.tsx
index 2442154129350..8275efd253fe9 100644
--- a/packages/next/pages/_document-web.tsx
+++ b/packages/next/pages/_document-concurrent.tsx
@@ -1,4 +1,4 @@
-// Default _document page for web runtime
+// Default Document for streaming features
 
 import React from 'react'
 import { Html, Head, Main, NextScript } from './_document'
diff --git a/packages/next/pages/_document.tsx b/packages/next/pages/_document.tsx
index 53f9a195dd2bf..ee8fe49fed2ce 100644
--- a/packages/next/pages/_document.tsx
+++ b/packages/next/pages/_document.tsx
@@ -495,9 +495,11 @@ export class Head extends Component<
       optimizeCss,
       optimizeFonts,
       optimizeImages,
-      concurrentFeatures,
+      runtime,
     } = this.context
 
+    const hasConcurrentFeatures = !!runtime
+
     const disableRuntimeJS = unstable_runtimeJS === false
     const disableJsPreload =
       unstable_JsPreload === false || !disableOptimizedLoading
@@ -663,7 +665,7 @@ export class Head extends Component<
 
       return (
         <head {...this.props}>
-          {!concurrentFeatures && this.context.isDevelopment && (
+          {!hasConcurrentFeatures && this.context.isDevelopment && (
             <>
               <style
                 data-next-hide-fouc
diff --git a/packages/next/server/base-server.ts b/packages/next/server/base-server.ts
index cf1f5946978d6..2541d3faec021 100644
--- a/packages/next/server/base-server.ts
+++ b/packages/next/server/base-server.ts
@@ -156,7 +156,7 @@ export default abstract class Server {
     defaultLocale?: string
     domainLocales?: DomainLocale[]
     distDir: string
-    concurrentFeatures?: boolean
+    runtime?: 'nodejs' | 'edge'
     serverComponents?: boolean
     crossOrigin?: string
     supportsDynamicHTML?: boolean
@@ -171,6 +171,7 @@ export default abstract class Server {
   protected customRoutes: CustomRoutes
   protected middlewareManifest?: MiddlewareManifest
   protected middleware?: RoutingItem[]
+  protected serverComponentManifest?: any
   public readonly hostname?: string
   public readonly port?: number
 
@@ -215,6 +216,7 @@ export default abstract class Server {
   protected abstract getMiddlewareManifest(): MiddlewareManifest | undefined
   protected abstract getRoutesManifest(): CustomRoutes
   protected abstract getPrerenderManifest(): PrerenderManifest
+  protected abstract getServerComponentManifest(): any
 
   protected abstract sendRenderResult(
     req: BaseNextRequest,
@@ -287,6 +289,11 @@ export default abstract class Server {
     this.buildId = this.getBuildId()
     this.minimalMode = minimalMode
 
+    const serverComponents = this.nextConfig.experimental.serverComponents
+    this.serverComponentManifest = serverComponents
+      ? this.getServerComponentManifest()
+      : undefined
+
     this.renderOpts = {
       poweredByHeader: this.nextConfig.poweredByHeader,
       canonicalBase: this.nextConfig.amp.canonicalBase || '',
@@ -304,12 +311,13 @@ export default abstract class Server {
           : undefined,
       optimizeImages: !!this.nextConfig.experimental.optimizeImages,
       optimizeCss: this.nextConfig.experimental.optimizeCss,
-      disableOptimizedLoading:
-        this.nextConfig.experimental.disableOptimizedLoading,
+      disableOptimizedLoading: this.nextConfig.experimental.runtime
+        ? true
+        : this.nextConfig.experimental.disableOptimizedLoading,
       domainLocales: this.nextConfig.i18n?.domains,
       distDir: this.distDir,
-      concurrentFeatures: this.nextConfig.experimental.concurrentFeatures,
-      serverComponents: this.nextConfig.experimental.serverComponents,
+      runtime: this.nextConfig.experimental.runtime,
+      serverComponents,
       crossOrigin: this.nextConfig.crossOrigin
         ? this.nextConfig.crossOrigin
         : undefined,
diff --git a/packages/next/server/config-shared.ts b/packages/next/server/config-shared.ts
index 8c6270666a26c..2d28f9dc553ae 100644
--- a/packages/next/server/config-shared.ts
+++ b/packages/next/server/config-shared.ts
@@ -112,7 +112,7 @@ export interface ExperimentalConfig {
   craCompat?: boolean
   esmExternals?: boolean | 'loose'
   isrMemoryCacheSize?: number
-  concurrentFeatures?: boolean
+  runtime?: 'nodejs' | 'edge'
   serverComponents?: boolean
   fullySpecified?: boolean
   urlImports?: NonNullable<webpack5.Configuration['experiments']>['buildHttp']
@@ -458,7 +458,6 @@ export const defaultConfig: NextConfig = {
     esmExternals: true,
     // default to 50MB limit
     isrMemoryCacheSize: 50 * 1024 * 1024,
-    concurrentFeatures: false,
     serverComponents: false,
     fullySpecified: false,
     outputFileTracingRoot: process.env.NEXT_PRIVATE_OUTPUT_TRACE_ROOT || '',
diff --git a/packages/next/server/dev/hot-reloader.ts b/packages/next/server/dev/hot-reloader.ts
index 47b4b35822ffe..15743235edf12 100644
--- a/packages/next/server/dev/hot-reloader.ts
+++ b/packages/next/server/dev/hot-reloader.ts
@@ -148,7 +148,7 @@ export default class HotReloader {
   private pagesDir: string
   private webpackHotMiddleware?: WebpackHotMiddleware
   private config: NextConfigComplete
-  private webServerRuntime: boolean
+  private runtime?: 'nodejs' | 'edge'
   private hasServerComponents: boolean
   public clientStats: webpack5.Stats | null
   public serverStats: webpack5.Stats | null
@@ -189,10 +189,9 @@ export default class HotReloader {
     this.serverPrevDocumentHash = null
 
     this.config = config
-    this.webServerRuntime = !!config.experimental.concurrentFeatures
+    this.runtime = config.experimental.runtime
     this.hasServerComponents = !!(
-      config.experimental.concurrentFeatures &&
-      config.experimental.serverComponents
+      this.runtime && config.experimental.serverComponents
     )
     this.previewProps = previewProps
     this.rewrites = rewrites
@@ -317,7 +316,7 @@ export default class HotReloader {
             this.config.pageExtensions,
             {
               isDev: true,
-              hasConcurrentFeatures: this.webServerRuntime,
+              runtime: this.config.experimental.runtime,
               hasServerComponents: this.hasServerComponents,
             }
           )
@@ -361,16 +360,18 @@ export default class HotReloader {
                 entrypoints: entrypoints.server,
                 runWebpackSpan: this.hotReloaderSpan,
               }),
-              this.webServerRuntime
+              // For the edge runtime, we need an extra compiler to generate the
+              // web-targeted server bundle for now.
+              this.runtime === 'edge'
                 ? getBaseWebpackConfig(this.dir, {
                     dev: true,
                     isServer: true,
-                    webServerRuntime: true,
+                    isEdgeRuntime: true,
                     config: this.config,
                     buildId: this.buildId,
                     pagesDir: this.pagesDir,
                     rewrites: this.rewrites,
-                    entrypoints: entrypoints.serverWeb,
+                    entrypoints: entrypoints.edgeServer,
                     runWebpackSpan: this.hotReloaderSpan,
                   })
                 : null,
@@ -440,20 +441,22 @@ export default class HotReloader {
         // @ts-ignore entry is always a function
         const entrypoints = await defaultEntry(...args)
         const isClientCompilation = config.name === 'client'
-        const isServerCompilation = config.name === 'server'
-        const isServerWebCompilation = config.name === 'server-web'
+        const isNodeServerCompilation = config.name === 'server'
+        const isEdgeServerCompilation = config.name === 'edge-server'
 
         await Promise.all(
           Object.keys(entries).map(async (pageKey) => {
             const isClientKey = pageKey.startsWith('client')
-            const isServerWebKey = pageKey.startsWith('server-web')
+            const isEdgeServerKey = pageKey.startsWith('edge-server')
+
             if (isClientKey !== isClientCompilation) return
-            if (isServerWebKey !== isServerWebCompilation) return
+            if (isEdgeServerKey !== isEdgeServerCompilation) return
+
             const page = pageKey.slice(
               isClientKey
                 ? 'client'.length
-                : isServerWebKey
-                ? 'server-web'.length
+                : isEdgeServerKey
+                ? 'edge-server'.length
                 : 'server'.length
             )
             const isMiddleware = !!page.match(MIDDLEWARE_ROUTE)
@@ -483,8 +486,8 @@ export default class HotReloader {
               isFlightPage(this.config, absolutePagePath)
 
             if (
-              isServerCompilation &&
-              this.webServerRuntime &&
+              isNodeServerCompilation &&
+              this.runtime === 'edge' &&
               !isApiRoute &&
               !isCustomError
             ) {
@@ -514,13 +517,13 @@ export default class HotReloader {
               if (isServerComponent) {
                 ssrEntries.set(bundlePath, { requireFlightManifest: true })
               } else if (
-                this.webServerRuntime &&
+                this.runtime === 'edge' &&
                 !isReserved &&
                 !isCustomError
               ) {
                 ssrEntries.set(bundlePath, { requireFlightManifest: false })
               }
-            } else if (isServerWebCompilation) {
+            } else if (isEdgeServerCompilation) {
               if (!isReserved) {
                 entrypoints[bundlePath] = finalizeEntrypoint({
                   name: '[name].js',
@@ -537,7 +540,7 @@ export default class HotReloader {
                     buildId: this.buildId,
                   } as any)}!`,
                   isServer: false,
-                  isServerWeb: true,
+                  isEdgeServer: true,
                 })
               }
             } else {
diff --git a/packages/next/server/dev/next-dev-server.ts b/packages/next/server/dev/next-dev-server.ts
index 8577f70101b88..dc4d5185a1492 100644
--- a/packages/next/server/dev/next-dev-server.ts
+++ b/packages/next/server/dev/next-dev-server.ts
@@ -263,10 +263,10 @@ export default class DevServer extends Server {
         const routedPages = []
         const knownFiles = wp.getTimeInfoEntries()
         const ssrMiddleware = new Set<string>()
-        const isWebServerRuntime =
-          this.nextConfig.experimental.concurrentFeatures
+        const runtime = this.nextConfig.experimental.runtime
+        const isEdgeRuntime = runtime === 'edge'
         const hasServerComponents =
-          isWebServerRuntime && this.nextConfig.experimental.serverComponents
+          runtime && this.nextConfig.experimental.serverComponents
 
         for (const [fileName, { accuracy }] of knownFiles) {
           if (accuracy === undefined || !regexPageExtension.test(fileName)) {
@@ -291,7 +291,7 @@ export default class DevServer extends Server {
             routedMiddleware.push(pageName)
             ssrMiddleware.add(pageName)
           } else if (
-            isWebServerRuntime &&
+            isEdgeRuntime &&
             !(isReservedPage(pageName) || isCustomErrorPage(pageName))
           ) {
             routedMiddleware.push(pageName)
@@ -717,6 +717,10 @@ export default class DevServer extends Server {
     return undefined
   }
 
+  protected getServerComponentManifest() {
+    return undefined
+  }
+
   protected async hasMiddleware(
     pathname: string,
     isSSR?: boolean
@@ -919,6 +923,13 @@ export default class DevServer extends Server {
     }
     try {
       await this.hotReloader!.ensurePage(pathname)
+
+      // When the new page is compiled, we need to reload the server component
+      // manifest.
+      if (this.nextConfig.experimental.serverComponents) {
+        this.serverComponentManifest = super.getServerComponentManifest()
+      }
+
       return super.findPageComponents(pathname, query, params)
     } catch (err) {
       if ((err as any).code !== 'ENOENT') {
diff --git a/packages/next/server/dev/on-demand-entry-handler.ts b/packages/next/server/dev/on-demand-entry-handler.ts
index 2c48073142d10..a4b8a2ca5c0c9 100644
--- a/packages/next/server/dev/on-demand-entry-handler.ts
+++ b/packages/next/server/dev/on-demand-entry-handler.ts
@@ -74,7 +74,7 @@ export default function onDemandEntryHandler(
     if (invalidator.rebuildAgain) {
       return invalidator.doneBuilding()
     }
-    const [clientStats, serverStats, serverWebStats] = multiStats.stats
+    const [clientStats, serverStats, edgeServerStats] = multiStats.stats
     const pagePaths = [
       ...getPagePathsFromEntrypoints(
         'client',
@@ -84,10 +84,10 @@ export default function onDemandEntryHandler(
         'server',
         serverStats.compilation.entrypoints
       ),
-      ...(serverWebStats
+      ...(edgeServerStats
         ? getPagePathsFromEntrypoints(
-            'server-web',
-            serverWebStats.compilation.entrypoints
+            'edge-server',
+            edgeServerStats.compilation.entrypoints
           )
         : []),
     ]
@@ -204,11 +204,11 @@ export default function onDemandEntryHandler(
 
       const isMiddleware = normalizedPage.match(MIDDLEWARE_ROUTE)
       const isApiRoute = normalizedPage.match(API_ROUTE) && !isMiddleware
-      const isServerWeb = !!nextConfig.experimental.concurrentFeatures
+      const isEdgeServer = nextConfig.experimental.runtime === 'edge'
       const isCustomError = isCustomErrorPage(page)
 
       let entriesChanged = false
-      const addPageEntry = (type: 'client' | 'server' | 'server-web') => {
+      const addPageEntry = (type: 'client' | 'server' | 'edge-server') => {
         return new Promise<void>((resolve, reject) => {
           // Makes sure the page that is being kept in on-demand-entries matches the webpack output
           const pageKey = `${type}${page}`
@@ -253,7 +253,7 @@ export default function onDemandEntryHandler(
         : Promise.all([
             addPageEntry('client'),
             addPageEntry(
-              isServerWeb && !isCustomError ? 'server-web' : 'server'
+              isEdgeServer && !isCustomError ? 'edge-server' : 'server'
             ),
           ])
 
diff --git a/packages/next/server/next-server.ts b/packages/next/server/next-server.ts
index de5021e037d6c..b9759dc867365 100644
--- a/packages/next/server/next-server.ts
+++ b/packages/next/server/next-server.ts
@@ -29,6 +29,7 @@ import {
   CLIENT_STATIC_FILES_RUNTIME,
   PRERENDER_MANIFEST,
   ROUTES_MANIFEST,
+  MIDDLEWARE_FLIGHT_MANIFEST,
   CLIENT_PUBLIC_FILES_PATH,
   SERVERLESS_DIRECTORY,
 } from '../shared/lib/constants'
@@ -472,6 +473,11 @@ export default class NextNodeServer extends BaseServer {
     query: NextParsedUrlQuery,
     renderOpts: RenderOpts
   ): Promise<RenderResult | null> {
+    // Due to the way we pass data by mutating `renderOpts`, we can't extend the
+    // object here but only updating its `serverComponentManifest` field.
+    // https://github.com/vercel/next.js/blob/df7cbd904c3bd85f399d1ce90680c0ecf92d2752/packages/next/server/render.tsx#L947-L952
+    renderOpts.serverComponentManifest = this.serverComponentManifest
+
     return renderToHTML(
       req.originalRequest,
       res.originalResponse,
@@ -583,6 +589,15 @@ export default class NextNodeServer extends BaseServer {
     return requireFontManifest(this.distDir, this._isLikeServerless)
   }
 
+  protected getServerComponentManifest() {
+    if (this.nextConfig.experimental.runtime !== 'nodejs') return undefined
+    return require(join(
+      this.distDir,
+      'server',
+      MIDDLEWARE_FLIGHT_MANIFEST + '.json'
+    ))
+  }
+
   protected getCacheFilesystem(): CacheFs {
     return {
       readFile: (f) => fs.promises.readFile(f, 'utf8'),
@@ -1158,7 +1173,7 @@ export default class NextNodeServer extends BaseServer {
             url: url,
             page: page,
           },
-          useCache: !this.nextConfig.experimental.concurrentFeatures,
+          useCache: !this.nextConfig.experimental.runtime,
           onWarning: (warning: Error) => {
             if (params.onWarning) {
               warning.message += ` "./${middlewareInfo.name}"`
diff --git a/packages/next/server/node-polyfill-web-streams.js b/packages/next/server/node-polyfill-web-streams.js
index d056697c5dbfb..8c022a6fe4425 100644
--- a/packages/next/server/node-polyfill-web-streams.js
+++ b/packages/next/server/node-polyfill-web-streams.js
@@ -1,4 +1,5 @@
-import { ReadableStream, TransformStream } from './web/sandbox/readable-stream'
+import { TransformStream } from 'next/dist/compiled/web-streams-polyfill'
+import { ReadableStream } from './web/sandbox/readable-stream'
 
 // Polyfill Web Streams in the Node.js environment
 if (!global.ReadableStream) {
diff --git a/packages/next/server/render.tsx b/packages/next/server/render.tsx
index 49b3cf2451dca..fcd4db24e4df1 100644
--- a/packages/next/server/render.tsx
+++ b/packages/next/server/render.tsx
@@ -228,7 +228,7 @@ export type RenderOptsPartial = {
   domainLocales?: DomainLocale[]
   disableOptimizedLoading?: boolean
   supportsDynamicHTML?: boolean
-  concurrentFeatures?: boolean
+  runtime?: 'nodejs' | 'edge'
   serverComponents?: boolean
   customServer?: boolean
   crossOrigin?: string
@@ -351,12 +351,28 @@ const useRSCResponse = createRSCHook()
 
 // Create the wrapper component for a Flight stream.
 function createServerComponentRenderer(
-  cachePrefix: string,
-  transformStream: TransformStream,
   App: AppType,
   OriginalComponent: React.ComponentType,
-  serverComponentManifest: NonNullable<RenderOpts['serverComponentManifest']>
+  {
+    cachePrefix,
+    transformStream,
+    serverComponentManifest,
+    runtime,
+  }: {
+    cachePrefix: string
+    transformStream: TransformStream
+    serverComponentManifest: NonNullable<RenderOpts['serverComponentManifest']>
+    runtime: 'nodejs' | 'edge'
+  }
 ) {
+  if (runtime === 'nodejs') {
+    // For the nodejs runtime, we need to expose the `__webpack_require__` API
+    // globally for react-server-dom-webpack.
+    // This is a hack until we find a better way.
+    // @ts-ignore
+    globalThis.__webpack_require__ = OriginalComponent.__webpack_require__
+  }
+
   const writable = transformStream.writable
   const ServerComponentWrapper = (props: any) => {
     const id = (React as any).useId()
@@ -433,7 +449,6 @@ export async function renderToHTML(
     getStaticPaths,
     getServerSideProps,
     serverComponentManifest,
-    renderServerComponentData,
     serverComponentProps,
     isDataReq,
     params,
@@ -441,24 +456,28 @@ export async function renderToHTML(
     basePath,
     devOnlyCacheBusterQueryString,
     supportsDynamicHTML,
-    concurrentFeatures,
+    runtime,
   } = renderOpts
 
-  const isServerComponent = !!serverComponentManifest
+  const hasConcurrentFeatures = !!runtime
+
+  const isServerComponent = !!serverComponentManifest && hasConcurrentFeatures
   const OriginalComponent = renderOpts.Component
-  const serverComponentsInlinedTransformStream =
-    process.browser && isServerComponent ? new TransformStream() : null
-  const search = stringifyQuery(query)
-  const cachePrefix = pathname + '?' + search
-  const Component = isServerComponent
-    ? createServerComponentRenderer(
-        cachePrefix,
-        serverComponentsInlinedTransformStream!,
-        App,
-        OriginalComponent,
-        serverComponentManifest
-      )
-    : renderOpts.Component
+
+  let Component: React.ComponentType<{}> | ((props: any) => JSX.Element) =
+    renderOpts.Component
+  let serverComponentsInlinedTransformStream: TransformStream<any, any> | null =
+    null
+
+  if (isServerComponent) {
+    serverComponentsInlinedTransformStream = new TransformStream()
+    Component = createServerComponentRenderer(App, OriginalComponent, {
+      cachePrefix: pathname + '?' + stringifyQuery(query),
+      transformStream: serverComponentsInlinedTransformStream,
+      serverComponentManifest,
+      runtime,
+    })
+  }
 
   const getFontDefinition = (url: string): string => {
     if (fontManifest) {
@@ -467,6 +486,12 @@ export async function renderToHTML(
     return ''
   }
 
+  let { renderServerComponentData } = renderOpts
+  if (isServerComponent && query.__flight__) {
+    renderServerComponentData = true
+    delete query.__flight__
+  }
+
   const callMiddleware = async (method: string, args: any[], props = false) => {
     let results: any = props ? {} : []
 
@@ -510,7 +535,7 @@ export async function renderToHTML(
     defaultAppGetInitialProps &&
     !isSSG &&
     !getServerSideProps &&
-    !concurrentFeatures
+    !hasConcurrentFeatures
 
   for (const methodName of [
     'getStaticProps',
@@ -1140,7 +1165,7 @@ export async function renderToHTML(
     return inAmpMode ? children : <div id="__next">{children}</div>
   }
 
-  const ReactDOMServer = concurrentFeatures
+  const ReactDOMServer = hasConcurrentFeatures
     ? require('react-dom/server.browser')
     : require('react-dom/server')
 
@@ -1159,7 +1184,7 @@ export async function renderToHTML(
    */
   const generateStaticHTML = supportsDynamicHTML !== true
   const renderDocument = async () => {
-    if (!process.browser && Document.getInitialProps) {
+    if (!runtime && Document.getInitialProps) {
       const renderPage: RenderPage = (
         options: ComponentsEnhancer = {}
       ): RenderPageResult | Promise<RenderPageResult> => {
@@ -1240,7 +1265,7 @@ export async function renderToHTML(
         )
       }
 
-      if (concurrentFeatures) {
+      if (hasConcurrentFeatures) {
         bodyResult = async (suffix: string) => {
           // this must be called inside bodyResult so appWrappers is
           // up to date when getWrappedApp is called
@@ -1366,7 +1391,7 @@ export async function renderToHTML(
     optimizeCss: renderOpts.optimizeCss,
     optimizeFonts: renderOpts.optimizeFonts,
     optimizeImages: renderOpts.optimizeImages,
-    concurrentFeatures: renderOpts.concurrentFeatures,
+    runtime,
   }
 
   const document = (
@@ -1378,7 +1403,7 @@ export async function renderToHTML(
   )
 
   let documentHTML: string
-  if (concurrentFeatures) {
+  if (hasConcurrentFeatures) {
     const documentStream = await renderToStream(
       ReactDOMServer,
       document,
diff --git a/packages/next/server/web-server.ts b/packages/next/server/web-server.ts
index 3a3f88a8d6507..099377fb5a805 100644
--- a/packages/next/server/web-server.ts
+++ b/packages/next/server/web-server.ts
@@ -109,6 +109,10 @@ export default class NextWebServer extends BaseServer {
       },
     }
   }
+  protected getServerComponentManifest() {
+    // @TODO: Need to return `extendRenderOpts.serverComponentManifest` here.
+    return undefined
+  }
   protected async renderHTML(
     req: WebNextRequest,
     _res: WebNextResponse,
@@ -128,8 +132,8 @@ export default class NextWebServer extends BaseServer {
       {
         ...renderOpts,
         supportsDynamicHTML: true,
-        concurrentFeatures: true,
         disableOptimizedLoading: true,
+        runtime: 'edge',
       }
     )
   }
@@ -154,13 +158,6 @@ export default class NextWebServer extends BaseServer {
       uncork: () => {},
       // Not implemented: on/removeListener
     } as any)
-
-    // To prevent Safari's bfcache caching the "shell", we have to add the
-    // `no-cache` header to document responses.
-    res.setHeader(
-      'Cache-Control',
-      'no-cache, no-store, max-age=0, must-revalidate'
-    )
     res.send()
   }
   protected async runApi() {
diff --git a/packages/next/server/web/sandbox/readable-stream.ts b/packages/next/server/web/sandbox/readable-stream.ts
index 02d6651e3548f..824260922a62e 100644
--- a/packages/next/server/web/sandbox/readable-stream.ts
+++ b/packages/next/server/web/sandbox/readable-stream.ts
@@ -1,5 +1,3 @@
-import { TransformStream } from 'next/dist/compiled/web-streams-polyfill'
-
 class ReadableStream<T> {
   constructor(opts: UnderlyingSource = {}) {
     let closed = false
@@ -67,4 +65,4 @@ class ReadableStream<T> {
   }
 }
 
-export { TransformStream, ReadableStream }
+export { ReadableStream }
diff --git a/packages/next/shared/lib/utils.ts b/packages/next/shared/lib/utils.ts
index 4ee84008d349e..8bf0230b4841e 100644
--- a/packages/next/shared/lib/utils.ts
+++ b/packages/next/shared/lib/utils.ts
@@ -225,7 +225,7 @@ export type HtmlProps = {
   optimizeCss?: boolean
   optimizeFonts?: boolean
   optimizeImages?: boolean
-  concurrentFeatures?: boolean
+  runtime?: 'edge' | 'nodejs'
 }
 
 /**
diff --git a/packages/next/taskfile.js b/packages/next/taskfile.js
index de86e54a0b2cc..11e752d9981b9 100644
--- a/packages/next/taskfile.js
+++ b/packages/next/taskfile.js
@@ -1820,7 +1820,7 @@ export async function pages_document(task, opts) {
 
 export async function pages_document_server(task, opts) {
   await task
-    .source('pages/_document-web.tsx')
+    .source('pages/_document-concurrent.tsx')
     .swc('client', { dev: opts.dev })
     .target('dist/pages')
 }
diff --git a/test/integration/react-18-invalid-config/index.test.js b/test/integration/react-18-invalid-config/index.test.js
index fe7e1e20c1bd9..e0096a0b35023 100644
--- a/test/integration/react-18-invalid-config/index.test.js
+++ b/test/integration/react-18-invalid-config/index.test.js
@@ -13,29 +13,28 @@ function writeNextConfig(config) {
 }
 
 describe('Invalid react 18 webpack config', () => {
-  it('should enable `experimental.reactRoot` when `experimental.concurrentFeatures` enables', async () => {
+  it('should enable `experimental.reactRoot` when `experimental.runtime` is enabled', async () => {
     writeNextConfig({
-      concurrentFeatures: true,
+      runtime: 'edge',
     })
     const { stderr } = await nextBuild(appDir, [], { stderr: true })
     nextConfig.restore()
 
     expect(stderr).toContain(
-      '`experimental.concurrentFeatures` requires `experimental.reactRoot` to be enabled along with React 18.'
+      '`experimental.runtime` requires `experimental.reactRoot` to be enabled along with React 18.'
     )
   })
 
-  it('should enable `experimental.concurrentFeatures` for server components', async () => {
+  it('should require `experimental.runtime` for server components', async () => {
     writeNextConfig({
       reactRoot: true,
-      concurrentFeatures: false,
       serverComponents: true,
     })
     const { stderr } = await nextBuild(appDir, [], { stderr: true })
     nextConfig.restore()
 
     expect(stderr).toContain(
-      '`experimental.concurrentFeatures` is required to be enabled along with `experimental.serverComponents`.'
+      '`experimental.runtime` is required to be set along with `experimental.serverComponents`.'
     )
   })
 
diff --git a/test/integration/react-18/app/next.config.js b/test/integration/react-18/app/next.config.js
index c496d775591ab..54f5fa1a49795 100644
--- a/test/integration/react-18/app/next.config.js
+++ b/test/integration/react-18/app/next.config.js
@@ -3,7 +3,7 @@ const withReact18 = require('../test/with-react-18')
 module.exports = withReact18({
   experimental: {
     reactRoot: true,
-    // concurrentFeatures: true,
+    // runtime: 'edge',
   },
   images: {
     deviceSizes: [480, 1024, 1600, 2000],
diff --git a/test/integration/react-18/test/index.test.js b/test/integration/react-18/test/index.test.js
index 6486c2ed13232..49c21b8c3ee01 100644
--- a/test/integration/react-18/test/index.test.js
+++ b/test/integration/react-18/test/index.test.js
@@ -114,17 +114,14 @@ describe('Blocking mode', () => {
     dynamicHello.restore()
   })
 
-  runTests('concurrentFeatures is disabled', (context) =>
+  runTests('`runtime` is disabled', (context) =>
     blocking(context, (p, q) => renderViaHTTP(context.appPort, p, q))
   )
 })
 
-describe('Concurrent mode', () => {
+describe('Concurrent mode in the edge runtime', () => {
   beforeAll(async () => {
-    nextConfig.replace(
-      '// concurrentFeatures: true',
-      'concurrentFeatures: true'
-    )
+    nextConfig.replace("// runtime: 'edge'", "runtime: 'edge'")
     dynamicHello.replace('suspense = false', `suspense = true`)
     // `noSSR` mode will be ignored by suspense
     dynamicHello.replace('let ssr', `let ssr = false`)
@@ -134,7 +131,7 @@ describe('Concurrent mode', () => {
     dynamicHello.restore()
   })
 
-  runTests('concurrentFeatures is enabled', (context) => {
+  runTests('`runtime` is set to `edge`', (context) => {
     concurrent(context, (p, q) => renderViaHTTP(context.appPort, p, q))
 
     it('should stream to users', async () => {
diff --git a/test/integration/react-18/test/require-hook.js b/test/integration/react-18/test/require-hook.js
index 93d0836eaa57c..390d0f0a447e0 100644
--- a/test/integration/react-18/test/require-hook.js
+++ b/test/integration/react-18/test/require-hook.js
@@ -2,6 +2,8 @@ const mod = require('module')
 
 const hookPropertyMap = new Map([
   ['react', 'react-18'],
+  ['react/jsx-runtime', 'react-18/jsx-runtime'],
+  ['react/jsx-dev-runtime', 'react-18/jsx-dev-runtime'],
   ['react-dom', 'react-dom-18'],
   ['react-dom/server', 'react-dom-18/server'],
   ['react-dom/server.browser', 'react-dom-18/server.browser'],
diff --git a/test/integration/react-streaming-and-server-components/app/next.config.js b/test/integration/react-streaming-and-server-components/app/next.config.js
index c085913b78d2e..26829d37ca35a 100644
--- a/test/integration/react-streaming-and-server-components/app/next.config.js
+++ b/test/integration/react-streaming-and-server-components/app/next.config.js
@@ -7,7 +7,7 @@ module.exports = withReact18({
   pageExtensions: ['js', 'ts', 'jsx'], // .tsx won't be treat as page,
   experimental: {
     reactRoot: true,
-    concurrentFeatures: true,
     serverComponents: true,
+    runtime: 'edge',
   },
 })
diff --git a/test/integration/react-streaming-and-server-components/app/pages/404.js b/test/integration/react-streaming-and-server-components/app/pages/404.js
index 92471c97e449d..fd264d6b7ed87 100644
--- a/test/integration/react-streaming-and-server-components/app/pages/404.js
+++ b/test/integration/react-streaming-and-server-components/app/pages/404.js
@@ -1,3 +1,25 @@
+import { Suspense } from 'react'
+
+let result
+let promise
+function Data() {
+  if (result) return result
+  if (!promise)
+    promise = new Promise((res) => {
+      setTimeout(() => {
+        result = 'next_streaming_data'
+        res()
+      }, 500)
+    })
+  throw promise
+}
+
 export default function Page404() {
-  return 'custom-404-page'
+  return (
+    <Suspense fallback={null}>
+      custom-404-page
+      <br />
+      <Data />
+    </Suspense>
+  )
 }
diff --git a/test/integration/react-streaming-and-server-components/app/pages/partial-hydration.server.js b/test/integration/react-streaming-and-server-components/app/pages/partial-hydration.server.js
index f7b156a71d006..5214fccb70d37 100644
--- a/test/integration/react-streaming-and-server-components/app/pages/partial-hydration.server.js
+++ b/test/integration/react-streaming-and-server-components/app/pages/partial-hydration.server.js
@@ -5,7 +5,14 @@ import Counter from '../components/partial-hydration-counter.client'
 let result
 let promise
 function Data() {
-  if (result) return result
+  if (result) {
+    try {
+      return result
+    } finally {
+      promise = null
+      result = null
+    }
+  }
   if (!promise)
     promise = new Promise((res) => {
       setTimeout(() => {
@@ -19,6 +26,13 @@ function Data() {
 export default function Page() {
   return (
     <>
+      Current Runtime:{' '}
+      {typeof window === 'undefined'
+        ? typeof ReadableStream === 'undefined'
+          ? 'node-server'
+          : 'edge-server'
+        : 'browser'}
+      <br />
       <div className="suspense">
         <Suspense fallback="next_streaming_fallback">
           <Data />
diff --git a/test/integration/react-streaming-and-server-components/test/basic.js b/test/integration/react-streaming-and-server-components/test/basic.js
new file mode 100644
index 0000000000000..d9fe204a5cf79
--- /dev/null
+++ b/test/integration/react-streaming-and-server-components/test/basic.js
@@ -0,0 +1,30 @@
+import { renderViaHTTP } from 'next-test-utils'
+
+export default async function basic(context, env) {
+  it('should render 404 error correctly', async () => {
+    const path404HTML = await renderViaHTTP(context.appPort, '/404')
+    const pathNotFoundHTML = await renderViaHTTP(context.appPort, '/not-found')
+
+    expect(path404HTML).toContain('custom-404-page')
+    expect(pathNotFoundHTML).toContain('custom-404-page')
+  })
+
+  it('should render dynamic routes correctly', async () => {
+    const dynamicRoute1HTML = await renderViaHTTP(
+      context.appPort,
+      '/routes/dynamic1'
+    )
+    const dynamicRoute2HTML = await renderViaHTTP(
+      context.appPort,
+      '/routes/dynamic2'
+    )
+
+    expect(dynamicRoute1HTML).toContain('query: dynamic1')
+    expect(dynamicRoute2HTML).toContain('query: dynamic2')
+  })
+
+  it('should support api routes', async () => {
+    const res = await renderViaHTTP(context.appPort, '/api/ping')
+    expect(res).toContain('pong')
+  })
+}
diff --git a/test/integration/react-streaming-and-server-components/test/css.js b/test/integration/react-streaming-and-server-components/test/css.js
index f2cf95d9af075..e369a544b50e6 100644
--- a/test/integration/react-streaming-and-server-components/test/css.js
+++ b/test/integration/react-streaming-and-server-components/test/css.js
@@ -2,7 +2,7 @@
 import webdriver from 'next-webdriver'
 
 export default function (context) {
-  it('should include global styles under `concurrentFeatures: true`', async () => {
+  it("should include global styles under `runtime: 'edge'`", async () => {
     const browser = await webdriver(context.appPort, '/global-styles')
     const currentColor = await browser.eval(
       `window.getComputedStyle(document.querySelector('#red')).color`
diff --git a/test/integration/react-streaming-and-server-components/test/functions.js b/test/integration/react-streaming-and-server-components/test/functions.js
new file mode 100644
index 0000000000000..78c85e4455e66
--- /dev/null
+++ b/test/integration/react-streaming-and-server-components/test/functions.js
@@ -0,0 +1,43 @@
+/**
+ * This test contains everything related to edge and lambda functions such as
+ * functions-manifest.
+ */
+
+import fs from 'fs-extra'
+import { join } from 'path'
+import { nextBuild } from './utils'
+
+export default function (context) {
+  it('should not generate functions manifest when filesystem API is not enabled', async () => {
+    await nextBuild(context.appDir)
+    const functionsManifestPath = join(
+      context.distDir,
+      'server',
+      'functions-manifest.json'
+    )
+    await fs.remove(join(context.appDir, '.next'))
+    expect(fs.existsSync(functionsManifestPath)).toBe(false)
+  })
+  it('should contain rsc paths in functions manifest', async () => {
+    await nextBuild(context.appDir, { env: { ENABLE_FILE_SYSTEM_API: '1' } })
+    const functionsManifestPath = join(
+      context.distDir,
+      'server',
+      'functions-manifest.json'
+    )
+    const content = JSON.parse(fs.readFileSync(functionsManifestPath, 'utf8'))
+    const { pages } = content
+    const pageNames = Object.keys(pages)
+
+    const paths = ['/', '/next-api/link', '/routes/[dynamic]']
+    paths.forEach((path) => {
+      const { runtime, files } = pages[path]
+      expect(pageNames).toContain(path)
+      // Runtime of page `/` is undefined since it's configured as nodejs.
+      expect(runtime).toBe(path === '/' ? undefined : 'web')
+      expect(files.every((f) => f.startsWith('server/'))).toBe(true)
+    })
+
+    expect(content.version).toBe(1)
+  })
+}
diff --git a/test/integration/react-streaming-and-server-components/test/index.test.js b/test/integration/react-streaming-and-server-components/test/index.test.js
index 3c410b997c5be..74d10a028e8da 100644
--- a/test/integration/react-streaming-and-server-components/test/index.test.js
+++ b/test/integration/react-streaming-and-server-components/test/index.test.js
@@ -9,17 +9,17 @@ import {
   fetchViaHTTP,
   findPort,
   killApp,
-  launchApp,
-  nextBuild as _nextBuild,
-  nextStart as _nextStart,
   renderViaHTTP,
 } from 'next-test-utils'
 
+import { nextBuild, nextStart, nextDev } from './utils'
+
 import css from './css'
 import rsc from './rsc'
 import streaming from './streaming'
+import basic from './basic'
+import functions from './functions'
 
-const nodeArgs = ['-r', join(__dirname, '../../react-18/test/require-hook.js')]
 const appDir = join(__dirname, '../app')
 const nativeModuleTestAppDir = join(__dirname, '../unsupported-native-module')
 const distDir = join(__dirname, '../app/.next')
@@ -28,6 +28,7 @@ const appPage = new File(join(appDir, 'pages/_app.js'))
 const appServerPage = new File(join(appDir, 'pages/_app.server.js'))
 const error500Page = new File(join(appDir, 'pages/500.js'))
 const error404Page = new File(join(appDir, 'pages/404.js'))
+const nextConfig = new File(join(appDir, 'next.config.js'))
 
 const documentWithGip = `
 import { Html, Head, Main, NextScript } from 'next/document'
@@ -99,35 +100,10 @@ export default function Page404() {
 }
 `
 
-async function nextBuild(dir, options) {
-  return await _nextBuild(dir, [], {
-    ...options,
-    stdout: true,
-    stderr: true,
-    nodeArgs,
-  })
-}
-
-async function nextStart(dir, port) {
-  return await _nextStart(dir, port, {
-    stdout: true,
-    stderr: true,
-    nodeArgs,
-  })
-}
-
-async function nextDev(dir, port) {
-  return await launchApp(dir, port, {
-    stdout: true,
-    stderr: true,
-    nodeArgs,
-  })
-}
-
-describe('concurrentFeatures - basic', () => {
+describe('Edge runtime - basic', () => {
   it('should warn user for experimental risk with server components', async () => {
     const edgeRuntimeWarning =
-      'You are using the experimental Edge Runtime with `concurrentFeatures`.'
+      'You are using the experimental Edge Runtime with `experimental.runtime`.'
     const rscWarning = `You have experimental React Server Components enabled. Continue at your own risk.`
     const { stderr } = await nextBuild(appDir)
     expect(stderr).toContain(edgeRuntimeWarning)
@@ -136,7 +112,7 @@ describe('concurrentFeatures - basic', () => {
 
   it('should warn user that native node APIs are not supported', async () => {
     const fsImportedErrorMessage =
-      'Native Node.js APIs are not supported in the Edge Runtime with `concurrentFeatures` enabled. Found `dns` imported.'
+      'Native Node.js APIs are not supported in the Edge Runtime. Found `dns` imported.'
     const { stderr } = await nextBuild(nativeModuleTestAppDir)
     expect(stderr).toContain(fsImportedErrorMessage)
   })
@@ -156,7 +132,7 @@ describe('concurrentFeatures - basic', () => {
   })
 })
 
-describe('concurrentFeatures - prod', () => {
+describe('Edge runtime - prod', () => {
   const context = { appDir }
 
   beforeAll(async () => {
@@ -210,61 +186,17 @@ describe('concurrentFeatures - prod', () => {
     expect(html).toContain('foo.client')
   })
 
-  runBasicTests(context, 'prod')
-})
-
-describe('Functions manifest', () => {
-  it('should not generate functions manifest when filesystem API is not enabled', async () => {
-    await nextBuild(appDir)
-    const functionsManifestPath = join(
-      distDir,
-      'server',
-      'functions-manifest.json'
-    )
-    await fs.remove(join(appDir, '.next'))
-    expect(fs.existsSync(functionsManifestPath)).toBe(false)
+  it('should render 500 error correctly', async () => {
+    const path500HTML = await renderViaHTTP(context.appPort, '/err')
+    expect(path500HTML).toContain('custom-500-page')
   })
-  it('should contain rsc paths in functions manifest', async () => {
-    await nextBuild(appDir, { env: { ENABLE_FILE_SYSTEM_API: '1' } })
-    const functionsManifestPath = join(
-      distDir,
-      'server',
-      'functions-manifest.json'
-    )
-    const content = JSON.parse(fs.readFileSync(functionsManifestPath, 'utf8'))
-    const { pages } = content
-    const pageNames = Object.keys(pages)
-
-    const paths = ['/', '/next-api/link', '/routes/[dynamic]']
-    paths.forEach((path) => {
-      const { runtime, files } = pages[path]
-      expect(pageNames).toContain(path)
-      // Runtime of page `/` is undefined since it's configured as nodejs.
-      expect(runtime).toBe(path === '/' ? undefined : 'web')
-      expect(files.every((f) => f.startsWith('server/'))).toBe(true)
-    })
 
-    expect(content.version).toBe(1)
-  })
+  basic(context, 'prod')
+  rsc(context)
+  streaming(context)
 })
 
-const customAppPageSuite = {
-  runTests: (context) => {
-    it('should render container in app', async () => {
-      const indexHtml = await renderViaHTTP(context.appPort, '/')
-      const indexFlight = await renderViaHTTP(context.appPort, '/?__flight__=1')
-      expect(indexHtml).toContain('container-server')
-      expect(indexFlight).toContain('container-server')
-    })
-  },
-  beforeAll: () => appServerPage.write(rscAppPage),
-  afterAll: () => appServerPage.delete(),
-}
-
-runSuite('Custom App', 'dev', customAppPageSuite)
-runSuite('Custom App', 'prod', customAppPageSuite)
-
-describe('concurrentFeatures - dev', () => {
+describe('Edge runtime - dev', () => {
   const context = { appDir }
 
   beforeAll(async () => {
@@ -298,18 +230,46 @@ describe('concurrentFeatures - dev', () => {
     expect(bundle).not.toContain('moment')
   })
 
-  runBasicTests(context, 'dev')
+  it('should render 500 error correctly', async () => {
+    const path500HTML = await renderViaHTTP(context.appPort, '/err')
+
+    // In dev mode it should show the error popup.
+    expect(path500HTML).toContain('Error: oops')
+  })
+
+  basic(context, 'dev')
+  rsc(context)
+  streaming(context)
 })
 
+const nodejsRuntimeBasicSuite = {
+  runTests: (context, env) => {
+    basic(context, env)
+    streaming(context)
+  },
+  beforeAll: () => nextConfig.replace("runtime: 'edge'", "runtime: 'nodejs'"),
+  afterAll: () => nextConfig.restore(),
+}
+
+const customAppPageSuite = {
+  runTests: (context) => {
+    it('should render container in app', async () => {
+      const indexHtml = await renderViaHTTP(context.appPort, '/')
+      const indexFlight = await renderViaHTTP(context.appPort, '/?__flight__=1')
+      expect(indexHtml).toContain('container-server')
+      expect(indexFlight).toContain('container-server')
+    })
+  },
+  beforeAll: () => appServerPage.write(rscAppPage),
+  afterAll: () => appServerPage.delete(),
+}
+
 const cssSuite = {
   runTests: css,
   beforeAll: () => appPage.write(appWithGlobalCss),
   afterAll: () => appPage.delete(),
 }
 
-runSuite('CSS', 'dev', cssSuite)
-runSuite('CSS', 'prod', cssSuite)
-
 const documentSuite = {
   runTests: (context) => {
     it('should error when custom _document has getInitialProps method', async () => {
@@ -318,7 +278,7 @@ const documentSuite = {
 
       expect(res.status).toBe(500)
       expect(html).toContain(
-        '`getInitialProps` in Document component is not supported with `concurrentFeatures` enabled.'
+        '`getInitialProps` in Document component is not supported with the Edge Runtime.'
       )
     })
   },
@@ -326,72 +286,41 @@ const documentSuite = {
   afterAll: () => documentPage.delete(),
 }
 
-runSuite('document', 'dev', documentSuite)
-runSuite('document', 'prod', documentSuite)
-
-async function runBasicTests(context, env) {
-  it('should render 500 error correctly', async () => {
-    const path500HTML = await renderViaHTTP(context.appPort, '/err')
-
-    // In dev mode it should show the error popup.
-    const isDev = env === 'dev'
-    expect(path500HTML).toContain(isDev ? 'Error: oops' : 'custom-500-page')
-  })
-
-  it('should render 404 error correctly', async () => {
-    const path404HTML = await renderViaHTTP(context.appPort, '/404')
-    const pathNotFoundHTML = await renderViaHTTP(context.appPort, '/not-found')
-
-    expect(path404HTML).toContain('custom-404-page')
-    expect(pathNotFoundHTML).toContain('custom-404-page')
-  })
+runSuite('Node.js runtime', 'dev', nodejsRuntimeBasicSuite)
+runSuite('Node.js runtime', 'prod', nodejsRuntimeBasicSuite)
 
-  it('should render dynamic routes correctly', async () => {
-    const dynamicRoute1HTML = await renderViaHTTP(
-      context.appPort,
-      '/routes/dynamic1'
-    )
-    const dynamicRoute2HTML = await renderViaHTTP(
-      context.appPort,
-      '/routes/dynamic2'
-    )
+runSuite('Custom App', 'dev', customAppPageSuite)
+runSuite('Custom App', 'prod', customAppPageSuite)
 
-    expect(dynamicRoute1HTML).toContain('query: dynamic1')
-    expect(dynamicRoute2HTML).toContain('query: dynamic2')
-  })
+runSuite('CSS', 'dev', cssSuite)
+runSuite('CSS', 'prod', cssSuite)
 
-  it('should support api routes', async () => {
-    const res = await renderViaHTTP(context.appPort, '/api/ping')
-    expect(res).toContain('pong')
-  })
+runSuite('Custom Document', 'dev', documentSuite)
+runSuite('Custom Document', 'prod', documentSuite)
 
-  rsc(context)
-  streaming(context)
-}
+runSuite('Functions manifest', 'build', { runTests: functions })
 
 function runSuite(suiteName, env, options) {
-  const context = { appDir }
+  const context = { appDir, distDir }
   describe(`${suiteName} ${env}`, () => {
-    if (env === 'prod') {
-      beforeAll(async () => {
-        options.beforeAll?.()
+    beforeAll(async () => {
+      options.beforeAll?.()
+      if (env === 'prod') {
         context.appPort = await findPort()
         await nextBuild(context.appDir)
         context.server = await nextStart(context.appDir, context.appPort)
-      })
-    }
-    if (env === 'dev') {
-      beforeAll(async () => {
-        options.beforeAll?.()
+      }
+      if (env === 'dev') {
         context.appPort = await findPort()
         context.server = await nextDev(context.appDir, context.appPort)
-      })
-    }
+      }
+    })
     afterAll(async () => {
       options.afterAll?.()
-      await killApp(context.server)
+      if (context.server) {
+        await killApp(context.server)
+      }
     })
-
     options.runTests(context, env)
   })
 }
diff --git a/test/integration/react-streaming-and-server-components/test/streaming.js b/test/integration/react-streaming-and-server-components/test/streaming.js
index 9aedda759cf69..31b6e62591492 100644
--- a/test/integration/react-streaming-and-server-components/test/streaming.js
+++ b/test/integration/react-streaming-and-server-components/test/streaming.js
@@ -17,18 +17,6 @@ async function resolveStreamResponse(response, onData) {
 }
 
 export default function (context) {
-  it('should disable cache for fizz pages', async () => {
-    const urls = ['/', '/next-api/image', '/next-api/link']
-    await Promise.all(
-      urls.map(async (url) => {
-        const { headers } = await fetchViaHTTP(context.appPort, url)
-        expect(headers.get('cache-control')).toBe(
-          'no-cache, no-store, max-age=0, must-revalidate'
-        )
-      })
-    )
-  })
-
   it('should support streaming for fizz response', async () => {
     await fetchViaHTTP(context.appPort, '/streaming', null, {}).then(
       async (response) => {
diff --git a/test/integration/react-streaming-and-server-components/test/utils.js b/test/integration/react-streaming-and-server-components/test/utils.js
new file mode 100644
index 0000000000000..99c6056bb0297
--- /dev/null
+++ b/test/integration/react-streaming-and-server-components/test/utils.js
@@ -0,0 +1,33 @@
+import { join } from 'path'
+import {
+  launchApp,
+  nextBuild as _nextBuild,
+  nextStart as _nextStart,
+} from 'next-test-utils'
+
+const nodeArgs = ['-r', join(__dirname, '../../react-18/test/require-hook.js')]
+
+export async function nextBuild(dir, options) {
+  return await _nextBuild(dir, [], {
+    ...options,
+    stdout: true,
+    stderr: true,
+    nodeArgs,
+  })
+}
+
+export async function nextStart(dir, port) {
+  return await _nextStart(dir, port, {
+    stdout: true,
+    stderr: true,
+    nodeArgs,
+  })
+}
+
+export async function nextDev(dir, port) {
+  return await launchApp(dir, port, {
+    stdout: true,
+    stderr: true,
+    nodeArgs,
+  })
+}
diff --git a/test/integration/react-streaming-and-server-components/unsupported-native-module/next.config.js b/test/integration/react-streaming-and-server-components/unsupported-native-module/next.config.js
index 17e58bc6af59e..4783ccbdadb78 100644
--- a/test/integration/react-streaming-and-server-components/unsupported-native-module/next.config.js
+++ b/test/integration/react-streaming-and-server-components/unsupported-native-module/next.config.js
@@ -3,7 +3,7 @@ const withReact18 = require('../../react-18/test/with-react-18')
 module.exports = withReact18({
   experimental: {
     reactRoot: true,
-    concurrentFeatures: true,
+    runtime: 'edge',
     serverComponents: true,
   },
 })