diff --git a/src/Microsoft.AspNetCore.Components.WebAssembly.Runtime/Microsoft.AspNetCore.Components.WebAssembly.Runtime.csproj b/src/Microsoft.AspNetCore.Components.WebAssembly.Runtime/Microsoft.AspNetCore.Components.WebAssembly.Runtime.csproj
index 74cb0e49..3c1056f8 100644
--- a/src/Microsoft.AspNetCore.Components.WebAssembly.Runtime/Microsoft.AspNetCore.Components.WebAssembly.Runtime.csproj
+++ b/src/Microsoft.AspNetCore.Components.WebAssembly.Runtime/Microsoft.AspNetCore.Components.WebAssembly.Runtime.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <WasmItemsToCopy Include="$(MonoIncomingDir)wasm\**" />
+    <WasmItemsToCopy Include="$(MonoIncomingDir)wasm\*" />
     <BclItemsToCopy Include="$(MonoIncomingDir)bcl\**" />
     <FrameworkItemsToCopy Include="$(MonoIncomingDir)framework\**" />
     <BclWipeSpecFiles Include="$(BclWipeSpecDir)**" />
@@ -25,10 +25,20 @@
 
   <Target Name="OptimizeMono" DependsOnTargets="OptimizeMonoWasm; OptimizeBcl" BeforeTargets="Build" />
 
-  <Target Name="OptimizeMonoWasm" Inputs="@(WasmItemsToCopy)" Outputs="@(WasmItemsToCopy->'$(MonoDistDir)wasm\%(RecursiveDir)%(FileName)%(Extension)')">
+  <Target Name="OptimizeMonoWasm">
+    <ItemGroup>
+      <_WasmItemsToCopy Include="@(WasmItemsToCopy)"
+        DestinationPath="$(MonoDistDir)wasm\%(RecursiveDir)%(FileName)%(Extension)"
+        Condition="'%(Extension)'!='.js'" />
+
+      <_WasmItemsToCopy Include="@(WasmItemsToCopy)"
+        DestinationPath="$(MonoDistDir)wasm\%(RecursiveDir)%(FileName).$(PackageVersion)%(Extension)"
+        Condition="'%(Extension)'=='.js'" />
+    </ItemGroup>
+
     <!-- TODO: Implement WASM code stripping like in prototype -->
     <Message Importance="High" Text="Creating optimized Mono WebAssembly build" />
-    <Copy SourceFiles="@(WasmItemsToCopy)" DestinationFiles="@(WasmItemsToCopy->'$(MonoDistDir)wasm\%(RecursiveDir)%(FileName)%(Extension)')" />
+    <Copy SourceFiles="@(_WasmItemsToCopy)" DestinationFiles="%(_WasmItemsToCopy.DestinationPath)" />
   </Target>
 
   <Target Name="OptimizeBcl" Inputs="@(BclItemsToCopy);@(BclWipeSpecFiles)" Outputs="@(BclItemsToCopy->'$(MonoDistDir)bcl\%(RecursiveDir)%(FileName)%(Extension)')">