diff --git a/docker/etherpad/Dockerfile b/docker/etherpad/Dockerfile
index bb8e24b4fb..cfa867c13f 100644
--- a/docker/etherpad/Dockerfile
+++ b/docker/etherpad/Dockerfile
@@ -42,7 +42,10 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
     rm -rf /var/lib/apt/lists/*
 RUN npm install -g pnpm@9.0.4
 RUN git clone https://github.com/ether/etherpad-lite ${EP_DIR}
-RUN git checkout v2.2.4
+# This is a commit after v2.2.4 and before 2.2.5.
+# We check this out to pickup a fix for embedding etherpad as
+# we do with meetpad.
+RUN git checkout 08f199178d2932cc0ec956aaeb3f62e8a535598a
 RUN pnpm install
 RUN pnpm run build:ui
 
@@ -149,7 +152,10 @@ USER etherpad
 
 RUN git clone https://github.com/ether/etherpad-lite ${EP_DIR}
 WORKDIR "${EP_DIR}"
-RUN git checkout v2.2.4
+# This is a commit after v2.2.4 and before 2.2.5.
+# We check this out to pickup a fix for embedding etherpad as
+# we do with meetpad.
+RUN git checkout 08f199178d2932cc0ec956aaeb3f62e8a535598a
 
 FROM build AS development
 ARG ETHERPAD_PLUGINS
diff --git a/zuul.d/docker-images/etherpad.yaml b/zuul.d/docker-images/etherpad.yaml
index 1416eb7214..9e0c87523f 100644
--- a/zuul.d/docker-images/etherpad.yaml
+++ b/zuul.d/docker-images/etherpad.yaml
@@ -11,7 +11,7 @@
           repository: opendevorg/etherpad
           tags:
             - latest
-            - v2.2.4
+            - v2.2.4.dev17
           build_args:
             - EP_GID=5001
     files: &etherpad_files