diff --git a/frontend_addon/cookiecutter.json b/frontend_addon/cookiecutter.json
index d13191e..a01adbb 100644
--- a/frontend_addon/cookiecutter.json
+++ b/frontend_addon/cookiecutter.json
@@ -20,7 +20,6 @@
   "__gha_version_node": "20.x",
   "__gha_version_checkout": "v4",
   "__gha_version_setup_node": "v4",
-  "__gha_version_pnpm_action_setup": "v3",
   "__gha_version_cache": "v4",
   "__gha_version_background_action": "v1",
   "__gha_version_upload_artifact": "v4",
@@ -39,9 +38,7 @@
     "email": "Author E-mail"
   },
   "_copy_without_render": [],
-  "_extensions": [
-    "cookieplone.filters.latest_volto"
-  ],
+  "_extensions": ["cookieplone.filters.latest_volto"],
   "__cookieplone_repository_path": "",
   "__cookieplone_template": ""
 }
diff --git a/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/acceptance.yml b/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/acceptance.yml
index 639203a..5b9e887 100644
--- a/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/acceptance.yml	
+++ b/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/acceptance.yml	
@@ -24,13 +24,8 @@ jobs:
         with:
           node-version: {{ "${{ env.NODE_VERSION }}" }}
 
-      - uses: pnpm/action-setup@{{ cookiecutter.__gha_version_pnpm_action_setup }}
-        name: Install pnpm
-        with:
-          version: {{ cookiecutter.__version_pnpm_major }}
-          # We don't want to install until later,
-          # when the cache and Cypress are in place
-          run_install: false
+      - name: Enable corepack
+        run: corepack enable
 
       - name: Get pnpm store directory
         shell: bash
diff --git a/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/changelog.yml b/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/changelog.yml
index dbf9be0..0167c7f 100644
--- a/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/changelog.yml	
+++ b/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/changelog.yml	
@@ -26,13 +26,8 @@ jobs:
         with:
           node-version: {{ "${{ env.NODE_VERSION }}" }}
 
-      - uses: pnpm/action-setup@{{ cookiecutter.__gha_version_pnpm_action_setup }}
-        name: Install pnpm
-        with:
-          version: {{ cookiecutter.__version_pnpm_major }}
-          # We don't want to install until later,
-          # when the cache and Cypress are in place
-          run_install: false
+      - name: Enable corepack
+        run: corepack enable
 
       - name: Get pnpm store directory
         shell: bash
diff --git a/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/code.yml b/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/code.yml
index a299258..b443cb7 100644
--- a/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/code.yml	
+++ b/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/code.yml	
@@ -23,13 +23,8 @@ jobs:
         with:
           node-version: {{ "${{ env.NODE_VERSION }}" }}
 
-      - uses: pnpm/action-setup@{{ cookiecutter.__gha_version_pnpm_action_setup }}
-        name: Install pnpm
-        with:
-          version: {{ cookiecutter.__version_pnpm_major }}
-          # We don't want to install until later,
-          # when the cache is in place
-          run_install: false
+      - name: Enable corepack
+        run: corepack enable
 
       - name: Get pnpm store directory
         shell: bash
diff --git a/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/i18n.yml b/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/i18n.yml
index 5a1d484..adb3f51 100644
--- a/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/i18n.yml	
+++ b/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/i18n.yml	
@@ -23,13 +23,8 @@ jobs:
         with:
           node-version: {{ "${{ env.NODE_VERSION }}" }}
 
-      - uses: pnpm/action-setup@{{ cookiecutter.__gha_version_pnpm_action_setup }}
-        name: Install pnpm
-        with:
-          version: {{ cookiecutter.__version_pnpm_major }}
-          # We don't want to install until later,
-          # when the cache and Cypress are in place
-          run_install: false
+      - name: Enable corepack
+        run: corepack enable
 
       - name: Get pnpm store directory
         shell: bash
diff --git a/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/storybook.yml b/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/storybook.yml
index 9d14955..5bb5a90 100644
--- a/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/storybook.yml	
+++ b/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/storybook.yml	
@@ -26,13 +26,8 @@ jobs:
         with:
           node-version: {{ "${{ env.NODE_VERSION }}" }}
 
-      - uses: pnpm/action-setup@{{ cookiecutter.__gha_version_pnpm_action_setup }}
-        name: Install pnpm
-        with:
-          version: {{ cookiecutter.__version_pnpm_major }}
-          # We don't want to install until later,
-          # when the cache and Cypress are in place
-          run_install: false
+      - name: Enable corepack
+        run: corepack enable
 
       - name: Get pnpm store directory
         shell: bash
diff --git a/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/unit.yml b/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/unit.yml
index 1252769..eb672f8 100644
--- a/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/unit.yml	
+++ b/frontend_addon/{{ cookiecutter.__folder_name }}/.github/workflows/unit.yml	
@@ -23,13 +23,8 @@ jobs:
         with:
           node-version: {{ "${{ env.NODE_VERSION }}" }}
 
-      - uses: pnpm/action-setup@{{ cookiecutter.__gha_version_pnpm_action_setup }}
-        name: Install pnpm
-        with:
-          version: {{ cookiecutter.__version_pnpm_major }}
-          # We don't want to install until later,
-          # when the cache and Cypress are in place
-          run_install: false
+      - name: Enable corepack
+        run: corepack enable
 
       - name: Get pnpm store directory
         shell: bash