diff --git a/.env.sample b/.env.sample
index c64c626..4d9c344 100644
--- a/.env.sample
+++ b/.env.sample
@@ -59,12 +59,11 @@ REDIS_PORT=6379
 # CACHE_REDIS_URL=
 # CACHE_REDIS_NAMESPACE=
 
-# ElasticSearch (CURRENTLY NOT SUPPORTED)
+# ElasticSearch
 # --------------------------------------
-ES_ENABLED=false
-# ES_HOST=localhost
-# ES_PORT=9200
-# ES_PREFIX=
+ES_ENABLED=true
+ES_HOST=es
+ES_PORT=9200
 
 # StatsD (CURRENTLY NOT SUPPORTED)
 # -------------------------------
diff --git a/compose.yml b/compose.yml
index c11780e..48bfe54 100644
--- a/compose.yml
+++ b/compose.yml
@@ -23,24 +23,23 @@ services:
     volumes:
       - redis:/data
 
-  #  es:
-  #    restart: always
-  #    image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.10
-  #    environment:
-  #      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-  #      - "cluster.name=es-mastodon"
-  #      - "discovery.type=single-node"
-  #      - "bootstrap.memory_lock=true"
-  #    networks:
-  #      - internal_network
-  #    healthcheck:
-  #      test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
-  #    volumes:
-  #      - ./elasticsearch:/usr/share/elasticsearch/data
-  #    ulimits:
-  #      memlock:
-  #        soft: -1
-  #        hard: -1
+   es:
+     image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.10
+     environment:
+       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+       - "cluster.name=es-mastodon"
+       - "discovery.type=single-node"
+       - "bootstrap.memory_lock=true"
+     networks:
+       - internal_network
+     healthcheck:
+       test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
+     volumes:
+       - es:/usr/share/elasticsearch/data
+     ulimits:
+       memlock:
+         soft: -1
+         hard: -1
 
   web:
     image: &image tootsuite/mastodon:v3.3.0
@@ -224,6 +223,8 @@ volumes:
   app:
   redis:
   postgres:
+  es:
+
 networks:
   proxy:
     external: true