diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
index ef6ece1..846a984 100644
--- a/templates/docker-compose.yml.j2
+++ b/templates/docker-compose.yml.j2
@@ -19,7 +19,7 @@ services:
     networks:
        - external_network
        - internal_network
-  
+
   privoxy:
     image: sirboops/privoxy
     volumes:
@@ -64,7 +64,7 @@ services:
        - external_network
        - internal_network
     healthcheck:
-       test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
+       test: ["CMD-SHELL", "curl --silent --fail localhost:{{ es_port }}/_cluster/health || exit 1"]
     volumes:
        - ./elasticsearch:/usr/share/elasticsearch/data
     ulimits:
@@ -95,7 +95,8 @@ services:
     depends_on:
       - db
       - redis
-      # - es
+{% if es_enabled %}      - es
+{% endif %}
     volumes:
       - ./public/system:/mastodon/public/system