diff --git a/README.MD b/README.MD
index d9b91db0..237b911e 100644
--- a/README.MD
+++ b/README.MD
@@ -56,7 +56,7 @@ Here are a few key differences compared to the original Valet:
 - Rabbitmq (on/off mode)
 - Xdebug (on/off mode)
 - Memcache (on/off mode)
-- Elasticsearch v6, v7, ~~v8~~ (on/off mode) using Docker 
+- Elasticsearch v6, v7, v8 (on/off mode) using Docker 
 - Opensearch (on/off mode)
 - ~~Ioncube~~
 - Rewrite/unrewrite public domain to local environment
diff --git a/cli/ValetPlus/Elasticsearch.php b/cli/ValetPlus/Elasticsearch.php
index c45a1453..e60b03eb 100644
--- a/cli/ValetPlus/Elasticsearch.php
+++ b/cli/ValetPlus/Elasticsearch.php
@@ -20,9 +20,9 @@ class Elasticsearch extends AbstractDockerService
     /** @var string */
     protected const ES_DEFAULT_VERSION = 'opensearch'; // which is v2 in Brew, @todo; maybe support v1.2 using docker?
     /** @var string[] */
-    protected const ES_SUPPORTED_VERSIONS = ['opensearch', 'elasticsearch6', 'elasticsearch7'];
+    protected const ES_SUPPORTED_VERSIONS = ['opensearch', 'elasticsearch6', 'elasticsearch7', 'elasticsearch8'];
     /** @var string[] */
-    protected const ES_DOCKER_VERSIONS = ['elasticsearch6', 'elasticsearch7'];
+    protected const ES_DOCKER_VERSIONS = ['elasticsearch6', 'elasticsearch7', 'elasticsearch8'];
     /** @var string[] */
     protected const ES_EOL_VERSIONS = ['elasticsearch@6'];
 
diff --git a/cli/stubs/elasticsearch/elasticsearch8/docker-compose.yml b/cli/stubs/elasticsearch/elasticsearch8/docker-compose.yml
new file mode 100644
index 00000000..a0ca1cef
--- /dev/null
+++ b/cli/stubs/elasticsearch/elasticsearch8/docker-compose.yml
@@ -0,0 +1,16 @@
+version: '3'
+services:
+  elasticsearch:
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0
+    container_name: elasticsearch8
+    ports:
+      - 9200:9200
+      - 9300:9300
+    environment:
+      - discovery.type=single-node
+      - xpack.security.enabled=false
+    volumes:
+      - esdata:/usr/share/elasticsearch/data
+volumes:
+  esdata:
+    driver: local