diff --git a/Docker/docker-compose.yml b/Docker/docker-compose.yml
index cdda398..699a7e9 100644
--- a/Docker/docker-compose.yml
+++ b/Docker/docker-compose.yml
@@ -25,7 +25,10 @@ services:
 
   # Graylog: https://hub.docker.com/r/graylog/graylog/
   graylog:
-    build: graylog/.
+    build: 
+      context: ./graylog/.
+      args:
+        - GRAYLOG_PLUGIN_DIR
     volumes:
       - 'graylog_journal:/usr/share/graylog/data/journal'
       - './service-names-port-numbers.csv:/etc/graylog/server/service-names-port-numbers.csv'
@@ -70,6 +73,10 @@ services:
       - elasticsearch
     depends_on:
       - elasticsearch
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100M"
 
   influxdb:
     image: 'influxdb:latest'
@@ -79,6 +86,10 @@ services:
       - '8086:8086'
     volumes:
       - 'influxdb:/var/lib/influxdb'
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100M"
 
   grafana:
     image: 'grafana/grafana:latest'
@@ -95,6 +106,10 @@ services:
     depends_on:
       - elasticsearch
       - influxdb
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100M"
 
 # Volumes for persisting data, see https://docs.docker.com/engine/admin/volumes/volumes/
 volumes:
diff --git a/Docker/graylog/Dockerfile b/Docker/graylog/Dockerfile
index d9a3929..04209f9 100644
--- a/Docker/graylog/Dockerfile
+++ b/Docker/graylog/Dockerfile
@@ -1,6 +1,7 @@
 FROM graylog/graylog:3.1
 # Probably a bad idea, but it works for now
 USER root
+ENV GRAYLOG_PLUGIN_DIR=/etc/graylog/server/
 RUN mkdir -pv /etc/graylog/server/
 COPY ./getGeo.sh /etc/graylog/server/
 RUN chmod +x /etc/graylog/server/getGeo.sh && /etc/graylog/server/getGeo.sh
diff --git a/Docker/graylog/getGeo.sh b/Docker/graylog/getGeo.sh
index fca7617..c0dc234 100644
--- a/Docker/graylog/getGeo.sh
+++ b/Docker/graylog/getGeo.sh
@@ -1,3 +1,2 @@
-GRAYLOG_PLUGIN_DIR=/etc/graylog/server/
 curl --output ${GRAYLOG_PLUGIN_DIR}/mm.tar.gz https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz
 tar zxvf ${GRAYLOG_PLUGIN_DIR}/mm.tar.gz -C ${GRAYLOG_PLUGIN_DIR} --strip-components=1