diff --git a/docker-compose.yml b/docker-compose.yml
index fbf59b4de..e3560f374 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -101,6 +101,19 @@ services:
             - ./misc/manticoresearch/manticore.conf:/etc/manticoresearch/manticore.conf # uncomment if you use a custom config
         networks:
             - sail
+#    elasticsearch:
+#        image: docker.elastic.co/elasticsearch/elasticsearch:8.6.2
+#        environment:
+#            - discovery.type=single-node
+#            - xpack.security.enabled=false
+#            - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+#        ports:
+#            - 9200:9200
+#            - 9300:9300
+#        volumes:
+#            - sail-elasticsearch:/usr/share/elasticsearch/data
+#        networks:
+#            - sail 
 networks:
     sail:
         driver: bridge
@@ -111,3 +124,5 @@ volumes:
         driver: local
     sail-manticore:
         driver: local
+ #   sail-elasticsearch:
+ #       driver: local
\ No newline at end of file
diff --git a/docker/8.2/README.md b/docker/8.2/README.md
index 232a9db2c..684f79deb 100644
--- a/docker/8.2/README.md
+++ b/docker/8.2/README.md
@@ -2,7 +2,7 @@
 
 **Author:** [Fossil01](https://github.com/Fossil01)
 
-The development environment contains the: App, MariaDB, Redis, Manticore and Mailpit containers. The app container is where nginx and PHP-FPM run and has a bind mount to the root directory of this project. Supervisord is used to run it all in the background.
+The development environment contains the: App, MariaDB, Redis, Manticore and Mailpit containers. The app container is where nginx and PHP-FPM run and has a bind mount to the root directory of this project. Supervisord is used to run it all in the background. Manticore can be switched out for Elasticsearch by commenting/uncommenting the corresponding lines in `docker-compose.yml`. Elasticsearch has security disabled by default.
 
 This container also houses several tools to run the indexing backend: tmux, ffmpeg, mediainfo, unrar etc. It also has MariaDB & Postgres clients, NodeJS & Yarn.
 
@@ -38,6 +38,7 @@ MAIL_HOST=mailpit
 MAIL_PORT=1025
 
 MANTICORESEARCH_HOST=manticore
+ELASTICSEARCH_HOST=elasticsearch
 ```
 
 ## Database