diff --git a/webapps/etherpad/tasks/main.yml b/webapps/etherpad/tasks/main.yml
index fc408c37..25c07243 100644
--- a/webapps/etherpad/tasks/main.yml
+++ b/webapps/etherpad/tasks/main.yml
@@ -6,6 +6,17 @@
     name: "{{ etherpad_system_dep }}"
     update_cache: yes
 
+- name: Install pnpm (via npm)
+  ansible.builtin.command:
+    cmd: npm install -g pnpm
+
+- name: Fix permissions for pnpm
+  ansible.builtin.file:
+    path: /usr/local/lib/node_modules/
+    state: directory
+    mode: o+rx
+    recurse: yes
+
 - name: Add UNIX account
   ansible.builtin.user:
     name: "{{ service }}"
@@ -34,13 +45,13 @@
 
 - name: Fix run.sh so it does not start etherpad at the end
   ansible.builtin.lineinfile: 
-    path: "~/etherpad-lite/src/bin/run.sh"
+    path: "~/etherpad-lite/bin/run.sh"
     state: absent
-    regexp: 'exec node src/node/server.js'
+    regexp: '^exec pnpm run dev'
   become_user: "{{ service }}"
 
 - name: Run setup
-  ansible.builtin.shell: "src/bin/run.sh"
+  ansible.builtin.shell: "bin/run.sh"
   args:
     chdir: "~/etherpad-lite"
   become_user: "{{ service }}"
diff --git a/webapps/etherpad/templates/etherpad.service.j2 b/webapps/etherpad/templates/etherpad.service.j2
index 43d70a2e..39353603 100644
--- a/webapps/etherpad/templates/etherpad.service.j2
+++ b/webapps/etherpad/templates/etherpad.service.j2
@@ -7,7 +7,7 @@ After=mariadb.service
 [Service]
 Type=simple
 Environment=NODE_ENV=production
-ExecStart=/usr/bin/node --experimental-worker /home/{{service}}/etherpad-lite/node_modules/ep_etherpad-lite/node/server.js
+ExecStart=pnpm run prod
 Restart=always
 User={{service}}
 Group={{service}}