diff --git a/frontend/scripts/build b/frontend/scripts/build
index c6fb93742d..77dc6ae323 100755
--- a/frontend/scripts/build
+++ b/frontend/scripts/build
@@ -29,7 +29,9 @@ rm -rf target/dist;
 yarn run build:app:main --config-merge "{:release-version \"${CURRENT_HASH}-${TS}\"}" $EXTRA_PARAMS;
 
 if [ "$INCLUDE_WASM" = "yes" ];  then
-    yarn run build:wasm || exit 1;
+    pushd ../render-wasm;
+    ./build
+    popd
 fi
 
 yarn run build:app:libs || exit 1;
diff --git a/render-wasm/_build_env b/render-wasm/_build_env
index 3be4d13957..431b45bb5d 100644
--- a/render-wasm/_build_env
+++ b/render-wasm/_build_env
@@ -75,7 +75,7 @@ function copy_artifacts {
 
     sed -i "s/render_wasm.wasm/$BUILD_NAME.wasm?version=$CURRENT_VERSION/g" $DEST/$BUILD_NAME.js;
 
-    npx esbuild target/wasm32-unknown-emscripten/$BUILD_MODE/render_wasm.js \
+    yarn esbuild target/wasm32-unknown-emscripten/$BUILD_MODE/render_wasm.js \
         --log-level=error \
         --outfile=$DEST/worker/render.js \
         --platform=neutral \