diff --git a/docker/elastic8.yml b/docker/elastic8.yml
new file mode 100644
index 0000000..755f0df
--- /dev/null
+++ b/docker/elastic8.yml
@@ -0,0 +1,28 @@
+# Elastic config, to be appended after base-prod or base-dev, ..., but before selenium.yml
+#
+# NOTE: You'll need to manually run the command: php bin/console ibexa:elasticsearch:put-index-template.
+
+## WARNING!
+# This service is currently work in progress, is not tested by CI, and thus not guaranteed to work.
+# You are however more then welcome to try it out and help make it stable.
+
+services:
+    app:
+        depends_on:
+            - elasticsearch
+        environment:
+            - SEARCH_ENGINE=elasticsearch
+            - ELASTICSEARCH_DSN=elasticsearch:9200
+
+    elasticsearch:
+        image: docker.elastic.co/elasticsearch/elasticsearch:8.19.9
+        ports:
+            - "9200:9200"
+            - "9300:9300"
+        environment:
+            - discovery.type=single-node
+            - xpack.security.enabled=false
+            - xpack.security.http.ssl.enabled=false
+        networks:
+            - frontend
+            - backend
diff --git a/php/Dockerfile-node12 b/php/Dockerfile-node12
index 8c58ba4..a406383 100644
--- a/php/Dockerfile-node12
+++ b/php/Dockerfile-node12
@@ -1,11 +1,20 @@
 FROM ibexa_php:latest
 
 # Install Node.js and Yarn
-RUN apt-get update -q -y \
-    && apt-get install -q -y --no-install-recommends gnupg \ 
-    && curl -sL https://deb.nodesource.com/setup_12.x | bash - \
+RUN apt-get update -y \
+    && apt-get install -y --no-install-recommends \
+        ca-certificates curl gnupg \
+    \
+    && curl -fsSL https://deb.nodesource.com/setup_12.x | bash - \
     && apt-get install -y nodejs \
-    && curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-    && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
-    && sudo apt-get update && sudo apt-get install yarn \
+    \
+    && curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg \
+        | gpg --dearmor \
+        > /usr/share/keyrings/yarnkey.gpg \
+    && echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" \
+        > /etc/apt/sources.list.d/yarn.list \
+    \
+    && apt-get update \
+    && apt-get install -y yarn \
+    \
     && rm -rf /var/lib/apt/lists/*
diff --git a/php/Dockerfile-node14 b/php/Dockerfile-node14
index dbbf237..7b3c592 100644
--- a/php/Dockerfile-node14
+++ b/php/Dockerfile-node14
@@ -1,11 +1,20 @@
 FROM ibexa_php:latest
 
 # Install Node.js and Yarn
-RUN apt-get update -q -y \
-    && apt-get install -q -y --no-install-recommends gnupg \ 
-    && curl -sL https://deb.nodesource.com/setup_14.x | bash - \
+RUN apt-get update -y \
+    && apt-get install -y --no-install-recommends \
+        ca-certificates curl gnupg \
+    \
+    && curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
     && apt-get install -y nodejs \
-    && curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-    && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
-    && sudo apt-get update && sudo apt-get install yarn \
+    \
+    && curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg \
+        | gpg --dearmor \
+        > /usr/share/keyrings/yarnkey.gpg \
+    && echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" \
+        > /etc/apt/sources.list.d/yarn.list \
+    \
+    && apt-get update \
+    && apt-get install -y yarn \
+    \
     && rm -rf /var/lib/apt/lists/*
diff --git a/php/Dockerfile-node16 b/php/Dockerfile-node16
index be7fe83..d0971da 100644
--- a/php/Dockerfile-node16
+++ b/php/Dockerfile-node16
@@ -1,11 +1,20 @@
 FROM ibexa_php:latest
 
 # Install Node.js and Yarn
-RUN apt-get update -q -y \
-    && apt-get install -q -y --no-install-recommends gnupg \ 
-    && curl -sL https://deb.nodesource.com/setup_16.x | bash - \
+RUN apt-get update -y \
+    && apt-get install -y --no-install-recommends \
+        ca-certificates curl gnupg \
+    \
+    && curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \
     && apt-get install -y nodejs \
-    && curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-    && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
-    && sudo apt-get update && sudo apt-get install yarn \
+    \
+    && curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg \
+        | gpg --dearmor \
+        > /usr/share/keyrings/yarnkey.gpg \
+    && echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" \
+        > /etc/apt/sources.list.d/yarn.list \
+    \
+    && apt-get update \
+    && apt-get install -y yarn \
+    \
     && rm -rf /var/lib/apt/lists/*
diff --git a/php/Dockerfile-node18 b/php/Dockerfile-node18
index 7babd07..9f2b735 100644
--- a/php/Dockerfile-node18
+++ b/php/Dockerfile-node18
@@ -1,11 +1,20 @@
 FROM ibexa_php:latest
 
 # Install Node.js and Yarn
-RUN apt-get update -q -y \
-    && apt-get install -q -y --no-install-recommends gnupg \ 
-    && curl -sL https://deb.nodesource.com/setup_18.x | bash - \
+RUN apt-get update -y \
+    && apt-get install -y --no-install-recommends \
+        ca-certificates curl gnupg \
+    \
+    && curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \
     && apt-get install -y nodejs \
-    && curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-    && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
-    && sudo apt-get update && sudo apt-get install yarn \
+    \
+    && curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg \
+        | gpg --dearmor \
+        > /usr/share/keyrings/yarnkey.gpg \
+    && echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" \
+        > /etc/apt/sources.list.d/yarn.list \
+    \
+    && apt-get update \
+    && apt-get install -y yarn \
+    \
     && rm -rf /var/lib/apt/lists/*