diff --git a/src/Vegasco-Web/package.json b/src/Vegasco-Web/package.json
index 8ab96ff..4e81464 100644
--- a/src/Vegasco-Web/package.json
+++ b/src/Vegasco-Web/package.json
@@ -3,7 +3,6 @@
   "version": "0.0.0",
   "scripts": {
     "ng": "ng",
-    "start:withInstall": "pnpm install && pnpm run start",
     "start": "run-script-os",
     "start:win32": "ng serve --port %PORT% --configuration development",
     "start:default": "ng serve --port $PORT --configuration development",
diff --git a/src/Vegasco.Server.AppHost/Program.cs b/src/Vegasco.Server.AppHost/Program.cs
index c4debdf..d214b70 100644
--- a/src/Vegasco.Server.AppHost/Program.cs
+++ b/src/Vegasco.Server.AppHost/Program.cs
@@ -23,7 +23,7 @@ IResourceBuilder<ProjectResource> api = builder
 	.WaitFor(postgres);
 
 builder
-	.AddNpmApp("Vegasco-Web", "../Vegasco-Web", scriptName: "start:withInstall")
+	.AddNpmApp("Vegasco-Web", "../Vegasco-Web")
 	.WithReference(api)
 	.WaitFor(api)
 	.WithHttpEndpoint(port: 44200, env: "PORT", isProxied: false)
diff --git a/src/Vegasco.Server.AppHost/Vegasco.Server.AppHost.csproj b/src/Vegasco.Server.AppHost/Vegasco.Server.AppHost.csproj
index dc8b747..783a0d3 100644
--- a/src/Vegasco.Server.AppHost/Vegasco.Server.AppHost.csproj
+++ b/src/Vegasco.Server.AppHost/Vegasco.Server.AppHost.csproj
@@ -25,4 +25,14 @@
     <ProjectReference Include="..\Vegasco.Server.Api\Vegasco.Server.Api.csproj" />
   </ItemGroup>
 
+  <Target Name="RestoreNpm" BeforeTargets="Build" Condition=" '$(DesignTimeBuild)' != 'true' ">
+    <ItemGroup>
+      <PackageJsons Include="..\*\package.json" />
+    </ItemGroup>
+
+    <!-- Install npm packages if node_modules is missing -->
+    <Message Importance="Normal" Text="Installing npm packages for %(PackageJsons.RelativeDir)" Condition="!Exists('%(PackageJsons.RootDir)%(PackageJsons.Directory)/node_modules')" />
+    <Exec Command="pnpm install" WorkingDirectory="%(PackageJsons.RootDir)%(PackageJsons.Directory)" Condition="!Exists('%(PackageJsons.RootDir)%(PackageJsons.Directory)/node_modules')" />
+  </Target>
+
 </Project>