diff --git a/docker-compose.yml b/docker-compose.yml
index c26a2424a..e2987cab1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,12 +28,14 @@ services:
       - PG_USER=postgres
       - PG_PASSWORD=postgres
       - PG_DB=omnivore
-      - ES_URL=http://elastic:9200
-      - ES_USERNAME=blank
-      - ES_PASSWORD=blank
+      - ELASTIC_URL=http://elastic:9200
+      - ELASTIC_USERNAME=blank
+      - ELASTIC_PASSWORD=blank
     depends_on:
       postgres:
         condition: service_healthy
+      elastic:
+        condition: service_healthy
 
   elastic:
     image: docker.elastic.co/elasticsearch/elasticsearch:7.17.1