diff --git a/roles/corepack/tasks/main.yml b/roles/corepack/tasks/main.yml
index a3fbb79..0a95e2b 100644
--- a/roles/corepack/tasks/main.yml
+++ b/roles/corepack/tasks/main.yml
@@ -13,6 +13,10 @@
   register: corepack_version
   ignore_errors: true
 
+- name: Enable pnpm latest version
+  shell: corepack prepare pnpm@latest --activate
+  when: node_version is version('16.0.0', '<')
+
 - name: Test pnpm
   shell: pnpm --version
   register: pnpm_version