diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
index b7d7520ef8..defd1db8f4 100644
--- a/.github/workflows/unit.yml
+++ b/.github/workflows/unit.yml
@@ -66,6 +66,8 @@ jobs:
               run: yarn test:types
             - name: Run unit tests
               run: yarn test:ci
+            - name: Run unit tests in production mode
+              run: yarn test:production --no-watch
             - name: Upload unit test coverage report
               uses: actions/upload-artifact@v4
               with:
diff --git a/package.json b/package.json
index 3678b0d059..756351674d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "lwc-monorepo",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "private": true,
     "description": "Lightning Web Components",
     "repository": {
@@ -19,6 +19,7 @@
         "copy-fork": "./scripts/tasks/unsafe-external-contributor-ci-workaround.sh",
         "dev": "nx run-many --target=dev --all --parallel=999 --exclude=@lwc/perf-benchmarks,@lwc/perf-benchmarks-components,@lwc/integration-tests",
         "test": "vitest --workspace vitest.workspace.mjs",
+        "test:production": "VITE_NODE_ENV=production vitest --workspace vitest.workspace.mjs",
         "test:bespoke": "nx run-many --target=test",
         "test:debug": "vitest --workspace vitest.workspace.mjs --inspect-brk --no-file-parallelism",
         "test:ci": "vitest run --workspace vitest.workspace.mjs --coverage",
@@ -79,7 +80,7 @@
         "*.{css,js,json,md,mjs,ts,yaml,yml}": "prettier --write",
         "{packages/**/package.json,scripts/tasks/check-and-rewrite-package-json.js}": "node ./scripts/tasks/check-and-rewrite-package-json.js",
         "{LICENSE-CORE.md,**/LICENSE.md,yarn.lock,scripts/tasks/generate-license-files.js,scripts/shared/bundled-dependencies.js}": "node ./scripts/tasks/generate-license-files.js",
-        "*.{only,skip}": "eslint --cache --no-eslintrc --plugin '@lwc/eslint-plugin-lwc-internal' --rule '@lwc/lwc-internal/forbidden-filename: error'"
+        "*.{only,skip}": "eslint --cache --plugin '@lwc/eslint-plugin-lwc-internal' --rule '@lwc/lwc-internal/forbidden-filename: error'"
     },
     "workspaces": [
         "packages/@lwc/*",
diff --git a/packages/@lwc/aria-reflection/package.json b/packages/@lwc/aria-reflection/package.json
index cdf23a688f..ca2d7d0748 100644
--- a/packages/@lwc/aria-reflection/package.json
+++ b/packages/@lwc/aria-reflection/package.json
@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/aria-reflection",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "description": "ARIA element reflection polyfill for strings",
     "keywords": [
         "aom",
diff --git a/packages/@lwc/babel-plugin-component/package.json b/packages/@lwc/babel-plugin-component/package.json
index 9d9969ab78..1c97b6e8b8 100644
--- a/packages/@lwc/babel-plugin-component/package.json
+++ b/packages/@lwc/babel-plugin-component/package.json
@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/babel-plugin-component",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "description": "Babel plugin to transform a LWC module",
     "keywords": [
         "lwc"
@@ -47,8 +47,8 @@
     },
     "dependencies": {
         "@babel/helper-module-imports": "7.25.9",
-        "@lwc/errors": "8.14.0",
-        "@lwc/shared": "8.14.0",
+        "@lwc/errors": "8.16.0",
+        "@lwc/shared": "8.16.0",
         "line-column": "~1.0.2"
     },
     "devDependencies": {
diff --git a/packages/@lwc/compiler/package.json b/packages/@lwc/compiler/package.json
index fcb8b4ab13..4f68f2c13a 100644
--- a/packages/@lwc/compiler/package.json
+++ b/packages/@lwc/compiler/package.json
@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/compiler",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "description": "LWC compiler",
     "keywords": [
         "lwc"
@@ -52,11 +52,11 @@
         "@babel/plugin-transform-class-properties": "7.25.9",
         "@babel/plugin-transform-object-rest-spread": "7.25.9",
         "@locker/babel-plugin-transform-unforgeables": "0.22.0",
-        "@lwc/babel-plugin-component": "8.14.0",
-        "@lwc/errors": "8.14.0",
-        "@lwc/shared": "8.14.0",
-        "@lwc/ssr-compiler": "8.14.0",
-        "@lwc/style-compiler": "8.14.0",
-        "@lwc/template-compiler": "8.14.0"
+        "@lwc/babel-plugin-component": "8.16.0",
+        "@lwc/errors": "8.16.0",
+        "@lwc/shared": "8.16.0",
+        "@lwc/ssr-compiler": "8.16.0",
+        "@lwc/style-compiler": "8.16.0",
+        "@lwc/template-compiler": "8.16.0"
     }
 }
diff --git a/packages/@lwc/engine-core/package.json b/packages/@lwc/engine-core/package.json
index 7a32c9d277..29a0d4efe9 100644
--- a/packages/@lwc/engine-core/package.json
+++ b/packages/@lwc/engine-core/package.json
@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/engine-core",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "description": "Core LWC engine APIs.",
     "keywords": [
         "lwc"
@@ -46,9 +46,9 @@
         }
     },
     "dependencies": {
-        "@lwc/features": "8.14.0",
-        "@lwc/shared": "8.14.0",
-        "@lwc/signals": "8.14.0"
+        "@lwc/features": "8.16.0",
+        "@lwc/shared": "8.16.0",
+        "@lwc/signals": "8.16.0"
     },
     "devDependencies": {
         "observable-membrane": "2.0.0"
diff --git a/packages/@lwc/engine-core/src/framework/check-version-mismatch.ts b/packages/@lwc/engine-core/src/framework/check-version-mismatch.ts
index 9b555336a2..e1bdf7733a 100644
--- a/packages/@lwc/engine-core/src/framework/check-version-mismatch.ts
+++ b/packages/@lwc/engine-core/src/framework/check-version-mismatch.ts
@@ -38,7 +38,7 @@ export function checkVersionMismatch(
 ) {
     const versionMatcher = func.toString().match(LWC_VERSION_COMMENT_REGEX);
     if (!isNull(versionMatcher) && !warned) {
-        if (process.env.SKIP_LWC_VERSION_MISMATCH_CHECK === 'true') {
+        if (typeof process === 'object' && process.env.SKIP_LWC_VERSION_MISMATCH_CHECK === 'true') {
             warned = true; // skip printing out version mismatch errors when env var is set
             return;
         }
diff --git a/packages/@lwc/engine-core/src/framework/hydration.ts b/packages/@lwc/engine-core/src/framework/hydration.ts
index 2eb6002c87..6c1a65c7d9 100644
--- a/packages/@lwc/engine-core/src/framework/hydration.ts
+++ b/packages/@lwc/engine-core/src/framework/hydration.ts
@@ -368,7 +368,12 @@ function hydrateElement(elm: Node, vnode: VElement, renderer: RendererAPI): Node
 
     patchElementPropsAndAttrsAndRefs(vnode, renderer);
 
-    if (!isDomManual) {
+    // When <lwc-style> tags are initially encountered at the time of HTML parse, the <lwc-style> tag is
+    // replaced with an empty <style> tag. Additionally, the styles are attached to the shadow root as a
+    // constructed stylesheet at the same time. So, the shadow will be styled correctly and the only
+    // difference between what's in the DOM and what's in the VDOM is the string content inside the
+    // <style> tag. We can simply ignore that during hyration.
+    if (!isDomManual && vnode.elm.tagName !== 'STYLE') {
         const { getFirstChild } = renderer;
         hydrateChildren(getFirstChild(elm), vnode.children, elm, owner, false);
     }
diff --git a/packages/@lwc/engine-dom/package.json b/packages/@lwc/engine-dom/package.json
index fec7739454..69f3677708 100644
--- a/packages/@lwc/engine-dom/package.json
+++ b/packages/@lwc/engine-dom/package.json
@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/engine-dom",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "description": "Renders LWC components in a DOM environment.",
     "keywords": [
         "lwc"
@@ -46,9 +46,9 @@
         }
     },
     "devDependencies": {
-        "@lwc/engine-core": "8.14.0",
-        "@lwc/shared": "8.14.0",
-        "@lwc/features": "8.14.0"
+        "@lwc/engine-core": "8.16.0",
+        "@lwc/shared": "8.16.0",
+        "@lwc/features": "8.16.0"
     },
     "lwc": {
         "modules": [
diff --git a/packages/@lwc/engine-dom/src/formatters/__tests__/component.spec.ts b/packages/@lwc/engine-dom/src/formatters/__tests__/component.spec.ts
index 975a17c77d..9bc4eee25e 100644
--- a/packages/@lwc/engine-dom/src/formatters/__tests__/component.spec.ts
+++ b/packages/@lwc/engine-dom/src/formatters/__tests__/component.spec.ts
@@ -15,7 +15,7 @@ import {
 import { LOWEST_API_VERSION } from '@lwc/shared';
 
 // it needs to be imported from the window, otherwise the checks for associated vms is done against "@lwc/engine-core"
-const LightningElementFormatter = (globalThis as any)['devtoolsFormatters'].find((f: any) => {
+const LightningElementFormatter = (globalThis as any)['devtoolsFormatters']?.find((f: any) => {
     return f.name === 'LightningElementFormatter';
 });
 
@@ -33,8 +33,9 @@ class WireAdapter {
     disconnect() {}
 }
 
-describe('Lightning Element formatter', () => {
-    const { header } = LightningElementFormatter;
+// LightningElementFormatter is not exposed in prod mode
+describe.skipIf(process.env.NODE_ENV === 'production')('Lightning Element formatter', () => {
+    const header = LightningElementFormatter?.header;
 
     it('should not contain body', () => {
         expect(LightningElementFormatter.hasBody()).toBe(false);
diff --git a/packages/@lwc/engine-server/package.json b/packages/@lwc/engine-server/package.json
index bf23e178a3..97416f7eaf 100644
--- a/packages/@lwc/engine-server/package.json
+++ b/packages/@lwc/engine-server/package.json
@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/engine-server",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "description": "Renders LWC components in a server environment.",
     "keywords": [
         "lwc"
@@ -46,10 +46,10 @@
         }
     },
     "devDependencies": {
-        "@lwc/engine-core": "8.14.0",
-        "@lwc/rollup-plugin": "8.14.0",
-        "@lwc/shared": "8.14.0",
-        "@lwc/features": "8.14.0",
+        "@lwc/engine-core": "8.16.0",
+        "@lwc/rollup-plugin": "8.16.0",
+        "@lwc/shared": "8.16.0",
+        "@lwc/features": "8.16.0",
         "@rollup/plugin-virtual": "^3.0.2",
         "parse5": "^7.2.1"
     }
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures.spec.ts b/packages/@lwc/engine-server/src/__tests__/fixtures.spec.ts
index 1b2370aa8b..3fd40c2902 100755
--- a/packages/@lwc/engine-server/src/__tests__/fixtures.spec.ts
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures.spec.ts
@@ -13,6 +13,7 @@ import { testFixtureDir, formatHTML, pluginVirtual } from '@lwc/test-utils-lwc-i
 import { setFeatureFlagForTest } from '../index';
 import type { LightningElementConstructor } from '@lwc/engine-core/dist/framework/base-lightning-element';
 import type { RollupLwcOptions } from '@lwc/rollup-plugin';
+import type { FeatureFlagName } from '@lwc/features/dist/types';
 
 vi.mock('lwc', async () => {
     const lwcEngineServer = await import('../index');
@@ -33,6 +34,9 @@ interface FixtureConfig {
 
     /** Props to provide to the root component. */
     props?: Record<string, string>;
+
+    /** Feature flags to enable for the test. */
+    features: FeatureFlagName[];
 }
 
 async function compileFixture({
@@ -102,6 +106,7 @@ function testFixtures(options?: RollupLwcOptions) {
     testFixtureDir<FixtureConfig>(
         {
             root: path.resolve(__dirname, 'fixtures'),
+            ssrVersion: 1,
             pattern: '**/config.json',
         },
         async ({ dirname, config }) => {
@@ -161,7 +166,8 @@ function testFixtures(options?: RollupLwcOptions) {
     );
 }
 
-describe.concurrent('fixtures', () => {
+// TODO [#5134]: Enable these tests in production mode
+describe.skipIf(process.env.NODE_ENV === 'production').concurrent('fixtures', () => {
     beforeAll(() => {
         // ENABLE_WIRE_SYNC_EMIT is used because this mimics the behavior for LWR in SSR mode. It's also more reasonable
         // for how both `engine-server` and `ssr-runtime` behave, which is to use sync rendering.
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles-only-in-child/dynamic/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles-only-in-child/dynamic/expected.html
index bdd02d6c92..ce2037c3a3 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles-only-in-child/dynamic/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles-only-in-child/dynamic/expected.html
@@ -2,9 +2,11 @@
   <template shadowrootmode="open">
     <x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
+        <style class="lwc-5h3d35cke7v" id="lwc-style--0" type="text/css">
           :host {background: blue;}
         </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="lwc-5h3d35cke7v">
@@ -15,9 +17,8 @@
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="lwc-5h3d35cke7v">
@@ -28,9 +29,8 @@
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="lwc-5h3d35cke7v">
@@ -41,9 +41,8 @@
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="lwc-5h3d35cke7v">
@@ -54,9 +53,8 @@
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="lwc-5h3d35cke7v">
@@ -67,9 +65,8 @@
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="lwc-5h3d35cke7v">
@@ -80,9 +77,8 @@
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="lwc-5h3d35cke7v">
@@ -93,9 +89,8 @@
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="lwc-5h3d35cke7v">
@@ -106,9 +101,8 @@
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="lwc-5h3d35cke7v">
@@ -119,9 +113,8 @@
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="lwc-5h3d35cke7v">
@@ -132,9 +125,8 @@
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="bar foo lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="bar foo lwc-5h3d35cke7v">
@@ -145,9 +137,8 @@
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="baz foo lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="baz foo lwc-5h3d35cke7v">
@@ -158,9 +149,8 @@
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="bar foo lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="bar foo lwc-5h3d35cke7v">
@@ -171,9 +161,8 @@
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="bar foo lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="bar foo lwc-5h3d35cke7v">
@@ -184,9 +173,8 @@
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="BaR FOO lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="BaR FOO lwc-5h3d35cke7v">
@@ -197,9 +185,8 @@
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="foo lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="foo lwc-5h3d35cke7v">
@@ -210,9 +197,8 @@
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="foo lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="foo lwc-5h3d35cke7v">
@@ -223,9 +209,8 @@
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="&quot;'<&amp; lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="&quot;'<&amp; lwc-5h3d35cke7v">
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles-only-in-child/static/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles-only-in-child/static/expected.html
index 3a4bcc4564..cab0de7c37 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles-only-in-child/static/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles-only-in-child/static/expected.html
@@ -2,90 +2,83 @@
   <template shadowrootmode="open">
     <x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
+        <style class="lwc-5h3d35cke7v" id="lwc-style--0" type="text/css">
           :host {background: blue;}
         </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
       </template>
     </x-child>
     <x-child class="foo lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
       </template>
     </x-child>
     <x-child class="foo lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
       </template>
     </x-child>
     <x-child class="bar foo lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
       </template>
     </x-child>
     <x-child class="bar foo lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
       </template>
     </x-child>
     <x-child class="BAR BaZ FoA lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host tabs" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host newlines" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
       </template>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles-only-in-parent/dynamic/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles-only-in-parent/dynamic/expected.html
index 50e0996efc..cc658ae7dd 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles-only-in-parent/dynamic/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles-only-in-parent/dynamic/expected.html
@@ -1,8 +1,10 @@
 <fixture-test class="lwc-ts1rr7v761-host" data-lwc-host-scope-token="lwc-ts1rr7v761-host">
   <template shadowrootmode="open">
-    <style class="lwc-ts1rr7v761" type="text/css">
+    <style class="lwc-ts1rr7v761" id="lwc-style--0" type="text/css">
       :host {background: green;}
     </style>
+    <lwc-style style-id="lwc-style--0">
+    </lwc-style>
     <x-child class="lwc-ts1rr7v761">
       <template shadowrootmode="open">
         <div>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles-only-in-parent/static/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles-only-in-parent/static/expected.html
index e33e9e1d91..2bfd226c6a 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles-only-in-parent/static/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles-only-in-parent/static/expected.html
@@ -1,8 +1,10 @@
 <fixture-test class="lwc-ts1rr7v761-host" data-lwc-host-scope-token="lwc-ts1rr7v761-host">
   <template shadowrootmode="open">
-    <style class="lwc-ts1rr7v761" type="text/css">
+    <style class="lwc-ts1rr7v761" id="lwc-style--0" type="text/css">
       :host {background: green;}
     </style>
+    <lwc-style style-id="lwc-style--0">
+    </lwc-style>
     <x-child class="lwc-ts1rr7v761">
       <template shadowrootmode="open">
         <div>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles/dynamic/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles/dynamic/expected.html
index a9d9464c89..2d2fe174c0 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles/dynamic/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles/dynamic/expected.html
@@ -1,276 +1,250 @@
 <fixture-test class="lwc-ts1rr7v761-host" data-lwc-host-scope-token="lwc-ts1rr7v761-host">
   <template shadowrootmode="open">
-    <style class="lwc-ts1rr7v761" type="text/css">
+    <style class="lwc-ts1rr7v761" id="lwc-style--0" type="text/css">
       :host {background: green;}
     </style>
+    <lwc-style style-id="lwc-style--0">
+    </lwc-style>
     <x-child class="lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
+        <style class="lwc-5h3d35cke7v" id="lwc-style--1" type="text/css">
           :host {background: blue;}
         </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="lwc-42b236sbaik-host lwc-5h3d35cke7v" data-lwc-host-scope-token="lwc-42b236sbaik-host">
           <template shadowrootmode="open">
-            <style class="lwc-42b236sbaik" type="text/css">
+            <style class="lwc-42b236sbaik" id="lwc-style--2" type="text/css">
               :host {background: red;}
             </style>
+            <lwc-style style-id="lwc-style--2">
+            </lwc-style>
           </template>
         </x-grandchild>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="lwc-42b236sbaik-host lwc-5h3d35cke7v" data-lwc-host-scope-token="lwc-42b236sbaik-host">
           <template shadowrootmode="open">
-            <style class="lwc-42b236sbaik" type="text/css">
-              :host {background: red;}
-            </style>
+            <lwc-style style-id="lwc-style--2">
+            </lwc-style>
           </template>
         </x-grandchild>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="lwc-42b236sbaik-host lwc-5h3d35cke7v" data-lwc-host-scope-token="lwc-42b236sbaik-host">
           <template shadowrootmode="open">
-            <style class="lwc-42b236sbaik" type="text/css">
-              :host {background: red;}
-            </style>
+            <lwc-style style-id="lwc-style--2">
+            </lwc-style>
           </template>
         </x-grandchild>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="lwc-42b236sbaik-host lwc-5h3d35cke7v" data-lwc-host-scope-token="lwc-42b236sbaik-host">
           <template shadowrootmode="open">
-            <style class="lwc-42b236sbaik" type="text/css">
-              :host {background: red;}
-            </style>
+            <lwc-style style-id="lwc-style--2">
+            </lwc-style>
           </template>
         </x-grandchild>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="lwc-42b236sbaik-host lwc-5h3d35cke7v" data-lwc-host-scope-token="lwc-42b236sbaik-host">
           <template shadowrootmode="open">
-            <style class="lwc-42b236sbaik" type="text/css">
-              :host {background: red;}
-            </style>
+            <lwc-style style-id="lwc-style--2">
+            </lwc-style>
           </template>
         </x-grandchild>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="lwc-42b236sbaik-host lwc-5h3d35cke7v" data-lwc-host-scope-token="lwc-42b236sbaik-host">
           <template shadowrootmode="open">
-            <style class="lwc-42b236sbaik" type="text/css">
-              :host {background: red;}
-            </style>
+            <lwc-style style-id="lwc-style--2">
+            </lwc-style>
           </template>
         </x-grandchild>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="lwc-42b236sbaik-host lwc-5h3d35cke7v" data-lwc-host-scope-token="lwc-42b236sbaik-host">
           <template shadowrootmode="open">
-            <style class="lwc-42b236sbaik" type="text/css">
-              :host {background: red;}
-            </style>
+            <lwc-style style-id="lwc-style--2">
+            </lwc-style>
           </template>
         </x-grandchild>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="lwc-42b236sbaik-host lwc-5h3d35cke7v" data-lwc-host-scope-token="lwc-42b236sbaik-host">
           <template shadowrootmode="open">
-            <style class="lwc-42b236sbaik" type="text/css">
-              :host {background: red;}
-            </style>
+            <lwc-style style-id="lwc-style--2">
+            </lwc-style>
           </template>
         </x-grandchild>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="lwc-42b236sbaik-host lwc-5h3d35cke7v" data-lwc-host-scope-token="lwc-42b236sbaik-host">
           <template shadowrootmode="open">
-            <style class="lwc-42b236sbaik" type="text/css">
-              :host {background: red;}
-            </style>
+            <lwc-style style-id="lwc-style--2">
+            </lwc-style>
           </template>
         </x-grandchild>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
         <div class="lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="lwc-42b236sbaik-host lwc-5h3d35cke7v" data-lwc-host-scope-token="lwc-42b236sbaik-host">
           <template shadowrootmode="open">
-            <style class="lwc-42b236sbaik" type="text/css">
-              :host {background: red;}
-            </style>
+            <lwc-style style-id="lwc-style--2">
+            </lwc-style>
           </template>
         </x-grandchild>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
         <div class="bar foo lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="bar foo lwc-42b236sbaik-host lwc-5h3d35cke7v" data-lwc-host-scope-token="lwc-42b236sbaik-host">
           <template shadowrootmode="open">
-            <style class="lwc-42b236sbaik" type="text/css">
-              :host {background: red;}
-            </style>
+            <lwc-style style-id="lwc-style--2">
+            </lwc-style>
           </template>
         </x-grandchild>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
         <div class="baz foo lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="baz foo lwc-42b236sbaik-host lwc-5h3d35cke7v" data-lwc-host-scope-token="lwc-42b236sbaik-host">
           <template shadowrootmode="open">
-            <style class="lwc-42b236sbaik" type="text/css">
-              :host {background: red;}
-            </style>
+            <lwc-style style-id="lwc-style--2">
+            </lwc-style>
           </template>
         </x-grandchild>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
         <div class="bar foo lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="bar foo lwc-42b236sbaik-host lwc-5h3d35cke7v" data-lwc-host-scope-token="lwc-42b236sbaik-host">
           <template shadowrootmode="open">
-            <style class="lwc-42b236sbaik" type="text/css">
-              :host {background: red;}
-            </style>
+            <lwc-style style-id="lwc-style--2">
+            </lwc-style>
           </template>
         </x-grandchild>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
         <div class="bar foo lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="bar foo lwc-42b236sbaik-host lwc-5h3d35cke7v" data-lwc-host-scope-token="lwc-42b236sbaik-host">
           <template shadowrootmode="open">
-            <style class="lwc-42b236sbaik" type="text/css">
-              :host {background: red;}
-            </style>
+            <lwc-style style-id="lwc-style--2">
+            </lwc-style>
           </template>
         </x-grandchild>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
         <div class="BaR FOO lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="BaR FOO lwc-42b236sbaik-host lwc-5h3d35cke7v" data-lwc-host-scope-token="lwc-42b236sbaik-host">
           <template shadowrootmode="open">
-            <style class="lwc-42b236sbaik" type="text/css">
-              :host {background: red;}
-            </style>
+            <lwc-style style-id="lwc-style--2">
+            </lwc-style>
           </template>
         </x-grandchild>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
         <div class="foo lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="foo lwc-42b236sbaik-host lwc-5h3d35cke7v" data-lwc-host-scope-token="lwc-42b236sbaik-host">
           <template shadowrootmode="open">
-            <style class="lwc-42b236sbaik" type="text/css">
-              :host {background: red;}
-            </style>
+            <lwc-style style-id="lwc-style--2">
+            </lwc-style>
           </template>
         </x-grandchild>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
         <div class="foo lwc-5h3d35cke7v">
         </div>
         <x-grandchild class="foo lwc-42b236sbaik-host lwc-5h3d35cke7v" data-lwc-host-scope-token="lwc-42b236sbaik-host">
           <template shadowrootmode="open">
-            <style class="lwc-42b236sbaik" type="text/css">
-              :host {background: red;}
-            </style>
+            <lwc-style style-id="lwc-style--2">
+            </lwc-style>
           </template>
         </x-grandchild>
       </template>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles/static/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles/static/expected.html
index bf0afd6296..7e9e5c654e 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles/static/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles/static/expected.html
@@ -1,76 +1,71 @@
 <fixture-test class="lwc-ts1rr7v761-host" data-lwc-host-scope-token="lwc-ts1rr7v761-host">
   <template shadowrootmode="open">
-    <style class="lwc-ts1rr7v761" type="text/css">
+    <style class="lwc-ts1rr7v761" id="lwc-style--0" type="text/css">
       :host {background: green;}
     </style>
+    <lwc-style style-id="lwc-style--0">
+    </lwc-style>
     <x-child class="lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
+        <style class="lwc-5h3d35cke7v" id="lwc-style--1" type="text/css">
           :host {background: blue;}
         </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
       </template>
     </x-child>
     <x-child class="foo lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
       </template>
     </x-child>
     <x-child class="foo lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
       </template>
     </x-child>
     <x-child class="bar foo lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
       </template>
     </x-child>
     <x-child class="bar foo lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
       </template>
     </x-child>
     <x-child class="BAR BaZ FoA lwc-5h3d35cke7v-host lwc-ts1rr7v761" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host lwc-ts1rr7v761 tabs" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
       </template>
     </x-child>
     <x-child class="lwc-5h3d35cke7v-host lwc-ts1rr7v761 newlines" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
       <template shadowrootmode="open">
-        <style class="lwc-5h3d35cke7v" type="text/css">
-          :host {background: blue;}
-        </style>
+        <lwc-style style-id="lwc-style--1">
+        </lwc-style>
       </template>
     </x-child>
     <div class="lwc-ts1rr7v761">
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-dynamic-with-scoped-css/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-dynamic-with-scoped-css/expected.html
index cd3f3781c1..aa008cc72a 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-dynamic-with-scoped-css/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-dynamic-with-scoped-css/expected.html
@@ -1,8 +1,10 @@
 <fixture-test class="lwc-47oqt8q93b2-host" data-lwc-host-scope-token="lwc-47oqt8q93b2-host">
   <template shadowrootmode="open">
-    <style class="lwc-47oqt8q93b2" type="text/css">
+    <style class="lwc-47oqt8q93b2" id="lwc-style--0" type="text/css">
       div.lwc-47oqt8q93b2 {color: black;}div.kree.lwc-47oqt8q93b2 {color: blue;}
     </style>
+    <lwc-style style-id="lwc-style--0">
+    </lwc-style>
     <div class="kree lwc-47oqt8q93b2">
       In the middle of my backswing?!
     </div>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/scoped-styles/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/scoped-styles/expected.html
index dfefb7b229..b47610000f 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/scoped-styles/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/scoped-styles/expected.html
@@ -2,9 +2,11 @@
   <template shadowrootmode="open">
     <x-scoped-style class="lwc-2d8pgjj85pu-host" data-lwc-host-scope-token="lwc-2d8pgjj85pu-host">
       <template shadowrootmode="open">
-        <style class="lwc-2d8pgjj85pu" type="text/css">
+        <style class="lwc-2d8pgjj85pu" id="lwc-style--0" type="text/css">
           div.lwc-2d8pgjj85pu {background-color: wheat;}
         </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
         <div class="foo lwc-2d8pgjj85pu">
         </div>
         <div class="bar lwc-2d8pgjj85pu">
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/light-dom-multiple/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/light-dom-multiple/expected.html
index 9a46184615..e6af5bc7d7 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/light-dom-multiple/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/light-dom-multiple/expected.html
@@ -1,25 +1,33 @@
 <fixture-test>
-  <style type="text/css">
+  <style id="lwc-style--0" type="text/css">
     p {background-color: blue;}
   </style>
-  <style type="text/css">
+  <lwc-style style-id="lwc-style--0">
+  </lwc-style>
+  <style id="lwc-style--1" type="text/css">
     p {color: red;}
   </style>
+  <lwc-style style-id="lwc-style--1">
+  </lwc-style>
   <p>
     Hello
   </p>
   <x-one>
-    <style type="text/css">
+    <style id="lwc-style--2" type="text/css">
       p {color: saddlebrown;}
     </style>
+    <lwc-style style-id="lwc-style--2">
+    </lwc-style>
     <p>
       one
     </p>
   </x-one>
   <x-two>
-    <style type="text/css">
+    <style id="lwc-style--3" type="text/css">
       p {color: goldenrod;}
     </style>
+    <lwc-style style-id="lwc-style--3">
+    </lwc-style>
     <p>
       two
     </p>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/light-dom-scoped-styles-render/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/light-dom-scoped-styles-render/expected.html
index 1ec13e9483..92822c4dc1 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/light-dom-scoped-styles-render/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/light-dom-scoped-styles-render/expected.html
@@ -1,7 +1,9 @@
 <fixture-test class="lwc-7q48250iir7-host" data-lwc-host-scope-token="lwc-7q48250iir7-host">
-  <style class="lwc-7q48250iir7" type="text/css">
+  <style class="lwc-7q48250iir7" id="lwc-style--0" type="text/css">
     p.lwc-7q48250iir7 {background-color: blue;}
   </style>
+  <lwc-style style-id="lwc-style--0">
+  </lwc-style>
   <p class="lwc-7q48250iir7">
     Hello
   </p>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/light-dom-scoped-styles/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/light-dom-scoped-styles/expected.html
index 654e01cac5..fa571a3aa3 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/light-dom-scoped-styles/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/light-dom-scoped-styles/expected.html
@@ -1,10 +1,14 @@
 <fixture-test class="lwc-1rssj1tib70-host" data-lwc-host-scope-token="lwc-1rssj1tib70-host">
-  <style class="lwc-1rssj1tib70" type="text/css">
+  <style class="lwc-1rssj1tib70" id="lwc-style--0" type="text/css">
     p {color: red;}
   </style>
-  <style class="lwc-1rssj1tib70" type="text/css">
+  <lwc-style style-id="lwc-style--0">
+  </lwc-style>
+  <style class="lwc-1rssj1tib70" id="lwc-style--1" type="text/css">
     p.lwc-1rssj1tib70 {background-color: blue;}.lwc-1rssj1tib70-host {display: block;border: 1px solid black;}
   </style>
+  <lwc-style style-id="lwc-style--1">
+  </lwc-style>
   <p class="lwc-1rssj1tib70">
     Hello
   </p>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/light-dom-styles-dir-host/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/light-dom-styles-dir-host/expected.html
index c45678dcfb..ed02c1d23e 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/light-dom-styles-dir-host/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/light-dom-styles-dir-host/expected.html
@@ -1,10 +1,14 @@
 <fixture-test class="lwc-1rssj1tib70-host" data-lwc-host-scope-token="lwc-1rssj1tib70-host">
-  <style class="lwc-1rssj1tib70" type="text/css">
+  <style class="lwc-1rssj1tib70" id="lwc-style--0" type="text/css">
      :dir(rtl) {margin-left: 0;}:host {color: red;}
   </style>
-  <style class="lwc-1rssj1tib70" type="text/css">
+  <lwc-style style-id="lwc-style--0">
+  </lwc-style>
+  <style class="lwc-1rssj1tib70" id="lwc-style--1" type="text/css">
      :dir(ltr) {margin-right: 0;}.lwc-1rssj1tib70-host {color: blue;}
   </style>
+  <lwc-style style-id="lwc-style--1">
+  </lwc-style>
   <p class="lwc-1rssj1tib70">
     Hello
   </p>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/light-dom/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/light-dom/expected.html
index d72ea0fec5..37ae856dd0 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/light-dom/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/light-dom/expected.html
@@ -1,7 +1,9 @@
 <fixture-test>
-  <style type="text/css">
+  <style id="lwc-style--0" type="text/css">
     p {color: red;}
   </style>
+  <lwc-style style-id="lwc-style--0">
+  </lwc-style>
   <p>
     Hello
   </p>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/no-dup-styles/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/no-dup-styles/expected.html
index 24c8883195..6ddda6a30e 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/no-dup-styles/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/no-dup-styles/expected.html
@@ -2,16 +2,17 @@
   <template shadowrootmode="open">
     <x-child>
       <template shadowrootmode="open">
-        <style type="text/css">
+        <style id="lwc-style--0" type="text/css">
           :host {color: chocolate;}
         </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
       </template>
     </x-child>
     <x-child>
       <template shadowrootmode="open">
-        <style type="text/css">
-          :host {color: chocolate;}
-        </style>
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
       </template>
     </x-child>
   </template>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/render-correct-tags/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/render-correct-tags/expected.html
index 099aeea0e0..4d6ec6e9df 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/render-correct-tags/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/render-correct-tags/expected.html
@@ -1,8 +1,10 @@
 <fixture-test class="lwc-4q9u0sqsfc0-host" data-lwc-host-scope-token="lwc-4q9u0sqsfc0-host">
   <template shadowrootmode="open">
-    <style class="lwc-4q9u0sqsfc0" type="text/css">
+    <style class="lwc-4q9u0sqsfc0" id="lwc-style--0" type="text/css">
       :host {background: blue;}
     </style>
+    <lwc-style style-id="lwc-style--0">
+    </lwc-style>
     <a class="lwc-4q9u0sqsfc0" href="https://www.salesforce.com/">
     </a>
     <label class="lwc-4q9u0sqsfc0" for="textInput">
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/scope-token/.skip b/packages/@lwc/engine-server/src/__tests__/fixtures/scope-token/.skip
new file mode 100644
index 0000000000..03bdfe79cc
--- /dev/null
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/scope-token/.skip
@@ -0,0 +1,3 @@
+W-17972327
+
+This test fails in CI and has been doing so intermittently in recent PRs. Unfortunately, it has been difficult to reproduce and resolve when running locally. Since the failure is unrelated to this PR, we're disabling the test and have filed a work item (reference above) to investigate separately.
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/scoped-slots/for-each/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/scoped-slots/for-each/expected.html
index e752aebe07..598503c1dc 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/scoped-slots/for-each/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/scoped-slots/for-each/expected.html
@@ -1,8 +1,10 @@
 <fixture-test>
   <template shadowrootmode="open">
-    <style type="text/css">
+    <style id="lwc-style--0" type="text/css">
       span {background-color: blue;}
     </style>
+    <lwc-style style-id="lwc-style--0">
+    </lwc-style>
     <x-child-with-for-each>
       <ul>
         <li>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/scoped-styles-with-existing-class/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/scoped-styles-with-existing-class/expected.html
index a09682d84f..bab0966300 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/scoped-styles-with-existing-class/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/scoped-styles-with-existing-class/expected.html
@@ -1,8 +1,10 @@
 <fixture-test class="lwc-6a8uqob2ku4-host" data-lwc-host-scope-token="lwc-6a8uqob2ku4-host">
   <template shadowrootmode="open">
-    <style class="lwc-6a8uqob2ku4" type="text/css">
+    <style class="lwc-6a8uqob2ku4" id="lwc-style--0" type="text/css">
       div.lwc-6a8uqob2ku4 {background-color: wheat;}
     </style>
+    <lwc-style style-id="lwc-style--0">
+    </lwc-style>
     <div class="foo lwc-6a8uqob2ku4">
     </div>
     <div class="bar lwc-6a8uqob2ku4">
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/shadow-dom-styles-dir-host/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/shadow-dom-styles-dir-host/expected.html
index bf12db9074..9bc6bfbff0 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/shadow-dom-styles-dir-host/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/shadow-dom-styles-dir-host/expected.html
@@ -1,11 +1,15 @@
 <fixture-test class="lwc-1rssj1tib70-host" data-lwc-host-scope-token="lwc-1rssj1tib70-host">
   <template shadowrootmode="open">
-    <style class="lwc-1rssj1tib70" type="text/css">
+    <style class="lwc-1rssj1tib70" id="lwc-style--0" type="text/css">
        :dir(rtl) {margin-left: 0;}:host {color: red;}
     </style>
-    <style class="lwc-1rssj1tib70" type="text/css">
+    <lwc-style style-id="lwc-style--0">
+    </lwc-style>
+    <style class="lwc-1rssj1tib70" id="lwc-style--1" type="text/css">
        :dir(ltr) {margin-right: 0;}:host {color: blue;}
     </style>
+    <lwc-style style-id="lwc-style--1">
+    </lwc-style>
     <p class="lwc-1rssj1tib70">
       Hello
     </p>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/scoped-and-unscoped-dynamic-render/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/scoped-and-unscoped-dynamic-render/expected.html
index 164e84f4a0..de1b41f96b 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/scoped-and-unscoped-dynamic-render/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/scoped-and-unscoped-dynamic-render/expected.html
@@ -1,17 +1,25 @@
 <fixture-test class="lwc-72njdrv8nr1-host" data-lwc-host-scope-token="lwc-72njdrv8nr1-host">
   <template shadowrootmode="open">
-    <style class="lwc-72njdrv8nr1" type="text/css">
+    <style class="lwc-72njdrv8nr1" id="lwc-style--0" type="text/css">
       h1 {border: 1px solid goldenrod;}
     </style>
-    <style class="lwc-72njdrv8nr1" type="text/css">
+    <lwc-style style-id="lwc-style--0">
+    </lwc-style>
+    <style class="lwc-72njdrv8nr1" id="lwc-style--1" type="text/css">
       h1.lwc-72njdrv8nr1 {outline: 2px solid chartreuse;}
     </style>
-    <style class="lwc-72njdrv8nr1" type="text/css">
+    <lwc-style style-id="lwc-style--1">
+    </lwc-style>
+    <style class="lwc-72njdrv8nr1" id="lwc-style--2" type="text/css">
       h1 {background: royalblue;}
     </style>
-    <style class="lwc-72njdrv8nr1" type="text/css">
+    <lwc-style style-id="lwc-style--2">
+    </lwc-style>
+    <style class="lwc-72njdrv8nr1" id="lwc-style--3" type="text/css">
       h1.lwc-72njdrv8nr1 {color: cornsilk;}
     </style>
+    <lwc-style style-id="lwc-style--3">
+    </lwc-style>
     <h1 class="lwc-72njdrv8nr1">
       hello
     </h1>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/scoped-and-unscoped-with-class/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/scoped-and-unscoped-with-class/expected.html
index 4ad8d36df3..1efc290e58 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/scoped-and-unscoped-with-class/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/scoped-and-unscoped-with-class/expected.html
@@ -1,11 +1,15 @@
 <fixture-test class="lwc-1l667kdb4s5-host" data-lwc-host-scope-token="lwc-1l667kdb4s5-host">
   <template shadowrootmode="open">
-    <style class="lwc-1l667kdb4s5" type="text/css">
+    <style class="lwc-1l667kdb4s5" id="lwc-style--0" type="text/css">
       .yolo {background: royalblue;}
     </style>
-    <style class="lwc-1l667kdb4s5" type="text/css">
+    <lwc-style style-id="lwc-style--0">
+    </lwc-style>
+    <style class="lwc-1l667kdb4s5" id="lwc-style--1" type="text/css">
       h1.lwc-1l667kdb4s5 {color: cornsilk;}
     </style>
+    <lwc-style style-id="lwc-style--1">
+    </lwc-style>
     <h1 class="lwc-1l667kdb4s5 yolo">
       hello
     </h1>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/scoped-and-unscoped-with-dynamic-class/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/scoped-and-unscoped-with-dynamic-class/expected.html
index 4ad8d36df3..1efc290e58 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/scoped-and-unscoped-with-dynamic-class/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/scoped-and-unscoped-with-dynamic-class/expected.html
@@ -1,11 +1,15 @@
 <fixture-test class="lwc-1l667kdb4s5-host" data-lwc-host-scope-token="lwc-1l667kdb4s5-host">
   <template shadowrootmode="open">
-    <style class="lwc-1l667kdb4s5" type="text/css">
+    <style class="lwc-1l667kdb4s5" id="lwc-style--0" type="text/css">
       .yolo {background: royalblue;}
     </style>
-    <style class="lwc-1l667kdb4s5" type="text/css">
+    <lwc-style style-id="lwc-style--0">
+    </lwc-style>
+    <style class="lwc-1l667kdb4s5" id="lwc-style--1" type="text/css">
       h1.lwc-1l667kdb4s5 {color: cornsilk;}
     </style>
+    <lwc-style style-id="lwc-style--1">
+    </lwc-style>
     <h1 class="lwc-1l667kdb4s5 yolo">
       hello
     </h1>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/scoped-and-unscoped/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/scoped-and-unscoped/expected.html
index e68b46a0f7..3b4226a416 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/scoped-and-unscoped/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/scoped-and-unscoped/expected.html
@@ -1,11 +1,15 @@
 <fixture-test class="lwc-1l667kdb4s5-host" data-lwc-host-scope-token="lwc-1l667kdb4s5-host">
   <template shadowrootmode="open">
-    <style class="lwc-1l667kdb4s5" type="text/css">
+    <style class="lwc-1l667kdb4s5" id="lwc-style--0" type="text/css">
       h1 {background: royalblue;}
     </style>
-    <style class="lwc-1l667kdb4s5" type="text/css">
+    <lwc-style style-id="lwc-style--0">
+    </lwc-style>
+    <style class="lwc-1l667kdb4s5" id="lwc-style--1" type="text/css">
       h1.lwc-1l667kdb4s5 {color: cornsilk;}
     </style>
+    <lwc-style style-id="lwc-style--1">
+    </lwc-style>
     <h1 class="lwc-1l667kdb4s5">
       hello
     </h1>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/unscoped-only-with-class/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/unscoped-only-with-class/expected.html
index 26ca09e765..3c129015f6 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/unscoped-only-with-class/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/unscoped-only-with-class/expected.html
@@ -1,8 +1,10 @@
 <fixture-test>
   <template shadowrootmode="open">
-    <style type="text/css">
+    <style id="lwc-style--0" type="text/css">
       .yolo {background: royalblue;}
     </style>
+    <lwc-style style-id="lwc-style--0">
+    </lwc-style>
     <h1 class="yolo">
       hello
     </h1>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/unscoped-only-with-dynamic-class/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/unscoped-only-with-dynamic-class/expected.html
index 26ca09e765..3c129015f6 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/unscoped-only-with-dynamic-class/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/unscoped-only-with-dynamic-class/expected.html
@@ -1,8 +1,10 @@
 <fixture-test>
   <template shadowrootmode="open">
-    <style type="text/css">
+    <style id="lwc-style--0" type="text/css">
       .yolo {background: royalblue;}
     </style>
+    <lwc-style style-id="lwc-style--0">
+    </lwc-style>
     <h1 class="yolo">
       hello
     </h1>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/unscoped-only/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/unscoped-only/expected.html
index 33df11f71e..1429e71d67 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/unscoped-only/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/unscoped-only/expected.html
@@ -1,8 +1,10 @@
 <fixture-test>
   <template shadowrootmode="open">
-    <style type="text/css">
+    <style id="lwc-style--0" type="text/css">
       h1 {background: royalblue;}
     </style>
+    <lwc-style style-id="lwc-style--0">
+    </lwc-style>
     <h1>
       hello
     </h1>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/unscoped-with-scoped-template-styles-and-class/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/unscoped-with-scoped-template-styles-and-class/expected.html
index 36ed374708..96a305ccb6 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/unscoped-with-scoped-template-styles-and-class/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/unscoped-with-scoped-template-styles-and-class/expected.html
@@ -1,11 +1,15 @@
 <fixture-test class="lwc-1l667kdb4s5-host" data-lwc-host-scope-token="lwc-1l667kdb4s5-host">
   <template shadowrootmode="open">
-    <style class="lwc-1l667kdb4s5" type="text/css">
+    <style class="lwc-1l667kdb4s5" id="lwc-style--0" type="text/css">
       h1.lwc-1l667kdb4s5 {opacity: 0.5;}
     </style>
-    <style class="lwc-1l667kdb4s5" type="text/css">
+    <lwc-style style-id="lwc-style--0">
+    </lwc-style>
+    <style class="lwc-1l667kdb4s5" id="lwc-style--1" type="text/css">
       .yolo {background: royalblue;}
     </style>
+    <lwc-style style-id="lwc-style--1">
+    </lwc-style>
     <h1 class="lwc-1l667kdb4s5 yolo">
       hello
     </h1>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/unscoped-with-scoped-template-styles/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/unscoped-with-scoped-template-styles/expected.html
index 37b998ea63..2aba5975e1 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/unscoped-with-scoped-template-styles/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/static-stylesheets/unscoped-with-scoped-template-styles/expected.html
@@ -1,11 +1,15 @@
 <fixture-test class="lwc-1l667kdb4s5-host" data-lwc-host-scope-token="lwc-1l667kdb4s5-host">
   <template shadowrootmode="open">
-    <style class="lwc-1l667kdb4s5" type="text/css">
+    <style class="lwc-1l667kdb4s5" id="lwc-style--0" type="text/css">
       h1.lwc-1l667kdb4s5 {opacity: 0.5;}
     </style>
-    <style class="lwc-1l667kdb4s5" type="text/css">
+    <lwc-style style-id="lwc-style--0">
+    </lwc-style>
+    <style class="lwc-1l667kdb4s5" id="lwc-style--1" type="text/css">
       h1 {background: royalblue;}
     </style>
+    <lwc-style style-id="lwc-style--1">
+    </lwc-style>
     <h1 class="lwc-1l667kdb4s5">
       hello
     </h1>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/config.json b/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/config.json
new file mode 100644
index 0000000000..b51f2d2df5
--- /dev/null
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/config.json
@@ -0,0 +1,4 @@
+{
+    "entry": "x/parent",
+    "styleDedupePrefix": "island1"
+}
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/error.txt b/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/error.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/expected.html
new file mode 100644
index 0000000000..0e78d18938
--- /dev/null
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/expected.html
@@ -0,0 +1,19 @@
+<fixture-test>
+  <template shadowrootmode="open">
+    <x-child>
+      <template shadowrootmode="open">
+        <style id="lwc-style-island1-0" type="text/css">
+          :host {color: chocolate;}
+        </style>
+        <lwc-style style-id="lwc-style-island1-0">
+        </lwc-style>
+      </template>
+    </x-child>
+    <x-child>
+      <template shadowrootmode="open">
+        <lwc-style style-id="lwc-style-island1-0">
+        </lwc-style>
+      </template>
+    </x-child>
+  </template>
+</fixture-test>
\ No newline at end of file
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/index.js b/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/index.js
new file mode 100644
index 0000000000..d5a55ceefa
--- /dev/null
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/index.js
@@ -0,0 +1,3 @@
+export const tagName = 'x-parent';
+export { default } from 'x/parent';
+export * from 'x/parent';
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/modules/x/child/child.css b/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/modules/x/child/child.css
new file mode 100644
index 0000000000..5d887b5489
--- /dev/null
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/modules/x/child/child.css
@@ -0,0 +1,3 @@
+:host {
+    color: chocolate;
+}
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/modules/x/child/child.html b/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/modules/x/child/child.html
new file mode 100644
index 0000000000..cc340bc4c9
--- /dev/null
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/modules/x/child/child.html
@@ -0,0 +1 @@
+<template></template>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/modules/x/child/child.js b/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/modules/x/child/child.js
new file mode 100644
index 0000000000..ca8dce94e0
--- /dev/null
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/modules/x/child/child.js
@@ -0,0 +1,3 @@
+import { LightningElement } from 'lwc';
+
+export default class extends LightningElement {}
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/modules/x/parent/parent.html b/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/modules/x/parent/parent.html
new file mode 100644
index 0000000000..3c639c9527
--- /dev/null
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/modules/x/parent/parent.html
@@ -0,0 +1,4 @@
+<template>
+    <x-child></x-child>
+    <x-child></x-child>
+</template>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/modules/x/parent/parent.js b/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/modules/x/parent/parent.js
new file mode 100644
index 0000000000..ca8dce94e0
--- /dev/null
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/style-dedupe-with-prefix/modules/x/parent/parent.js
@@ -0,0 +1,3 @@
+import { LightningElement } from 'lwc';
+
+export default class extends LightningElement {}
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/styles-escaping-safe/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/styles-escaping-safe/expected.html
index 24d68efd27..4c7dcb837f 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/styles-escaping-safe/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/styles-escaping-safe/expected.html
@@ -1,7 +1,9 @@
 <fixture-test>
   <template shadowrootmode="open">
-    <style type="text/css">
+    <style id="lwc-style--0" type="text/css">
       [data-foo="'&<>"] {color: black;}[data-foo='"'] {color: white;}
     </style>
+    <lwc-style style-id="lwc-style--0">
+    </lwc-style>
   </template>
 </fixture-test>
\ No newline at end of file
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/styles-keyframes/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/styles-keyframes/expected.html
index cf1b408342..0c753bdde6 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/styles-keyframes/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/styles-keyframes/expected.html
@@ -1,8 +1,10 @@
 <fixture-test>
   <template shadowrootmode="open">
-    <style type="text/css">
+    <style id="lwc-style--0" type="text/css">
       @keyframes spin {0% {transform: rotate(0deg);}100% {transform: rotate(360deg);}}.spin {animation: 1s linear infinite spin;}
     </style>
+    <lwc-style style-id="lwc-style--0">
+    </lwc-style>
     <div class="spin">
     </div>
   </template>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/styles-shared/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/styles-shared/expected.html
index c7fe2b4be6..6a17e9b98c 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/styles-shared/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/styles-shared/expected.html
@@ -1,19 +1,24 @@
 <fixture-test>
   <template shadowrootmode="open">
-    <style type="text/css">
+    <style id="lwc-style--0" type="text/css">
       div {border: 1px solid turquoise;}
     </style>
-    <style type="text/css">
+    <lwc-style style-id="lwc-style--0">
+    </lwc-style>
+    <style id="lwc-style--1" type="text/css">
       div {background: blue;}
     </style>
+    <lwc-style style-id="lwc-style--1">
+    </lwc-style>
     <x-child>
       <template shadowrootmode="open">
-        <style type="text/css">
-          div {border: 1px solid turquoise;}
-        </style>
-        <style type="text/css">
+        <lwc-style style-id="lwc-style--0">
+        </lwc-style>
+        <style id="lwc-style--2" type="text/css">
           div {color: red;}
         </style>
+        <lwc-style style-id="lwc-style--2">
+        </lwc-style>
         <div>
           Hello child
         </div>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/styles/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/styles/expected.html
index 146ccd051a..d4a9d3e712 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/styles/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/styles/expected.html
@@ -1,8 +1,10 @@
 <fixture-test>
   <template shadowrootmode="open">
-    <style type="text/css">
+    <style id="lwc-style--0" type="text/css">
       :host {color: red;}.foo {color: blue;}.foo .bar {color: green;}
     </style>
+    <lwc-style style-id="lwc-style--0">
+    </lwc-style>
     <div class="foo">
       <p class="bar">
       </p>
diff --git a/packages/@lwc/errors/package.json b/packages/@lwc/errors/package.json
index b1ecbfff09..7997d4eef5 100644
--- a/packages/@lwc/errors/package.json
+++ b/packages/@lwc/errors/package.json
@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/errors",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "description": "LWC Error Utilities",
     "keywords": [
         "lwc"
diff --git a/packages/@lwc/features/package.json b/packages/@lwc/features/package.json
index 89577a5723..f98cb67898 100644
--- a/packages/@lwc/features/package.json
+++ b/packages/@lwc/features/package.json
@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/features",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "description": "LWC Features Flags",
     "keywords": [
         "lwc"
@@ -46,6 +46,6 @@
         }
     },
     "dependencies": {
-        "@lwc/shared": "8.14.0"
+        "@lwc/shared": "8.16.0"
     }
 }
diff --git a/packages/@lwc/integration-karma/package.json b/packages/@lwc/integration-karma/package.json
index dbc46de044..eb371ecd5f 100644
--- a/packages/@lwc/integration-karma/package.json
+++ b/packages/@lwc/integration-karma/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@lwc/integration-karma",
     "private": true,
-    "version": "8.14.0",
+    "version": "8.16.0",
     "scripts": {
         "start": "KARMA_MODE=watch karma start ./scripts/karma-configs/test/local.js",
         "test": "karma start ./scripts/karma-configs/test/local.js --single-run --browsers ChromeHeadless",
@@ -21,11 +21,11 @@
         "karma-sauce-launcher-fix-firefox": "using a fork to work around https://github.com/karma-runner/karma-sauce-launcher/issues/275"
     },
     "devDependencies": {
-        "@lwc/compiler": "8.14.0",
-        "@lwc/engine-dom": "8.14.0",
-        "@lwc/engine-server": "8.14.0",
-        "@lwc/rollup-plugin": "8.14.0",
-        "@lwc/synthetic-shadow": "8.14.0",
+        "@lwc/compiler": "8.16.0",
+        "@lwc/engine-dom": "8.16.0",
+        "@lwc/engine-server": "8.16.0",
+        "@lwc/rollup-plugin": "8.16.0",
+        "@lwc/synthetic-shadow": "8.16.0",
         "@types/jasmine": "^5.1.7",
         "chokidar": "^4.0.3",
         "istanbul-lib-coverage": "^3.2.2",
diff --git a/packages/@lwc/integration-tests/package.json b/packages/@lwc/integration-tests/package.json
index 9c90d6575c..697bb89ad2 100644
--- a/packages/@lwc/integration-tests/package.json
+++ b/packages/@lwc/integration-tests/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@lwc/integration-tests",
     "private": true,
-    "version": "8.14.0",
+    "version": "8.16.0",
     "scripts": {
         "build": "node scripts/build.js",
         "build:dev": "MODE=dev yarn build",
@@ -18,7 +18,7 @@
         "sauce:prod:ci": "MODE=prod yarn build:prod && MODE=prod ../../../scripts/ci/retry.sh wdio ./scripts/wdio.sauce.conf.js"
     },
     "devDependencies": {
-        "@lwc/rollup-plugin": "8.14.0",
+        "@lwc/rollup-plugin": "8.16.0",
         "@wdio/cli": "^9.10.1",
         "@wdio/local-runner": "^9.10.1",
         "@wdio/mocha-framework": "^9.10.1",
@@ -27,7 +27,7 @@
         "@wdio/static-server-service": "^9.10.1",
         "deepmerge": "^4.3.1",
         "dotenv": "^16.4.7",
-        "lwc": "8.14.0",
+        "lwc": "8.16.0",
         "minimist": "^1.2.8",
         "webdriverio": "^9.0.7"
     },
diff --git a/packages/@lwc/integration-types/package.json b/packages/@lwc/integration-types/package.json
index 285977f4f0..0beb49cf4c 100644
--- a/packages/@lwc/integration-types/package.json
+++ b/packages/@lwc/integration-types/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@lwc/integration-types",
     "private": true,
-    "version": "8.14.0",
+    "version": "8.16.0",
     "description": "Type validation for LWC packages",
     "type": "module",
     "scripts": {
@@ -9,8 +9,8 @@
         "playground": "rollup -c src/playground/rollup.config.js --watch"
     },
     "dependencies": {
-        "@lwc/rollup-plugin": "8.14.0",
-        "lwc": "8.14.0"
+        "@lwc/rollup-plugin": "8.16.0",
+        "lwc": "8.16.0"
     },
     "devDependencies": {
         "@rollup/plugin-replace": "^6.0.2",
diff --git a/packages/@lwc/module-resolver/package.json b/packages/@lwc/module-resolver/package.json
index b49e13cab7..33d6193d45 100644
--- a/packages/@lwc/module-resolver/package.json
+++ b/packages/@lwc/module-resolver/package.json
@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/module-resolver",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "description": "Resolves paths for LWC components",
     "keywords": [
         "lwc"
diff --git a/packages/@lwc/perf-benchmarks-components/package.json b/packages/@lwc/perf-benchmarks-components/package.json
index 0c5b7abbed..0f3063e081 100644
--- a/packages/@lwc/perf-benchmarks-components/package.json
+++ b/packages/@lwc/perf-benchmarks-components/package.json
@@ -1,12 +1,12 @@
 {
     "name": "@lwc/perf-benchmarks-components",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "private": true,
     "scripts": {
         "build": "rm -fr dist && rollup -c ./rollup.config.mjs"
     },
     "devDependencies": {
-        "@lwc/rollup-plugin": "8.14.0"
+        "@lwc/rollup-plugin": "8.16.0"
     },
     "nx": {
         "targets": {
diff --git a/packages/@lwc/perf-benchmarks/package.json b/packages/@lwc/perf-benchmarks/package.json
index 397e942cf8..58b0cc82b5 100644
--- a/packages/@lwc/perf-benchmarks/package.json
+++ b/packages/@lwc/perf-benchmarks/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@lwc/perf-benchmarks",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "private": true,
     "scripts": {
         "build": "rm -fr dist && rollup -c  ./rollup.config.mjs && node scripts/build.js && ./scripts/fix-deps.sh",
@@ -15,11 +15,11 @@
         "Don't forget to add these to fix-deps.sh as well."
     ],
     "dependencies": {
-        "@lwc/engine-dom": "8.14.0",
-        "@lwc/engine-server": "8.14.0",
-        "@lwc/perf-benchmarks-components": "8.14.0",
-        "@lwc/ssr-runtime": "8.14.0",
-        "@lwc/synthetic-shadow": "8.14.0"
+        "@lwc/engine-dom": "8.16.0",
+        "@lwc/engine-server": "8.16.0",
+        "@lwc/perf-benchmarks-components": "8.16.0",
+        "@lwc/ssr-runtime": "8.16.0",
+        "@lwc/synthetic-shadow": "8.16.0"
     },
     "devDependencies": {
         "@best/cli": "^14.0.0",
diff --git a/packages/@lwc/rollup-plugin/package.json b/packages/@lwc/rollup-plugin/package.json
index c1c5f8e4ad..7f4d1ed492 100644
--- a/packages/@lwc/rollup-plugin/package.json
+++ b/packages/@lwc/rollup-plugin/package.json
@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/rollup-plugin",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "description": "Rollup plugin to compile LWC",
     "keywords": [
         "lwc"
@@ -46,13 +46,13 @@
         }
     },
     "dependencies": {
-        "@lwc/compiler": "8.14.0",
-        "@lwc/module-resolver": "8.14.0",
-        "@lwc/shared": "8.14.0",
+        "@lwc/compiler": "8.16.0",
+        "@lwc/module-resolver": "8.16.0",
+        "@lwc/shared": "8.16.0",
         "@rollup/pluginutils": "~5.1.4"
     },
     "devDependencies": {
-        "@lwc/errors": "8.14.0"
+        "@lwc/errors": "8.16.0"
     },
     "peerDependencies": {
         "rollup": "^1.2.0||^2.0.0||^3.0.0||^4.0.0"
diff --git a/packages/@lwc/rollup-plugin/src/index.ts b/packages/@lwc/rollup-plugin/src/index.ts
index bef5634479..850dab7094 100644
--- a/packages/@lwc/rollup-plugin/src/index.ts
+++ b/packages/@lwc/rollup-plugin/src/index.ts
@@ -391,4 +391,6 @@ export default function lwc(pluginOptions: RollupLwcOptions = {}): Plugin {
 }
 
 // For backward compatibility with commonjs format
-module.exports = lwc;
+if (typeof module !== 'undefined') {
+    module.exports = lwc;
+}
diff --git a/packages/@lwc/shared/package.json b/packages/@lwc/shared/package.json
index 7a65993f5a..5237ee22f2 100644
--- a/packages/@lwc/shared/package.json
+++ b/packages/@lwc/shared/package.json
@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/shared",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "description": "Utilities and methods that are shared across packages",
     "keywords": [
         "lwc"
diff --git a/packages/@lwc/signals/package.json b/packages/@lwc/signals/package.json
index d127ba9ec9..dfab4718e8 100644
--- a/packages/@lwc/signals/package.json
+++ b/packages/@lwc/signals/package.json
@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/signals",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "description": "Provides the interface to interact with reactivity from outside the framework",
     "keywords": [
         "lwc"
@@ -46,6 +46,6 @@
         }
     },
     "devDependencies": {
-        "@lwc/shared": "8.14.0"
+        "@lwc/shared": "8.16.0"
     }
 }
diff --git a/packages/@lwc/ssr-client-utils/LICENSE.md b/packages/@lwc/ssr-client-utils/LICENSE.md
new file mode 100644
index 0000000000..21c441068e
--- /dev/null
+++ b/packages/@lwc/ssr-client-utils/LICENSE.md
@@ -0,0 +1,108 @@
+# LWC core license
+
+MIT LICENSE
+
+Copyright (c) 2025, Salesforce, Inc.
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+# Licenses of bundled dependencies
+
+## @parse5/tools
+
+The MIT License (MIT)
+
+Copyright © 2024 James Garbutt
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the “Software”), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+## entities
+
+Copyright (c) Felix Böhm
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+## estree-walker
+
+Copyright (c) 2015-20 [these people](https://github.com/Rich-Harris/estree-walker/graphs/contributors)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+## observable-membrane
+
+MIT License
+
+Copyright (c) 2017 Salesforce
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+## parse5
+
+Copyright (c) 2013-2019 Ivan Nikulin (ifaaan@gmail.com, https://github.com/inikulin)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/packages/@lwc/ssr-client-utils/README.md b/packages/@lwc/ssr-client-utils/README.md
new file mode 100644
index 0000000000..f68616356c
--- /dev/null
+++ b/packages/@lwc/ssr-client-utils/README.md
@@ -0,0 +1,3 @@
+# @lwc/ssr-client-utils
+
+This is an experimental package containing a utility functions for server-side rendered components. It may break at any point.
diff --git a/packages/@lwc/ssr-client-utils/package.json b/packages/@lwc/ssr-client-utils/package.json
new file mode 100644
index 0000000000..257839770e
--- /dev/null
+++ b/packages/@lwc/ssr-client-utils/package.json
@@ -0,0 +1,51 @@
+{
+    "//": [
+        "THIS FILE IS AUTOGENERATED. If you modify it, it will be rewritten by check-and-rewrite-package-json.js",
+        "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
+    ],
+    "name": "@lwc/ssr-client-utils",
+    "version": "8.16.0",
+    "description": "Client-side complement to @lwc/ssr-compiler",
+    "keywords": [
+        "lwc",
+        "runtime",
+        "ssr"
+    ],
+    "homepage": "https://lwc.dev",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/salesforce/lwc.git",
+        "directory": "packages/@lwc/ssr-client-utils"
+    },
+    "bugs": {
+        "url": "https://github.com/salesforce/lwc/issues"
+    },
+    "license": "MIT",
+    "publishConfig": {
+        "access": "public"
+    },
+    "volta": {
+        "extends": "../../../package.json"
+    },
+    "main": "dist/index.cjs.js",
+    "module": "dist/index.js",
+    "types": "dist/index.d.ts",
+    "files": [
+        "dist/**/*.js",
+        "dist/**/*.d.ts"
+    ],
+    "scripts": {
+        "build": "rollup --config ../../../scripts/rollup/rollup.config.js",
+        "dev": "rollup  --config ../../../scripts/rollup/rollup.config.js --watch --no-watch.clearScreen"
+    },
+    "nx": {
+        "targets": {
+            "build": {
+                "outputs": [
+                    "{projectRoot}/dist"
+                ]
+            }
+        }
+    },
+    "devDependencies": {}
+}
diff --git a/packages/@lwc/ssr-client-utils/register-lwc-style.js b/packages/@lwc/ssr-client-utils/register-lwc-style.js
new file mode 100644
index 0000000000..c1dfc78f2a
--- /dev/null
+++ b/packages/@lwc/ssr-client-utils/register-lwc-style.js
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2025, salesforce.com, inc.
+ * All rights reserved.
+ * SPDX-License-Identifier: MIT
+ * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
+ */
+
+import { registerLwcStyleComponent } from './dist/index';
+
+registerLwcStyleComponent();
diff --git a/packages/@lwc/ssr-client-utils/src/index.ts b/packages/@lwc/ssr-client-utils/src/index.ts
new file mode 100644
index 0000000000..ee39511dcf
--- /dev/null
+++ b/packages/@lwc/ssr-client-utils/src/index.ts
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2025, salesforce.com, inc.
+ * All rights reserved.
+ * SPDX-License-Identifier: MIT
+ * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
+ */
+
+type RootNode = Node & DocumentOrShadowRoot & NonElementParentNode;
+
+const stylesheetCache = new Map();
+
+class StyleDeduplicator extends HTMLElement {
+    connectedCallback() {
+        const styleId = this.getAttribute('style-id');
+
+        if (!styleId) {
+            throw new Error('"style-id" attribute must be supplied for <lwc-style> element');
+        }
+
+        const root = this.getRootNode() as RootNode;
+        let stylesheet = stylesheetCache.get(styleId);
+
+        if (stylesheet) {
+            root.adoptedStyleSheets.push(stylesheet);
+            const placeholder = document.createElement('style');
+            placeholder.setAttribute('type', 'text/css');
+            // Not-first <lwc-style> should be replaced with a placeholder <style>, since that's
+            // what the diffing algorithm and hydration logic will expect to find
+            this.replaceWith(placeholder);
+        } else {
+            stylesheet = new CSSStyleSheet();
+            const element = root.getElementById(styleId);
+
+            if (!element) {
+                throw new Error(
+                    `<lwc-style> tag found with no corresponding <style id="${styleId}"> tag`
+                );
+            }
+
+            stylesheet.replaceSync(element.innerHTML);
+            stylesheetCache.set(styleId, stylesheet);
+            // The first <lwc-style> should be removed, because it already has a <style> next to it
+            this.remove();
+        }
+    }
+}
+
+/**
+ * This function should be called in a <script> tag in the <head>
+ * before server-rendered markup is encountered while parsing an HTML
+ * document. This ensures that deduplicated styles will be in effect
+ * for components that insert an <lwc-style> tag in place of a full
+ * stylesheet.
+ * It can also be implicitly invoked by importing `@lwc/ssr-client-utils/register-lwc-style` as a bare import.
+ */
+export function registerLwcStyleComponent() {
+    customElements.define('lwc-style', StyleDeduplicator);
+}
diff --git a/packages/@lwc/ssr-client-utils/tsconfig.json b/packages/@lwc/ssr-client-utils/tsconfig.json
new file mode 100644
index 0000000000..35790d1865
--- /dev/null
+++ b/packages/@lwc/ssr-client-utils/tsconfig.json
@@ -0,0 +1,9 @@
+{
+    "extends": "../../../tsconfig.json",
+
+    "compilerOptions": {
+        "lib": ["es2023", "DOM"]
+    },
+
+    "include": ["src/"]
+}
diff --git a/packages/@lwc/ssr-compiler/package.json b/packages/@lwc/ssr-compiler/package.json
index 79ce21d669..5619590682 100644
--- a/packages/@lwc/ssr-compiler/package.json
+++ b/packages/@lwc/ssr-compiler/package.json
@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/ssr-compiler",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "description": "Compile component for use during server-side rendering",
     "keywords": [
         "compiler",
@@ -49,9 +49,9 @@
     },
     "dependencies": {
         "@babel/types": "7.26.9",
-        "@lwc/shared": "8.14.0",
-        "@lwc/errors": "8.14.0",
-        "@lwc/template-compiler": "8.14.0",
+        "@lwc/shared": "8.16.0",
+        "@lwc/errors": "8.16.0",
+        "@lwc/template-compiler": "8.16.0",
         "acorn": "8.14.0",
         "astring": "^1.9.0",
         "estree-toolkit": "^1.7.8",
@@ -59,7 +59,7 @@
         "meriyah": "^5.0.0"
     },
     "devDependencies": {
-        "@lwc/babel-plugin-component": "8.14.0",
+        "@lwc/babel-plugin-component": "8.16.0",
         "@types/estree": "^1.0.6"
     }
 }
diff --git a/packages/@lwc/ssr-compiler/src/__tests__/estemplate.spec.ts b/packages/@lwc/ssr-compiler/src/__tests__/estemplate.spec.ts
index 58e67fee24..25f05e6507 100644
--- a/packages/@lwc/ssr-compiler/src/__tests__/estemplate.spec.ts
+++ b/packages/@lwc/ssr-compiler/src/__tests__/estemplate.spec.ts
@@ -61,7 +61,7 @@ describe.each(
                 `;
             const doReplacement = () => tmpl(b.literal('I am not an identifier') as any);
             expect(doReplacement).toThrow(
-                'Validation failed for templated node. Expected type identifier, but received Literal.'
+                /^Validation failed for templated node\. Expected type .+?, but received Literal\.$/
             );
         });
     });
diff --git a/packages/@lwc/ssr-compiler/src/__tests__/fixtures.spec.ts b/packages/@lwc/ssr-compiler/src/__tests__/fixtures.spec.ts
index 65c48b8258..dc5024d546 100644
--- a/packages/@lwc/ssr-compiler/src/__tests__/fixtures.spec.ts
+++ b/packages/@lwc/ssr-compiler/src/__tests__/fixtures.spec.ts
@@ -30,6 +30,9 @@ interface FixtureConfig {
         error?: string;
         expected?: string;
     };
+
+    /** The string used to uniquely identify one set of dedupe IDs with multiple SSR islands */
+    styleDedupePrefix?: string;
 }
 
 vi.mock('@lwc/ssr-runtime', async () => {
@@ -92,6 +95,7 @@ describe.concurrent('fixtures', () => {
         {
             root: path.resolve(__dirname, '../../../engine-server/src/__tests__/fixtures'),
             pattern: '**/config.json',
+            ssrVersion: 2,
             // TODO [#4815]: enable all SSR v2 tests
             expectedFailures,
         },
@@ -123,6 +127,8 @@ describe.concurrent('fixtures', () => {
                         'fixture-test',
                         module,
                         config?.props ?? {},
+                        config?.styleDedupePrefix ?? '',
+                        true,
                         SSR_MODE
                     )
                 );
diff --git a/packages/@lwc/ssr-compiler/src/compile-js/generate-markup.ts b/packages/@lwc/ssr-compiler/src/compile-js/generate-markup.ts
index af47ac1db0..8d50ed049f 100644
--- a/packages/@lwc/ssr-compiler/src/compile-js/generate-markup.ts
+++ b/packages/@lwc/ssr-compiler/src/compile-js/generate-markup.ts
@@ -27,6 +27,7 @@ const bGenerateMarkup = esTemplate`
         enumerable: false,
         writable: false,
         value: async function* generateMarkup(
+            // The $$emit function is magically inserted here
             tagName, 
             props, 
             attrs,
diff --git a/packages/@lwc/ssr-compiler/src/compile-template/index.ts b/packages/@lwc/ssr-compiler/src/compile-template/index.ts
index ba27307638..a4da0dacd9 100644
--- a/packages/@lwc/ssr-compiler/src/compile-template/index.ts
+++ b/packages/@lwc/ssr-compiler/src/compile-template/index.ts
@@ -24,6 +24,7 @@ import type {
 // TODO [#4663]: Render mode mismatch between template and compiler should throw.
 const bExportTemplate = esTemplate`
     export default async function* tmpl(
+            // This is where $$emit comes from
             shadowSlottedContent,
             lightSlottedContent,
             scopedSlottedContent,
@@ -50,6 +51,7 @@ const bExportTemplate = esTemplate`
         const { stylesheets: staticStylesheets } = Cmp;
         if (defaultStylesheets || defaultScopedStylesheets || staticStylesheets) {
             yield renderStylesheets(
+                $$emit,
                 defaultStylesheets, 
                 defaultScopedStylesheets, 
                 staticStylesheets,
diff --git a/packages/@lwc/ssr-compiler/src/optimizer.ts b/packages/@lwc/ssr-compiler/src/optimizer.ts
deleted file mode 100644
index 975375a4fa..0000000000
--- a/packages/@lwc/ssr-compiler/src/optimizer.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 2024, salesforce.com, inc.
- * All rights reserved.
- * SPDX-License-Identifier: MIT
- * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
- */
-
-import type { Instruction } from './shared';
-
-export function* optimize(instructions: Generator<Instruction>): Generator<Instruction> {
-    yield* instructions;
-}
diff --git a/packages/@lwc/ssr-runtime/package.json b/packages/@lwc/ssr-runtime/package.json
index d0d3718423..ea880c8c3c 100644
--- a/packages/@lwc/ssr-runtime/package.json
+++ b/packages/@lwc/ssr-runtime/package.json
@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/ssr-runtime",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "description": "Runtime complement to @lwc/ssr-compiler",
     "keywords": [
         "lwc",
@@ -48,8 +48,8 @@
         }
     },
     "devDependencies": {
-        "@lwc/shared": "8.14.0",
-        "@lwc/engine-core": "8.14.0",
+        "@lwc/shared": "8.16.0",
+        "@lwc/engine-core": "8.16.0",
         "observable-membrane": "2.0.0"
     }
 }
diff --git a/packages/@lwc/ssr-runtime/src/render.ts b/packages/@lwc/ssr-runtime/src/render.ts
index ed1ddf2cc6..4bab988bdb 100644
--- a/packages/@lwc/ssr-runtime/src/render.ts
+++ b/packages/@lwc/ssr-runtime/src/render.ts
@@ -11,6 +11,7 @@ import {
     isUndefined,
     DEFAULT_SSR_MODE,
     htmlEscape,
+    type Stylesheet,
 } from '@lwc/shared';
 import { mutationTracker } from './mutation-tracker';
 import { SYMBOL__GENERATE_MARKUP } from './lightning-element';
@@ -190,10 +191,24 @@ interface ComponentWithGenerateMarkup extends LightningElementConstructor {
     [SYMBOL__GENERATE_MARKUP]?: GenerateMarkupVariants;
 }
 
+export class RenderContext {
+    styleDedupeIsEnabled: boolean;
+    stylesheetToId = new WeakMap<Stylesheet, string>();
+    styleDedupePrefix: string;
+    nextId = 0;
+
+    constructor(styleDedupePrefix: string, styleDedupeIsEnabled: boolean) {
+        this.styleDedupeIsEnabled = styleDedupeIsEnabled;
+        this.styleDedupePrefix = styleDedupePrefix;
+    }
+}
+
 export async function serverSideRenderComponent(
     tagName: string,
     Component: ComponentWithGenerateMarkup,
     props: Properties = {},
+    styleDedupePrefix = '',
+    styleDedupeIsEnabled = false,
     mode: CompilationMode = DEFAULT_SSR_MODE
 ): Promise<string> {
     if (typeof tagName !== 'string') {
@@ -207,6 +222,8 @@ export async function serverSideRenderComponent(
         markup += segment;
     };
 
+    emit.cxt = new RenderContext(styleDedupePrefix, styleDedupeIsEnabled);
+
     if (!generateMarkup) {
         // If a non-component is accidentally provided, render an empty template
         emit(`<${tagName}>`);
diff --git a/packages/@lwc/ssr-runtime/src/stubs.ts b/packages/@lwc/ssr-runtime/src/stubs.ts
index c8b2d898ff..848a359ff1 100644
--- a/packages/@lwc/ssr-runtime/src/stubs.ts
+++ b/packages/@lwc/ssr-runtime/src/stubs.ts
@@ -5,6 +5,8 @@
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
  */
 
+/* v8 ignore start */
+
 // Stubs for all the un-implemented exports from @lwc/engine-server
 
 export function api(..._: unknown[]): never {
@@ -216,3 +218,5 @@ export const renderer = {
  */
 // A real stub, not a "not implemented" one! 😯
 export const hot = undefined;
+
+/* v8 ignore stop */
diff --git a/packages/@lwc/ssr-runtime/src/styles.ts b/packages/@lwc/ssr-runtime/src/styles.ts
index 5def046a00..20957feabc 100644
--- a/packages/@lwc/ssr-runtime/src/styles.ts
+++ b/packages/@lwc/ssr-runtime/src/styles.ts
@@ -8,6 +8,7 @@ import { isArray } from '@lwc/shared';
 import { validateStyleTextContents } from './validate-style-text-contents';
 import type { LightningElementConstructor } from './lightning-element';
 import type { Stylesheets, Stylesheet } from '@lwc/shared';
+import type { RenderContext } from './render';
 
 type ForgivingStylesheets =
     | Stylesheets
@@ -16,6 +17,10 @@ type ForgivingStylesheets =
     | null
     | Array<Stylesheets | undefined | null>;
 
+type EmitFn = ((strSegment: string) => void) & {
+    cxt: RenderContext;
+};
+
 // Traverse in the same order as `flattenStylesheets` but without creating unnecessary additional arrays
 function traverseStylesheets(
     stylesheets: ForgivingStylesheets,
@@ -39,6 +44,10 @@ export function hasScopedStaticStylesheets(Component: LightningElementConstructo
 }
 
 export function renderStylesheets(
+    // FIXME: the `emit` function does not exist in the SSR's compiler's yield mode. If we
+    // are going to use it to transport the RenderContext down the call stack, we'll need to figure out
+    // how to make htat work in yield mode.
+    emit: EmitFn,
     defaultStylesheets: ForgivingStylesheets,
     defaultScopedStylesheets: ForgivingStylesheets,
     staticStylesheets: ForgivingStylesheets,
@@ -57,12 +66,25 @@ export function renderStylesheets(
         const token = scoped ? scopeToken : undefined;
         const useActualHostSelector = !scoped || renderMode !== 'light';
         const useNativeDirPseudoclass = true;
+        const { styleDedupeIsEnabled, stylesheetToId, styleDedupePrefix } = emit.cxt;
 
-        const styleContents = stylesheet(token, useActualHostSelector, useNativeDirPseudoclass);
-        validateStyleTextContents(styleContents);
+        if (!styleDedupeIsEnabled) {
+            const styleContents = stylesheet(token, useActualHostSelector, useNativeDirPseudoclass);
+            validateStyleTextContents(styleContents);
+            result += `<style${hasAnyScopedStyles ? ` class="${scopeToken}"` : ''} type="text/css">${styleContents}</style>`;
+        } else if (stylesheetToId.has(stylesheet)) {
+            const styleId = stylesheetToId.get(stylesheet);
+            result += `<lwc-style style-id="lwc-style-${styleDedupePrefix}-${styleId}"></lwc-style>`;
+        } else {
+            const styleId = emit.cxt.nextId++;
+            stylesheetToId.set(stylesheet, styleId.toString());
+            const styleContents = stylesheet(token, useActualHostSelector, useNativeDirPseudoclass);
+            validateStyleTextContents(styleContents);
 
-        // TODO [#2869]: `<style>`s should not have scope token classes
-        result += `<style${hasAnyScopedStyles ? ` class="${scopeToken}"` : ''} type="text/css">${styleContents}</style>`;
+            // TODO [#2869]: `<style>`s should not have scope token classes
+            result += `<style${hasAnyScopedStyles ? ` class="${scopeToken}"` : ''} id="lwc-style-${styleDedupePrefix}-${styleId}" type="text/css">${styleContents}</style>`;
+            result += `<lwc-style style-id="lwc-style-${styleDedupePrefix}-${styleId}"></lwc-style>`;
+        }
     };
 
     traverseStylesheets(defaultStylesheets, renderStylesheet);
diff --git a/packages/@lwc/style-compiler/package.json b/packages/@lwc/style-compiler/package.json
index 05465ef90f..13885b6466 100644
--- a/packages/@lwc/style-compiler/package.json
+++ b/packages/@lwc/style-compiler/package.json
@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/style-compiler",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "description": "Transform style sheet to be consumed by the LWC engine",
     "keywords": [
         "lwc"
@@ -46,7 +46,7 @@
         }
     },
     "dependencies": {
-        "@lwc/shared": "8.14.0",
+        "@lwc/shared": "8.16.0",
         "postcss": "~8.5.3",
         "postcss-selector-parser": "~7.1.0",
         "postcss-value-parser": "~4.2.0"
diff --git a/packages/@lwc/synthetic-shadow/package.json b/packages/@lwc/synthetic-shadow/package.json
index 96c767f640..30f29564c3 100644
--- a/packages/@lwc/synthetic-shadow/package.json
+++ b/packages/@lwc/synthetic-shadow/package.json
@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/synthetic-shadow",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "description": "Synthetic Shadow Root for LWC",
     "keywords": [
         "lwc"
@@ -46,8 +46,8 @@
         }
     },
     "devDependencies": {
-        "@lwc/features": "8.14.0",
-        "@lwc/shared": "8.14.0"
+        "@lwc/features": "8.16.0",
+        "@lwc/shared": "8.16.0"
     },
     "lwc": {
         "modules": [
diff --git a/packages/@lwc/template-compiler/package.json b/packages/@lwc/template-compiler/package.json
index 35403f6c72..a28a61dc38 100644
--- a/packages/@lwc/template-compiler/package.json
+++ b/packages/@lwc/template-compiler/package.json
@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/template-compiler",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "description": "Template compiler package",
     "keywords": [
         "lwc"
@@ -46,8 +46,8 @@
         }
     },
     "dependencies": {
-        "@lwc/errors": "8.14.0",
-        "@lwc/shared": "8.14.0",
+        "@lwc/errors": "8.16.0",
+        "@lwc/shared": "8.16.0",
         "acorn": "~8.14.0",
         "astring": "~1.9.0",
         "he": "~1.2.0"
diff --git a/packages/@lwc/types/package.json b/packages/@lwc/types/package.json
index c7d76e07ff..fd614712f5 100644
--- a/packages/@lwc/types/package.json
+++ b/packages/@lwc/types/package.json
@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/types",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "keywords": [
         "lwc",
         "types",
@@ -32,6 +32,6 @@
         "*.d.ts"
     ],
     "dependencies": {
-        "@lwc/engine-core": "8.14.0"
+        "@lwc/engine-core": "8.16.0"
     }
 }
diff --git a/packages/@lwc/wire-service/package.json b/packages/@lwc/wire-service/package.json
index 9b60d267bb..d62372c7a9 100644
--- a/packages/@lwc/wire-service/package.json
+++ b/packages/@lwc/wire-service/package.json
@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/wire-service",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "description": "@wire service",
     "keywords": [
         "lwc"
@@ -46,8 +46,8 @@
         }
     },
     "devDependencies": {
-        "@lwc/engine-core": "8.14.0",
-        "@lwc/shared": "8.14.0"
+        "@lwc/engine-core": "8.16.0",
+        "@lwc/shared": "8.16.0"
     },
     "lwc": {
         "modules": [
diff --git a/packages/lwc/package.json b/packages/lwc/package.json
index 8fc8c24918..b0e86152c1 100644
--- a/packages/lwc/package.json
+++ b/packages/lwc/package.json
@@ -1,6 +1,6 @@
 {
     "name": "lwc",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "description": "Lightning Web Components (LWC)",
     "homepage": "https://lwc.dev/",
     "repository": {
@@ -21,24 +21,24 @@
         "!vitest.config.*"
     ],
     "dependencies": {
-        "@lwc/aria-reflection": "8.14.0",
-        "@lwc/babel-plugin-component": "8.14.0",
-        "@lwc/compiler": "8.14.0",
-        "@lwc/engine-core": "8.14.0",
-        "@lwc/engine-dom": "8.14.0",
-        "@lwc/engine-server": "8.14.0",
-        "@lwc/errors": "8.14.0",
-        "@lwc/features": "8.14.0",
-        "@lwc/module-resolver": "8.14.0",
-        "@lwc/rollup-plugin": "8.14.0",
-        "@lwc/shared": "8.14.0",
-        "@lwc/ssr-compiler": "8.14.0",
-        "@lwc/ssr-runtime": "8.14.0",
-        "@lwc/style-compiler": "8.14.0",
-        "@lwc/synthetic-shadow": "8.14.0",
-        "@lwc/template-compiler": "8.14.0",
-        "@lwc/types": "8.14.0",
-        "@lwc/wire-service": "8.14.0"
+        "@lwc/aria-reflection": "8.16.0",
+        "@lwc/babel-plugin-component": "8.16.0",
+        "@lwc/compiler": "8.16.0",
+        "@lwc/engine-core": "8.16.0",
+        "@lwc/engine-dom": "8.16.0",
+        "@lwc/engine-server": "8.16.0",
+        "@lwc/errors": "8.16.0",
+        "@lwc/features": "8.16.0",
+        "@lwc/module-resolver": "8.16.0",
+        "@lwc/rollup-plugin": "8.16.0",
+        "@lwc/shared": "8.16.0",
+        "@lwc/ssr-compiler": "8.16.0",
+        "@lwc/ssr-runtime": "8.16.0",
+        "@lwc/style-compiler": "8.16.0",
+        "@lwc/synthetic-shadow": "8.16.0",
+        "@lwc/template-compiler": "8.16.0",
+        "@lwc/types": "8.16.0",
+        "@lwc/wire-service": "8.16.0"
     },
     "lwc": {
         "modules": [
diff --git a/playground/package.json b/playground/package.json
index 4efd8d42f4..fb564eaa4b 100644
--- a/playground/package.json
+++ b/playground/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@lwc/playground",
-    "version": "8.14.0",
+    "version": "8.16.0",
     "type": "module",
     "description": "Playground project to experiment with LWC.",
     "scripts": {
@@ -9,9 +9,9 @@
         "build": "NODE_ENV=production rollup -c"
     },
     "devDependencies": {
-        "@lwc/rollup-plugin": "8.14.0",
+        "@lwc/rollup-plugin": "8.16.0",
         "@rollup/plugin-replace": "^6.0.2",
-        "lwc": "8.14.0",
+        "lwc": "8.16.0",
         "rollup": "^4.34.9",
         "rollup-plugin-livereload": "^2.0.5",
         "rollup-plugin-serve": "^3.0.0"
diff --git a/scripts/test-utils/html-snapshot-matcher.ts b/scripts/test-utils/html-snapshot-matcher.ts
new file mode 100644
index 0000000000..137f03add0
--- /dev/null
+++ b/scripts/test-utils/html-snapshot-matcher.ts
@@ -0,0 +1,101 @@
+/**
+ * The built-in `toMatchFileSnapshot` assertion does not provide a mechanism to intercept the on-disk content
+ * (expected) prior to comparison to the in-memory content (actual). Because we want SSRv2 to be canonical
+ * vis a vis the fixtures, there needs to be a way to modify the on-disk content prior to comparing to SSRv1
+ * output.
+ *
+ * This Chai assertion provides a similar mechanism to what you get with `toMatchFileSnapshot`. If a fixture
+ * is not present on disk when the SSRv1 tests are run, a new file will be generated. And if an SSRv2 fixture
+ * is present on disk, it'll be modified to look like SSRv1 output prior to asserting equality.
+ *
+ * The one deficiency of `toMatchHtmlSnapshot` is that it doesn't support automatic snapshot updating. If you
+ * need to update a fixture and you want SSRv1 to write its output to disk, the `.html` file must first be
+ * deleted. An attempt was made to integrate with the internal Vitest plumbing to support this properly, but
+ * the necessary objects are not exposed to outside consumers.
+ *
+ * The actual transformation of SSRv2-markup to SSRv1-markup is performed in `swapLwcStyleForStyleTag`.
+ *
+ * Adapted from https://github.com/vitest-dev/vitest/blob/0c2924b7aeb7eaf1b1fa0e78d2da76a7f3197b50/packages/vitest/src/integrations/snapshot/chai.ts
+ */
+
+import * as fs from 'node:fs/promises';
+import { equals, type Assertion, type ChaiPlugin, type ExpectStatic } from '@vitest/expect';
+import { swapLwcStyleForStyleTag } from './swap-lwc-style-for-style';
+
+function createMismatchError<T = unknown>(
+    message: string,
+    expand: boolean | undefined,
+    actual: T,
+    expected: T
+) {
+    // TODO [W-17971915]: clean this up, potentially using AssertionError
+    const error = new Error(message);
+    Object.defineProperty(error, 'actual', {
+        value: actual,
+        enumerable: true,
+        configurable: true,
+        writable: true,
+    });
+    Object.defineProperty(error, 'expected', {
+        value: expected,
+        enumerable: true,
+        configurable: true,
+        writable: true,
+    });
+    Object.defineProperty(error, 'diffOptions', { value: { expand } });
+    return error;
+}
+
+async function fileExists(fpath: string) {
+    try {
+        return (await fs.stat(fpath)).isFile();
+    } catch (_err) {
+        return false;
+    }
+}
+
+declare global {
+    // eslint-disable-next-line @typescript-eslint/no-namespace
+    export namespace Chai {
+        interface Assertion {
+            toMatchHtmlSnapshot(htmlFilePath: string, expect: ExpectStatic): Promise<void>;
+        }
+    }
+}
+
+export const HtmlSnapshotPlugin: ChaiPlugin = (chai, utils) => {
+    utils.addMethod(
+        chai.Assertion.prototype,
+        'toMatchHtmlSnapshot',
+        async function (this: Assertion, htmlFilePath: string, expect: ExpectStatic) {
+            utils.flag(this, '_name', 'toMatchHtmlSnapshot');
+
+            const expectedHtml = utils.flag(this, 'object');
+            const isNot = utils.flag(this, 'negate');
+            if (isNot) {
+                throw new Error('toMatchHtmlSnapshot cannot be used with "not"');
+            }
+
+            // Leverage the built-in mechanism to write new fixtures to disk.
+            if (!(await fileExists(htmlFilePath))) {
+                return await expect(expectedHtml).toMatchFileSnapshot(htmlFilePath);
+            }
+
+            const actualHtml = await fs.readFile(htmlFilePath, 'utf8');
+            const actualHtmlCompatWithSSRv1 = swapLwcStyleForStyleTag(actualHtml);
+
+            // This isn't strictly necessary because we await the assertion in `test-fixture-dir.ts`.
+            // However, it mimics the behavior exhibited by `toMatchFileSnapshot` such that, if the
+            // assertion were not awaited, any failed assertions would be queued up and reported
+            // asynchronously after the test completed.
+            if (!equals(actualHtmlCompatWithSSRv1, expectedHtml)) {
+                throw createMismatchError(
+                    'HTML snapshot mismatch',
+                    true,
+                    actualHtmlCompatWithSSRv1,
+                    expectedHtml
+                );
+            }
+        }
+    );
+};
diff --git a/scripts/test-utils/index.ts b/scripts/test-utils/index.ts
index b2676f87ae..133eea7cf5 100644
--- a/scripts/test-utils/index.ts
+++ b/scripts/test-utils/index.ts
@@ -6,4 +6,5 @@
  */
 export * from './test-fixture-dir';
 export * from './format-html';
+export * from './swap-lwc-style-for-style';
 export { default as pluginVirtual } from '../rollup/plugin-virtual';
diff --git a/scripts/test-utils/swap-lwc-style-for-style.ts b/scripts/test-utils/swap-lwc-style-for-style.ts
new file mode 100644
index 0000000000..560bb04718
--- /dev/null
+++ b/scripts/test-utils/swap-lwc-style-for-style.ts
@@ -0,0 +1,104 @@
+/**
+ * SSRv2 implements style deduplication, where an <lwc-style> tag is inserted alongside the first instance
+ * of a given component's <style> tag. In subsequent renders of that component, only the <lwc-style> tag
+ * is present in the generated markup.
+ *
+ * This presents a problem when sharing fixtures between SSRv1 and SSRv2. SSRv1 will expect to find repeated
+ * <style> tags and won't expect to find <lwc-style> tags.
+ *
+ * The `swapLwcStyleForStyleTag` function takes the SSRv2 fixtures and modifies it to look how SSRv1 would
+ * expect. As more divergences between the implementations crop up, we may need to add more fixture mutations
+ * to accommodate the differences.
+ */
+
+interface StyleTagInfo {
+    originalStyleTag: string;
+    styleTagWithoutId: string;
+    idAttrStr: string;
+    styleId: string;
+    styleTagIdx: number;
+    indentation: number;
+}
+
+export function swapLwcStyleForStyleTag(src: string): string {
+    let modifiedSrc = src;
+    // ([leading whitespace])(<style (id="(text)")...>...</style>)
+    const styleCapture = /(\s*)(<style [^>]*(id="([^"]+)" ?)[^>]*>.*?<\/style>)/s;
+    const capturedStyleTags: StyleTagInfo[] = [];
+    let styleTagMatch: RegExpExecArray | null = null;
+
+    // Find all <style> tags with an id, remove id attrs, capture information for later
+    // replacement of <lwc-style> tags. The length of the `modifiedSrc` string will be
+    // changing as <style> tags are modified, so we need to exec each time.
+    while ((styleTagMatch = styleCapture.exec(modifiedSrc))) {
+        const [tagWithLeadingWhitespace, leadingWhiteSpace, originalStyleTag, idAttrStr, styleId] =
+            styleTagMatch;
+        const styleTagWithoutId = originalStyleTag.replace(idAttrStr, '');
+        const styleTagIdx = styleTagMatch.index;
+        // We remove the value of `styleTagWithoutId` here because it'll be added back in when the first
+        // corresponding <lwc-style> tag is replaced with <style> in the second section below.
+        modifiedSrc =
+            modifiedSrc.slice(0, styleTagIdx) +
+            modifiedSrc.slice(styleTagIdx + tagWithLeadingWhitespace.length);
+        capturedStyleTags.push({
+            originalStyleTag,
+            styleTagWithoutId,
+            idAttrStr,
+            styleId,
+            styleTagIdx,
+            indentation: leadingWhiteSpace.length,
+        });
+    }
+
+    const lwcStyleCapture = /(\s*)<lwc-style style-id="([^"]+)">[^<]*<\/lwc-style>/s;
+    const idToStyleTag = Object.fromEntries(
+        capturedStyleTags.map((styleTagInfo) => [styleTagInfo.styleId, styleTagInfo])
+    );
+    let lwcStyleTagMatch: RegExpExecArray | null = null;
+
+    // Find all <lwc-style> tags and replace them with corresponding <style> tags captured earlier.
+    // The length of the `modifiedSrc` string will be changing as <style> tags are modified, so we
+    // need to exec each time.
+    while ((lwcStyleTagMatch = lwcStyleCapture.exec(modifiedSrc))) {
+        const [tagWithLeadingWhitespace, leadingWhiteSpace, styleId] = lwcStyleTagMatch;
+        const lwcStyleTagIdx = lwcStyleTagMatch.index;
+        const correspondingStyleTagInfo = idToStyleTag[styleId];
+        if (!correspondingStyleTagInfo) {
+            throw new Error(
+                'swapLwcStyleForStyleTag was unable to find <style> tag corresponding to <lwc-style>'
+            );
+        }
+        let styleTagWithoutId = correspondingStyleTagInfo.styleTagWithoutId;
+        const indentationDelta = correspondingStyleTagInfo.indentation
+            ? leadingWhiteSpace.length - correspondingStyleTagInfo.indentation
+            : null;
+        if (indentationDelta) {
+            styleTagWithoutId = styleTagWithoutId
+                .split('\n')
+                .map((line, idx) => {
+                    if (
+                        // Don't add indentation for lines that are empty.
+                        !line ||
+                        // The first line will already be indented.
+                        idx === 0
+                    ) {
+                        return line;
+                    }
+                    // The original <style> is more indented than the <lwc-style>
+                    if (indentationDelta > 0) {
+                        return line.padStart(line.length + indentationDelta);
+                    }
+                    // The original <style> is less indented than the <lwc-style>
+                    return line.slice(-indentationDelta);
+                })
+                .join('\n');
+        }
+
+        modifiedSrc =
+            modifiedSrc.slice(0, lwcStyleTagIdx + leadingWhiteSpace.length) +
+            styleTagWithoutId +
+            modifiedSrc.slice(lwcStyleTagIdx + tagWithLeadingWhitespace.length);
+    }
+
+    return modifiedSrc;
+}
diff --git a/scripts/test-utils/test-fixture-dir.ts b/scripts/test-utils/test-fixture-dir.ts
index 982d10754a..ea834da3fb 100644
--- a/scripts/test-utils/test-fixture-dir.ts
+++ b/scripts/test-utils/test-fixture-dir.ts
@@ -8,11 +8,14 @@
 import fs, { readFileSync } from 'node:fs';
 import path from 'node:path';
 import { AssertionError } from 'node:assert';
-import { test } from 'vitest';
+import { test, chai } from 'vitest';
 import * as glob from 'glob';
+import { HtmlSnapshotPlugin } from './html-snapshot-matcher';
 
 const { globSync } = glob;
 
+chai.use(HtmlSnapshotPlugin);
+
 type TestFixtureOutput = { [filename: string]: unknown };
 
 function existsUp(dir: string, file: string): boolean {
@@ -83,6 +86,7 @@ export function testFixtureDir<T>(
     config: {
         pattern: string;
         root: string;
+        ssrVersion: number;
         expectedFailures?: Set<string>;
     },
     testFn: (options: {
@@ -100,7 +104,7 @@ export function testFixtureDir<T>(
         throw new TypeError(`Expected second argument to be a function`);
     }
 
-    const { pattern, root } = config;
+    const { pattern, root, ssrVersion } = config;
     if (!pattern || !root) {
         throw new TypeError(`Expected a "root" and a "pattern" config to be specified`);
     }
@@ -140,7 +144,15 @@ export function testFixtureDir<T>(
             for (const [outputName, content] of outputsList) {
                 const outputPath = path.resolve(dirname, outputName);
                 try {
-                    await expect(content ?? '').toMatchFileSnapshot(outputPath);
+                    // SSRv2 is now the source of truth for SSR behavior. However, there are small
+                    // intentional divergences between SSRv2 and SSRv1 rendering behavior. As such,
+                    // The fixtures on-disk need to be transformed prior to comparison with SSRv1
+                    // output. The only way to accomplish this was with a custom Chai matcher.
+                    if (ssrVersion === 1 && outputName.endsWith('.html')) {
+                        await expect(content ?? '').toMatchHtmlSnapshot(outputPath, expect);
+                    } else {
+                        await expect(content ?? '').toMatchFileSnapshot(outputPath);
+                    }
                 } catch (err) {
                     if (typeof err === 'object' && err !== null) {
                         // Hide unhelpful noise in the stack trace
diff --git a/vitest.config.mjs b/vitest.config.mjs
index eb11f9cb21..29d3e60d3d 100644
--- a/vitest.config.mjs
+++ b/vitest.config.mjs
@@ -22,6 +22,8 @@ export default defineConfig({
                 '**/packages/@lwc/engine-dom/**',
                 '**/packages/@lwc/engine-core/**',
                 '**/packages/@lwc/synthetic-shadow/**',
+                // TODO [#5272]: add tests
+                '**/packages/@lwc/ssr-client-utils/**',
                 // Ignore test packages
                 '**/packages/@lwc/integration-karma/**',
                 '**/packages/@lwc/integration-tests/**',
@@ -36,9 +38,9 @@ export default defineConfig({
                 // SSR compiler/runtime is relatively newer, so has lower thresholds for now
                 '**/packages/@lwc/ssr-*/**': {
                     branches: 90,
-                    functions: 60,
-                    lines: 85,
-                    statements: 85,
+                    functions: 90,
+                    lines: 90,
+                    statements: 90,
                 },
 
                 '!**/packages/@lwc/ssr-*/**': {
diff --git a/vitest.shared.mjs b/vitest.shared.mjs
index b0b0c7dbfe..5ec46c60e6 100644
--- a/vitest.shared.mjs
+++ b/vitest.shared.mjs
@@ -1,9 +1,14 @@
 import inspector from 'node:inspector';
+import process from 'node:process';
 import { defineConfig } from 'vitest/config';
 import pkg from './package.json';
-
 export default defineConfig({
     test: {
+        // We can't set `NODE_ENV` directly (i.e. `NODE_ENV=production yarn test`), because some packages
+        // set their env to jsdom, and NODE_ENV=production + jsdom causes `node:` imports to break
+        env: {
+            NODE_ENV: process.env.VITE_NODE_ENV,
+        },
         // Don't time out if we detect a debugger attached
         testTimeout: inspector.url()
             ? // Largest allowed delay, see https://developer.mozilla.org/en-US/docs/Web/API/Window/setTimeout#maximum_delay_value
@@ -28,6 +33,7 @@ export default defineConfig({
                 'rollup-plugin',
                 'shared',
                 'signals',
+                'ssr-client-utils',
                 'ssr-compiler',
                 'ssr-runtime',
                 'style-compiler',
diff --git a/yarn.lock b/yarn.lock
index fcf39fe151..ff4e0aaa7c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3818,9 +3818,9 @@ available-typed-arrays@^1.0.7:
     possible-typed-array-names "^1.0.0"
 
 axios@^1.7.4:
-  version "1.7.9"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.9.tgz#d7d071380c132a24accda1b2cfc1535b79ec650a"
-  integrity sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.2.tgz#fabe06e241dfe83071d4edfbcaa7b1c3a40f7979"
+  integrity sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==
   dependencies:
     follow-redirects "^1.15.6"
     form-data "^4.0.0"