diff --git a/docker-compose.yml b/docker-compose.yml
index 8b4f07e..ddff2b6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,8 +13,9 @@ x-node-defaults: &node
     - yarn-cache:/.yarn-cache
 
 x-newsletter-command: &newsletter-cmd
-  entrypoint: ["node_modules/.bin/basecms-newsletters"]
-  command: ["dev", "index.js"]
+  <<: *node
+  entrypoint: ["yarn"]
+  command: ["dev"]
 
 x-env-defaults: &env
   YARN_CACHE_FOLDER: /.yarn-cache
@@ -24,6 +25,7 @@ x-env-defaults: &env
   EMAILX_SERVE_URI: ${EMAILX_SERVE_URI-https://bizbash.serve.email-x.parameter1.com}
 
 x-env-tauron: &env-tauron
+  <<: *env
   GRAPHQL_URI: ${GRAPHQL_URI-https://tauron.graphql.base.parameter1.com}
 
 services:
@@ -42,11 +44,9 @@ services:
       <<: *env
 
   all:
-    <<: *node
     <<: *newsletter-cmd
     working_dir: /root/tenants/all
     environment:
-      <<: *env
       <<: *env-tauron
       PORT: 80
       EXPOSED_PORT: 22290