diff --git a/mastodon-docker-compose.yml b/mastodon-docker-compose.yml
index 3437483..524af87 100644
--- a/mastodon-docker-compose.yml
+++ b/mastodon-docker-compose.yml
@@ -28,14 +28,6 @@ services:
       - SMTP_FROM_ADDRESS=notifications@delibird.pkmn.cloud
       - S3_ENABLED=false
       - WEB_DOMAIN=mamoswine.pkmn.cloud #optional
-      - ES_HOST= #optional
-      - ES_PORT= #optional
-      - ES_USER= #optional
-      - ES_PASS= #optional
-      - S3_BUCKET= #optional
-      - AWS_ACCESS_KEY_ID= #optional
-      - AWS_SECRET_ACCESS_KEY= #optional
-      - S3_ALIAS_HOST= #optional
       - SIDEKIQ_ONLY=false #optional
       - SIDEKIQ_QUEUE= #optional
       - SIDEKIQ_DEFAULT=false #optional
@@ -58,6 +50,33 @@ services:
     container_name: mastodon-streaming
     restart: unless-stopped
     command: node ./streaming
+    environment:
+      - LOCAL_DOMAIN=mamoswine.pkmn.cloud
+      - REDIS_HOST=mast-redis
+      - REDIS_PORT=6379
+      - DB_HOST=mast-db
+      - DB_USER=mastodon
+      - DB_NAME=mastodon
+      - DB_PASS=m4rvD6HTAF675sgWpi
+      - DB_PORT=5432
+      - ES_ENABLED=false
+      - SECRET_KEY_BASE=5b1c80a0ec298ae5a19e3575a45b37274aee770c4cf02c8fa0f3e0d16b90f9cc4004f960ee078a789cd7efa402721cc3506bd90a68ea477529db5a85fec019cb
+      - OTP_SECRET=4ee6a93162f02f2750ed2abc5c4358b83c3f6a2245f0844f25c8b8326e487d6f5fc70ee6566f0637b1feb02148e17fb16e30c6d715a14cfe345c45f2e23a9c46
+      - VAPID_PRIVATE_KEY=v3F194PD0YSHZ1yOugOLUQ3cI54ovrCnM8iDhyi3Vao=
+      - VAPID_PUBLIC_KEY=BLPZxpl5vx5mbq6qUKgZ2j1ow6uisQfBQBVuQoHBbcrdGuvjcu2VUjPvlVDZFpA3R85PTdJAMyoJpVxvCbxl3Bw=
+      - SMTP_SERVER=smtp.mailersend.net
+      - SMTP_PORT=587
+      - SMTP_LOGIN=MS_LjOIWC@delibird.pkmn.cloud
+      - SMTP_PASSWORD=uadhFiKPbW39Hg5R
+      - SMTP_FROM_ADDRESS=notifications@delibird.pkmn.cloud
+      - S3_ENABLED=false
+      - WEB_DOMAIN=mamoswine.pkmn.cloud #optional
+      - SIDEKIQ_ONLY=false #optional
+      - SIDEKIQ_QUEUE= #optional
+      - SIDEKIQ_DEFAULT=false #optional
+      - SIDEKIQ_THREADS=5 #optional
+      - DB_POOL=5 #optional
+      - LOCAL_HTTPS=false
     ports:
       - 8021:4000
     networks:
@@ -71,6 +90,33 @@ services:
     restart: unless-stopped
     container_name: mastodon-sidekiq
     command: bundle exec sidekiq
+    environment:
+      - LOCAL_DOMAIN=mamoswine.pkmn.cloud
+      - REDIS_HOST=mast-redis
+      - REDIS_PORT=6379
+      - DB_HOST=mast-db
+      - DB_USER=mastodon
+      - DB_NAME=mastodon
+      - DB_PASS=m4rvD6HTAF675sgWpi
+      - DB_PORT=5432
+      - ES_ENABLED=false
+      - SECRET_KEY_BASE=5b1c80a0ec298ae5a19e3575a45b37274aee770c4cf02c8fa0f3e0d16b90f9cc4004f960ee078a789cd7efa402721cc3506bd90a68ea477529db5a85fec019cb
+      - OTP_SECRET=4ee6a93162f02f2750ed2abc5c4358b83c3f6a2245f0844f25c8b8326e487d6f5fc70ee6566f0637b1feb02148e17fb16e30c6d715a14cfe345c45f2e23a9c46
+      - VAPID_PRIVATE_KEY=v3F194PD0YSHZ1yOugOLUQ3cI54ovrCnM8iDhyi3Vao=
+      - VAPID_PUBLIC_KEY=BLPZxpl5vx5mbq6qUKgZ2j1ow6uisQfBQBVuQoHBbcrdGuvjcu2VUjPvlVDZFpA3R85PTdJAMyoJpVxvCbxl3Bw=
+      - SMTP_SERVER=smtp.mailersend.net
+      - SMTP_PORT=587
+      - SMTP_LOGIN=MS_LjOIWC@delibird.pkmn.cloud
+      - SMTP_PASSWORD=uadhFiKPbW39Hg5R
+      - SMTP_FROM_ADDRESS=notifications@delibird.pkmn.cloud
+      - S3_ENABLED=false
+      - WEB_DOMAIN=mamoswine.pkmn.cloud #optional
+      - SIDEKIQ_ONLY=false #optional
+      - SIDEKIQ_QUEUE= #optional
+      - SIDEKIQ_DEFAULT=false #optional
+      - SIDEKIQ_THREADS=5 #optional
+      - DB_POOL=5 #optional
+      - LOCAL_HTTPS=false
     depends_on:
       - mast-db
       - mast-redis