diff --git a/btcpay-setup.sh b/btcpay-setup.sh
index 7af3133..859cff6 100755
--- a/btcpay-setup.sh
+++ b/btcpay-setup.sh
@@ -295,6 +295,15 @@ ExecReload=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTC
 [Install]
 WantedBy=multi-user.target" > /etc/systemd/system/btcpayserver.service
 
+if ! [ -f "/etc/docker/daemon.json" ]; then
+echo "{
+\"log-driver\": \"json-file\",
+\"log-opts\": {\"max-size\": \"5m\", \"max-file\": \"3\"}
+}" > /etc/docker/daemon.json
+echo "Setting limited log files in /etc/docker/daemon.json"
+systemctl restart docker
+fi
+
 echo -e "BTCPay Server systemd configured in /etc/systemd/system/btcpayserver.service\n"
 echo "BTCPay Server starting... this can take 5 to 10 minutes..."
 systemctl daemon-reload
diff --git a/btcpay-update.sh b/btcpay-update.sh
index 9aeb146..56db6be 100755
--- a/btcpay-update.sh
+++ b/btcpay-update.sh
@@ -17,6 +17,14 @@ fi
 cd "$BTCPAY_BASE_DIRECTORY/btcpayserver-docker"  
 git pull --force
 
+if ! [ -f "/etc/docker/daemon.json" ]; then
+echo "{
+\"log-driver\": \"json-file\",
+\"log-opts\": {\"max-size\": \"5m\", \"max-file\": \"3\"}
+}" > /etc/docker/daemon.json
+echo "Setting limited log files in /etc/docker/daemon.json"
+fi
+
 . ./build.sh
 if [ "$BTCPAYGEN_OLD_PREGEN" == "true" ]; then
     cp Generated/docker-compose.generated.yml $BTCPAY_DOCKER_COMPOSE
diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
index 432eeb9..529e788 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   lnd_bitcoin:
-    image: btcpayserver/lnd:v0.5-beta-3
+    image: btcpayserver/lnd:v0.5.1-beta
     container_name: btcpayserver_lnd_bitcoin
     restart: unless-stopped
     environment:
diff --git a/docker-compose-generator/docker-fragments/litecoin-lnd.yml b/docker-compose-generator/docker-fragments/litecoin-lnd.yml
index 8f88c5a..621138a 100644
--- a/docker-compose-generator/docker-fragments/litecoin-lnd.yml
+++ b/docker-compose-generator/docker-fragments/litecoin-lnd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   lnd_litecoin:
-    image: btcpayserver/lnd:v0.5-beta-3
+    image: btcpayserver/lnd:v0.5.1-beta
     container_name: btcpayserver_lnd_litecoin
     restart: unless-stopped
     environment:
diff --git a/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml b/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
index a862a79..7c00ec4 100644
--- a/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
+++ b/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   btcqbo:
-    image: jvandrew/btcqbo:0.1.1
+    image: jvandrew/btcqbo:0.1.8
     environment:
       REDIS_URL: "redis://redis:6379/0"
       BTCPAY_HOST: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}
@@ -12,7 +12,7 @@ services:
     links: 
       - redis
   rq-worker:
-    image: jvandrew/btcqbo:0.1.1
+    image: jvandrew/btcqbo:0.1.8
     entrypoint: /usr/local/bin/rq
     command: worker -u redis://redis:6379/0 btcqbo
     environment: