diff --git a/src/Workloads/Manifests/Microsoft.NET.Workload.Emscripten.Current.Manifest/WorkloadManifest.json.in b/src/Workloads/Manifests/Microsoft.NET.Workload.Emscripten.Current.Manifest/WorkloadManifest.json.in
index e0fd625d852c..9048d4c8c063 100644
--- a/src/Workloads/Manifests/Microsoft.NET.Workload.Emscripten.Current.Manifest/WorkloadManifest.json.in
+++ b/src/Workloads/Manifests/Microsoft.NET.Workload.Emscripten.Current.Manifest/WorkloadManifest.json.in
@@ -1,6 +1,9 @@
 {
   "version": "${WorkloadVersion}",
   "workloads": {
+    "microsoft-net-sdk-emscripten-${NetVersion}": {
+      "extends": [ "microsoft-net-sdk-emscripten" ]
+    },
     "microsoft-net-sdk-emscripten": {
       "abstract": true,
       "description": "Emscripten SDK compiler tooling for ${NetVersion}.0",
diff --git a/src/Workloads/Manifests/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.json.in b/src/Workloads/Manifests/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.json.in
index f27c4aad1af8..ea4eb8c6d8bb 100644
--- a/src/Workloads/Manifests/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.json.in
+++ b/src/Workloads/Manifests/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.json.in
@@ -4,6 +4,9 @@
     "Microsoft.NET.Workload.Emscripten.Current": "${WorkloadVersion}"
   },
   "workloads": {
+    "wasm-tools-${NetVersion}": {
+      "extends": [ "wasm-tools" ]
+    },
     "wasm-tools": {
       "description": ".NET WebAssembly build tools for ${NetVersion}.0",
       "packs": [
@@ -15,6 +18,9 @@
       "extends": [ "microsoft-net-runtime-mono-tooling", "microsoft-net-sdk-emscripten" ],
       "platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "linux-musl-x64", "linux-musl-arm64", "osx-x64", "osx-arm64" ]
     },
+    "wasm-experimental-${NetVersion}": {
+      "extends": [ "wasm-experimental" ]
+    },
     "wasm-experimental": {
       "description": ".NET WebAssembly experimental tooling for ${NetVersion}.0",
       "packs": [
@@ -24,8 +30,11 @@
       "extends": [ "wasm-tools" ],
       "platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "linux-musl-x64", "linux-musl-arm64", "osx-x64", "osx-arm64" ]
     },
+    "wasi-experimental-${NetVersion}": {
+      "extends": [ "wasi-experimental" ]
+    },
     "wasi-experimental": {
-      "description": ".NET WASI experimental tooing for ${NetVersion}.0",
+      "description": ".NET WASI experimental tooling for ${NetVersion}.0",
       "packs": [
         "Microsoft.NET.Runtime.WebAssembly.Wasi.Sdk.${NetVersion}",
         "Microsoft.NETCore.App.Runtime.Mono.${NetVersion}.wasi-wasm",
@@ -35,6 +44,9 @@
       "extends": [ "microsoft-net-runtime-mono-tooling" ],
       "platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "linux-musl-x64", "linux-musl-arm64", "osx-x64", "osx-arm64" ]
     },
+    "mobile-librarybuilder-${NetVersion}": {
+      "extends": [ "mobile-librarybuilder" ]
+    },
     "mobile-librarybuilder": {
       "description": "Mobile SDK for building a self-contained .NET native library in ${NetVersion}.0",
       "packs": [
@@ -43,6 +55,9 @@
       "extends": [ "microsoft-net-runtime-android-aot", "microsoft-net-runtime-ios", "microsoft-net-runtime-maccatalyst", "microsoft-net-runtime-tvos" ],
       "platforms": [ "win-x64", "win-arm64", "osx-x64", "osx-arm64" ]
     },
+    "microsoft-net-runtime-android-${NetVersion}": {
+      "extends": [ "microsoft-net-runtime-android" ]
+    },
     "microsoft-net-runtime-android": {
       "abstract": true,
       "description": "Android Mono Runtime",
@@ -55,6 +70,9 @@
       "extends": [ "microsoft-net-runtime-mono-tooling" ],
       "platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "osx-x64", "osx-arm64" ]
     },
+    "microsoft-net-runtime-android-aot-${NetVersion}": {
+      "extends": [ "microsoft-net-runtime-android-aot" ]
+    },
     "microsoft-net-runtime-android-aot": {
       "abstract": true,
       "description": "Android Mono AOT Workload",
@@ -67,6 +85,9 @@
       "extends": [ "microsoft-net-runtime-android" ],
       "platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "osx-x64", "osx-arm64" ]
     },
+    "microsoft-net-runtime-ios-${NetVersion}": {
+      "extends": [ "microsoft-net-runtime-ios" ]
+    },
     "microsoft-net-runtime-ios": {
       "abstract": true,
       "description": "iOS Mono Runtime and AOT Workload",
@@ -78,6 +99,9 @@
       "extends": [ "runtimes-ios" ],
       "platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ]
     },
+    "runtimes-ios-${NetVersion}": {
+      "extends": [ "runtimes-ios" ]
+    },
     "runtimes-ios": {
       "abstract": true,
       "description": "iOS Mono Runtime Packs",
@@ -89,6 +113,9 @@
       "extends": [ "microsoft-net-runtime-mono-tooling" ],
       "platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ]
     },
+    "microsoft-net-runtime-maccatalyst-${NetVersion}": {
+      "extends": [ "microsoft-net-runtime-maccatalyst" ]
+    },
     "microsoft-net-runtime-maccatalyst": {
       "abstract": true,
       "description": "MacCatalyst Mono Runtime and AOT Workload",
@@ -99,6 +126,9 @@
       "extends": [ "runtimes-maccatalyst" ],
       "platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ]
     },
+    "runtimes-maccatalyst-${NetVersion}": {
+      "extends": [ "runtimes-maccatalyst" ]
+    },
     "runtimes-maccatalyst": {
       "abstract": true,
       "description": "MacCatalyst Mono Runtime Packs",
@@ -109,6 +139,9 @@
       "extends": [ "microsoft-net-runtime-mono-tooling" ],
       "platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ]
     },
+    "microsoft-net-runtime-macos-${NetVersion}": {
+      "extends": [ "microsoft-net-runtime-macos" ]
+    },
     "microsoft-net-runtime-macos": {
       "abstract": true,
       "description": "MacOS CoreCLR and Mono Runtime Workload",
@@ -121,6 +154,9 @@
       "extends": [ "microsoft-net-runtime-mono-tooling" ],
       "platforms": [ "osx-arm64", "osx-x64" ]
     },
+    "microsoft-net-runtime-tvos-${NetVersion}": {
+      "extends": [ "microsoft-net-runtime-tvos" ]
+    },
     "microsoft-net-runtime-tvos": {
       "abstract": true,
       "description": "tvOS Mono Runtime and AOT Workload",
@@ -132,6 +168,9 @@
       "extends": [ "runtimes-tvos" ],
       "platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ]
     },
+    "runtimes-tvos-${NetVersion}": {
+      "extends": [ "runtimes-tvos" ]
+    },
     "runtimes-tvos": {
       "abstract": true,
       "description": "tvOS Mono Runtime Packs",
@@ -143,6 +182,9 @@
       "extends": [ "microsoft-net-runtime-mono-tooling" ],
       "platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ]
     },
+    "microsoft-net-runtime-mono-tooling-${NetVersion}": {
+      "extends": [ "microsoft-net-runtime-mono-tooling" ]
+    },
     "microsoft-net-runtime-mono-tooling": {
       "abstract": true,
       "description": "Shared native build tooling for Mono runtime",