diff --git a/.gitpod.yml b/.gitpod.yml
index cdd235dd7230..35470c761ee3 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,4 +1,4 @@
-image: nventive/wasm-build:1.5
+image: unoplatform/wasm-build:2.1.1
 
 ports:
   # Default port for the SampleApp
diff --git a/build/gitpod/build-wasm.sh b/build/gitpod/build-wasm.sh
index 4a4762c58279..3f92d1ef4563 100755
--- a/build/gitpod/build-wasm.sh
+++ b/build/gitpod/build-wasm.sh
@@ -6,6 +6,6 @@ export NUGET_PACKAGES=/workspace/.nuget
 
 GITPOD_HOSTNAME=`echo $GITPOD_WORKSPACE_URL | sed -s 's/https:\/\///g'`
 
-msbuild /r /bl SamplesApp.Wasm.csproj /p:UnoSourceGeneratorUseGenerationHost=true /p:UnoSourceGeneratorUseGenerationController=false /p:UnoRemoteControlPort=443 "/p:UnoRemoteControlHost=53487-$GITPOD_HOSTNAME"
+msbuild /r /bl SamplesApp.Wasm.csproj /p:UnoTargetFrameworkOverride=netstandard2.0 /p:UnoSourceGeneratorUseGenerationHost=true /p:UnoSourceGeneratorUseGenerationController=false /p:UnoRemoteControlPort=443 "/p:UnoRemoteControlHost=53487-$GITPOD_HOSTNAME"
 
 popd