diff --git a/lib/tasks/jsbundling/build.rake b/lib/tasks/jsbundling/build.rake
index a115438..4294bae 100644
--- a/lib/tasks/jsbundling/build.rake
+++ b/lib/tasks/jsbundling/build.rake
@@ -24,13 +24,15 @@ module Jsbundling
 
     def install_command
       return "bun install" if File.exist?('bun.lockb') || (tool_exists?('bun') && !File.exist?('yarn.lock'))
-      return "yarn install" if File.exist?('yarn.lock') || tool_exists?('yarn')
+      return "yarn install" if File.exist?('yarn.lock') || (tool_exists?('yarn') && !File.exist?('package-lock.json'))
+      return "npm install" if File.exist?('package-lock.json') || tool_exists?('npm')
       raise "jsbundling-rails: No suitable tool found for installing JavaScript dependencies"
     end
 
     def build_command
       return "bun run build" if File.exist?('bun.lockb') || (tool_exists?('bun') && !File.exist?('yarn.lock'))
-      return "yarn build" if File.exist?('yarn.lock') || tool_exists?('yarn')
+      return "yarn build" if File.exist?('yarn.lock') || (tool_exists?('yarn') && !File.exist?('package-lock.json'))
+      return "npm run build" if File.exist?('package-lock.json') || tool_exists?('npm')
       raise "jsbundling-rails: No suitable tool found for building JavaScript"
     end