diff --git a/bin/ci/test.sh b/bin/ci/test.sh
index 970fe7f..2402956 100755
--- a/bin/ci/test.sh
+++ b/bin/ci/test.sh
@@ -74,7 +74,7 @@ export PHP_IMAGE="ibexa_php:latest-node" PHP_IMAGE_DEV="ibexa_php:latest-node"
 docker compose --env-file .env up -d --build --force-recreate
 echo '> Workaround for test issues: Change ownership of files inside docker container'
 docker compose --env-file=.env exec -T app sh -c 'chown -R www-data:www-data /var/www'
-if docker run -i --rm ibexa_php:latest-node bash -c "php -v" | grep -q '8.3'; then
+if docker run -i --rm ibexa_php:latest-node bash -c "php -v" | grep -q '8.3' && [ "$PRODUCT_VERSION" = "~3.3.x-dev" ]; then
     echo '> Set PHP 8.2+ Ibexa error handler to avoid deprecations'
     docker compose --env-file=.env exec -T --user www-data app sh -c "composer config extra.runtime.error_handler \"\\Ibexa\\Contracts\\Core\\MVC\\Symfony\\ErrorHandler\\Php82HideDeprecationsErrorHandler\""
     docker compose --env-file=.env exec -T --user www-data app sh -c "composer dump-autoload"
diff --git a/docker/elastic8.yml b/docker/elastic8.yml
new file mode 100644
index 0000000..38aa612
--- /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