diff --git a/client/package.json b/client/package.json
index c63787f..54952dd 100644
--- a/client/package.json
+++ b/client/package.json
@@ -92,5 +92,6 @@
   },
   "lint-staged": {
     "*": "eslint --fix"
-  }
+  },
+  "packageManager": "pnpm@10.28.1+sha512.7d7dbbca9e99447b7c3bf7a73286afaaf6be99251eb9498baefa7d406892f67b879adb3a1d7e687fc4ccc1a388c7175fbaae567a26ab44d1067b54fcb0d6a316"
 }
diff --git a/devenv.nix b/devenv.nix
index 7932142..a5ef626 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -25,7 +25,7 @@
       version = "1.25.5";
     };
     javascript.enable = true;
-    javascript.bun.enable = true;
+    javascript.corepack.enable = true;
   };
 
   processes = {
diff --git a/justfile b/justfile
index c3ba7ed..d014079 100644
--- a/justfile
+++ b/justfile
@@ -5,24 +5,24 @@ output_dir := join(project_dir, ".outputs")
 client_dir := join(project_dir, "client")
 exec_path := join(output_dir, project_name)
 go_cmd := `realpath $(which go)`
-bun_cmd := `realpath $(which bun)`
+pnpm_cmd := `realpath $(which pnpm)`
 
 default: install clean build-back build-client run-back
 
 backend: clean build-back run-back
 
 install:
-    cd {{ client_dir }} && {{ bun_cmd }} install
+    cd {{ client_dir }} && {{ pnpm_cmd }} install
 
 clean:
     mkdir -p .outputs
     find .outputs -mindepth 1 ! -path .outputs/config.yaml -exec rm -rf {} +
 
 client:
-    cd {{ client_dir }} && {{ bun_cmd }} dev
+    cd {{ client_dir }} && {{ pnpm_cmd }} dev
 
 build-client:
-    cd {{ client_dir }} && {{ bun_cmd }} run build --outDir {{ join(output_dir, "static") }}
+    cd {{ client_dir }} && {{ pnpm_cmd }} run build --outDir {{ join(output_dir, "static") }}
 
 build-back:
     {{ go_cmd }} build -o {{ exec_path }}{{ if os() == "windows" { ".exe" } else { "" } }} {{ server_enrty }}