diff --git a/docker/etherpad/Dockerfile b/docker/etherpad/Dockerfile
index 9e0f070582..3eb99f4f00 100644
--- a/docker/etherpad/Dockerfile
+++ b/docker/etherpad/Dockerfile
@@ -22,7 +22,7 @@
 #
 # Author: muxator
 
-FROM node:18-bookworm-slim
+FROM node:20-bookworm-slim
 LABEL maintainer="infra-root@openstack.org"
 
 ARG TIMEZONE=
@@ -101,7 +101,7 @@ USER etherpad
 
 RUN git clone https://github.com/ether/etherpad-lite ${EP_DIR}
 WORKDIR "${EP_DIR}"
-RUN git checkout v1.9.4
+RUN git checkout v1.9.5
 
 # Plugins must be installed before installing Etherpad's dependencies, otherwise
 # npm will try to hoist common dependencies by removing them from
diff --git a/docker/etherpad/settings.json.docker b/docker/etherpad/settings.json.docker
index dbe6bebee0..79f72f05e5 100644
--- a/docker/etherpad/settings.json.docker
+++ b/docker/etherpad/settings.json.docker
@@ -322,14 +322,6 @@
    */
   "soffice": "${SOFFICE:null}",
 
-  /*
-   * Path to the Tidy executable.
-   *
-   * Tidy is used to improve the quality of exported pads.
-   * Setting it to null disables Tidy.
-   */
-  "tidyHtml": "${TIDY_HTML:null}",
-
   /*
    * Allow import of file types other than the supported ones:
    * txt, doc, docx, rtf, odt, html & htm
diff --git a/playbooks/roles/etherpad/templates/settings.json.j2 b/playbooks/roles/etherpad/templates/settings.json.j2
index fd5a2c3bd5..0d8748d4cd 100644
--- a/playbooks/roles/etherpad/templates/settings.json.j2
+++ b/playbooks/roles/etherpad/templates/settings.json.j2
@@ -331,14 +331,6 @@
    */
   "soffice": null,
 
-  /*
-   * Path to the Tidy executable.
-   *
-   * Tidy is used to improve the quality of exported pads.
-   * Setting it to null disables Tidy.
-   */
-  "tidyHtml": null,
-
   /*
    * Allow import of file types other than the supported ones:
    * txt, doc, docx, rtf, odt, html & htm