diff --git a/build-system/configure.py b/build-system/configure.py
index 32b32602c..3dcfbfe35 100644
--- a/build-system/configure.py
+++ b/build-system/configure.py
@@ -17,7 +17,8 @@ b.enable_prefix()
 b.enable_configmk()
 b.add_tool(tbc.PosixTool("find"))
 b.add_tool(tbc.NodeJsTool(version_spec=">=12"))
-b.add_tool(tbc.YarnTool())
+b.add_tool(tbc.GenericTool("npm"))
+b.add_tool(tbc.GenericTool("pnpm", hint="Use 'sudo npm -g pnpm' to install."))
 b.run()
 
 print("copying Makefile")
diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
index f65d93384..c76fb9b3a 160000
--- a/build-system/taler-build-scripts
+++ b/build-system/taler-build-scripts
@@ -1 +1 @@
-Subproject commit f65d933845faa73a864cce17a8ccd575d8da9f10
+Subproject commit c76fb9b3af6ec43f2d2a83e6b4f523dcc5ac6a54