diff --git a/templates/types/streaming/nextjs/next.config.json b/templates/types/streaming/nextjs/next.config.json
index 264e20ef32d0f82cadce202574ff63843479198a..856fb100f20ee797696314e88cf16e3671e0569f 100644
--- a/templates/types/streaming/nextjs/next.config.json
+++ b/templates/types/streaming/nextjs/next.config.json
@@ -2,6 +2,7 @@
   "experimental": {
     "outputFileTracingIncludes": {
       "/*": ["./cache/**/*"]
-    }
+    },
+    "serverComponentsExternalPackages": ["sharp", "onnxruntime-node"]
   }
 }
diff --git a/templates/types/streaming/nextjs/webpack.config.mjs b/templates/types/streaming/nextjs/webpack.config.mjs
index 8c9edeb14edd79ac41e4744889a0990ab070a527..156284b3caf875bdd48330fab25bc929f4cab7ef 100644
--- a/templates/types/streaming/nextjs/webpack.config.mjs
+++ b/templates/types/streaming/nextjs/webpack.config.mjs
@@ -1,13 +1,15 @@
 // webpack config must be a function in NextJS that is used to patch the default webpack config provided by NextJS, see https://nextjs.org/docs/pages/api-reference/next-config-js/webpack
 export default function webpack(config) {
-  // See https://webpack.js.org/configuration/resolve/#resolvealias
-  config.resolve.alias = {
-    ...config.resolve.alias,
-    sharp$: false,
-    "onnxruntime-node$": false,
-  };
   config.resolve.fallback = {
     aws4: false,
   };
+
+  // Following lines will fix issues with onnxruntime-node when using pnpm
+  // See: https://github.com/vercel/next.js/issues/43433
+  config.externals.push({
+    "onnxruntime-node": "commonjs onnxruntime-node",
+    sharp: "commonjs sharp",
+  });
+
   return config;
 }
diff --git a/templates/types/streaming/nextjs/webpack.config.o11y.mjs b/templates/types/streaming/nextjs/webpack.config.o11y.mjs
index c7c7ad3ff394d506064907f3bf27d126370b98e6..03e5be237a82973aa00a13f3457fe0528f2f8da3 100644
--- a/templates/types/streaming/nextjs/webpack.config.o11y.mjs
+++ b/templates/types/streaming/nextjs/webpack.config.o11y.mjs
@@ -1,10 +1,4 @@
 export default function webpack(config, isServer) {
-  // See https://webpack.js.org/configuration/resolve/#resolvealias
-  config.resolve.alias = {
-    ...config.resolve.alias,
-    sharp$: false,
-    "onnxruntime-node$": false,
-  };
   config.resolve.fallback = {
     aws4: false,
   };