diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index aec2422..f8e25c0 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -10,16 +10,15 @@ services:
       - HARENA_LOGGER_FLASK_PORT=10030
       - HARENA_LOGGER_FLASK_DEBUG=True
       - FLASK_DEBUG=True
+      - FLASK_ENV=development      
       - HARENA_LOGGER_MONGODB_HOST=mongodb
       - HARENA_LOGGER_MONGODB_PORT=27017
       - HARENA_LOGGER_MONGODB_DB=harena_logger
-      - HARENA_LOGGER_MONGODB_COLLECTION=executions
+      - HARENA_LOGGER_MONGODB_COLLECTION=event_logs
       - HARENA_LOGGER_KAFKA_BROKERS=kafka1:19092
       - PYTHONUNBUFFERED=1
       - PYTHONIOENCODING=UTF-8
-      - FLASK_ENV=development
-      - LOGGING_NAME=harena-logger
-      - LOGGING_LEVEL=DEBUG
+
     ports:
       - 10030:10030
     depends_on:
diff --git a/docker-compose.yml b/docker-compose.yml
index d697dca..1028f32 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,18 +8,23 @@ services:
     environment:
       - HARENA_LOGGER_FLASK_HOST=0.0.0.0
       - HARENA_LOGGER_FLASK_PORT=10030
-      - HARENA_LOGGER_FLASK_DEBUG=False
-      - HARENA_LOGGER_BROKER_HOST=broker
-      - HARENA_LOGGER_BROKER_PORT=1883
+      - HARENA_LOGGER_FLASK_DEBUG=True
+      - FLASK_DEBUG=True
+      - FLASK_ENV=production
       - HARENA_LOGGER_MONGODB_HOST=mongodb
       - HARENA_LOGGER_MONGODB_PORT=27017
       - HARENA_LOGGER_MONGODB_DB=harena_logger
-      - HARENA_LOGGER_MONGODB_COLLECTION=executions
+      - HARENA_LOGGER_MONGODB_COLLECTION=event_logs
+      - HARENA_LOGGER_KAFKA_BROKERS=kafka1:19092
+      - PYTHONUNBUFFERED=1
+      - PYTHONIOENCODING=UTF-8
     ports:
       - 10030:10030
     depends_on:
       - kafka1
       - mongodb
+      - zoo1
+    restart: always
     restart: always
     networks:
       - harena-logger