diff --git a/basicswap/__init__.py b/basicswap/__init__.py
index bea1cf8..c0779bd 100644
--- a/basicswap/__init__.py
+++ b/basicswap/__init__.py
@@ -1,3 +1,3 @@
 name = "basicswap"
 
-__version__ = "0.0.16"
+__version__ = "0.0.17"
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 2a84e16..a755d53 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -12,6 +12,11 @@ services:
             - "${HTML_PORT}"  # Expose only to localhost, see .env
         environment:
             - TZ
+        logging:
+            driver: "local"
+            options:
+                max-size: "10m"
+                max-file: "5"
 
 volumes:
   coindata:
diff --git a/docker/production/docker-compose.yml b/docker/production/docker-compose.yml
index 655e366..320cc03 100644
--- a/docker/production/docker-compose.yml
+++ b/docker/production/docker-compose.yml
@@ -13,6 +13,11 @@ services:
             - "51738:51738"
         expose:
             - 51735
+        logging:
+            driver: "local"
+            options:
+                max-size: "10m"
+                max-file: "3"
         restart: unless-stopped
     bitcoin_core:
         image: i_bitcoin
@@ -26,6 +31,11 @@ services:
             - "8333:8333"
         expose:
             - 8332
+        logging:
+            driver: "local"
+            options:
+                max-size: "10m"
+                max-file: "3"
         restart: unless-stopped
     #monero_daemon:
         #image: i_monero_daemon
@@ -39,6 +49,11 @@ services:
             #- "18080:18080"
         #expose:
             #- 8332
+        #logging:
+            #driver: "local"
+            #options:
+                #max-size: "10m"
+                #max-file: "3"
         #restart: unless-stopped
     monero_wallet:
         image: i_monero_wallet
@@ -50,6 +65,11 @@ services:
             - /var/swapdata/monero_wallet:/data
         expose:
             - 8332
+        logging:
+            driver: "local"
+            options:
+                max-size: "10m"
+                max-file: "3"
         restart: unless-stopped
     swapclient:
         image: i_swapclient
@@ -63,6 +83,11 @@ services:
             - "${HTML_PORT}"  # Expose only to localhost, see .env
         environment:
             - TZ
+        logging:
+            driver: "local"
+            options:
+                max-size: "10m"
+                max-file: "5"
         depends_on:
             - particl_core
         restart: unless-stopped