diff --git a/.env.sample b/.env.sample
index eb1d7b8..a9fbfc3 100644
--- a/.env.sample
+++ b/.env.sample
@@ -60,8 +60,8 @@ REDIS_PORT=6379
 # CACHE_REDIS_NAMESPACE=
 
 # ElasticSearch
+# include compose.elasticsearch.yml
 # --------------------------------------
-ES_ENABLED=true
 ES_HOST=es
 ES_PORT=9200
 
@@ -118,6 +118,7 @@ DEFAULT_LOCALE=en
 # PAPERCLIP_ROOT_URL=
 
 # S3 and AWS
+# include compose.s3.yml
 # ----------
 # S3_BUCKET=
 # AWS_ACCESS_KEY_ID=
diff --git a/compose.elastisearch.yml b/compose.elastisearch.yml
new file mode 100644
index 0000000..b9c019d
--- /dev/null
+++ b/compose.elastisearch.yml
@@ -0,0 +1,15 @@
+---
+version: "3.8"
+
+services:
+  app:
+    environment: &es-env
+      - ES_ENABLED=true
+      - ES_HOST
+      - ES_PORT
+
+  streaming:
+    environment: *es-env
+
+  sidekiq:
+    environment: *es-env
diff --git a/compose.yml b/compose.yml
index 784d961..af59160 100644
--- a/compose.yml
+++ b/compose.yml
@@ -48,9 +48,6 @@ services:
       - DEFAULT_LOCALE
       - EMAIL_DOMAIN_ALLOWLIST
       - EMAIL_DOMAIN_DENYLIST
-      - ES_ENABLED
-      - ES_HOST
-      - ES_PORT
       - LDAP_BASE
       - LDAP_BIND_DN
       - LDAP_ENABLED