diff --git a/docker-compose.dem.yml b/docker-compose.dem.yml
index a6f20ad139159f9913c57356295ddce9120cd5dc..e395d45b494e67196bcce30a1f47d17e537dbb2b 100644
--- a/docker-compose.dem.yml
+++ b/docker-compose.dem.yml
@@ -186,5 +186,7 @@ volumes:
   redis-data:
   cache-db:
   instance-data:
+  to-panda:
+  from-fepd:
 networks:
   intnet:
diff --git a/docker-compose.emg.dev.yml b/docker-compose.emg.dev.yml
index ea6862a7dfdb7a3e568b5b52cbab2c2f6fe4fce4..8e8c7d65bfbddd9875a8e4e9441ab53510c040d9 100644
--- a/docker-compose.emg.dev.yml
+++ b/docker-compose.emg.dev.yml
@@ -9,7 +9,8 @@ services:
       - type: bind
         source: ./data/
         target: /data/
-
+    logging:
+      driver: "fluentd"
   client:
     ports:
       - "80:80"
@@ -20,7 +21,9 @@ services:
       - type: bind
         source: ./data/
         target: /data/
-
+    logging:
+      driver: "fluentd"
+  renderer:
     ports:
       - "81:80"
       - "82:8080"
@@ -28,7 +31,8 @@ services:
       - type: bind
         source: ./data/
         target: /data/
-
+    logging:
+      driver: "fluentd"
   registrar:
     volumes:
       - type: bind
@@ -37,7 +41,8 @@ services:
       - type: bind
         source: ./core/
         target: /core/
-
+    logging:
+      driver: "fluentd"
   cache:
     ports:
       - "83:80"
@@ -48,7 +53,8 @@ services:
     configs:
       - source: mapcache-dev
         target: /mapcache-template.xml
-
+    logging:
+      driver: "fluentd"
   preprocessor:
     volumes:
       - type: tmpfs
@@ -59,6 +65,8 @@ services:
       - type: bind
         source: ./data/
         target: /data/
+    logging:
+      driver: "fluentd"
 networks:
   extnet:
     name: emg-extnet
diff --git a/docker-compose.vhr18.yml b/docker-compose.vhr18.yml
index c01debcfde705ebb694417cc8c6466cd2604ecb3..86ba58b9054f0b060ca2d70c79ce7bd53b14a504 100644
--- a/docker-compose.vhr18.yml
+++ b/docker-compose.vhr18.yml
@@ -189,5 +189,7 @@ volumes:
   redis-data:
   cache-db:
   instance-data:
+  to-panda:
+  from-fepd:
 networks:
   intnet:
diff --git a/gitlab_test.sh b/gitlab_test.sh
index 22a81e1a9bae5ac166813c478970561689188b9c..8b83899d408e28b189eaeb4635314c8d76ad0d16 100644
--- a/gitlab_test.sh
+++ b/gitlab_test.sh
@@ -3,7 +3,7 @@ chmod +x env_setup.sh wait_for_container.sh
 ./env_setup.sh
 docker swarm init
 docker network create -d overlay emg-extnet
-docker stack deploy -c docker-compose.emg.yml -c docker-compose.emg.dev.yml emg-pvs
+docker stack deploy -c docker-compose.emg.yml -c docker-compose.emg.dev.yml -c docker-compose.logging.yml emg-pvs
 apk update && apk add bash postgresql-dev gcc python3-dev musl-dev py-pip gdal
 pip3 install -r requirements.txt
 ./wait_for_container.sh