diff --git a/docker/my-dojo/.env b/docker/my-dojo/.env
index a301808..02530e8 100644
--- a/docker/my-dojo/.env
+++ b/docker/my-dojo/.env
@@ -10,9 +10,9 @@
 
 COMPOSE_CONVERT_WINDOWS_PATHS=1
 
-DOJO_VERSION_TAG=1.4.0
+DOJO_VERSION_TAG=1.5.0
 DOJO_DB_VERSION_TAG=1.1.0
-DOJO_BITCOIND_VERSION_TAG=1.4.0
+DOJO_BITCOIND_VERSION_TAG=1.4.1
 DOJO_NODEJS_VERSION_TAG=1.4.0
 DOJO_NGINX_VERSION_TAG=1.4.0
 DOJO_TOR_VERSION_TAG=1.3.0
diff --git a/docker/my-dojo/bitcoin/restart.sh b/docker/my-dojo/bitcoin/restart.sh
index b01a7ac..be88d8a 100644
--- a/docker/my-dojo/bitcoin/restart.sh
+++ b/docker/my-dojo/bitcoin/restart.sh
@@ -40,13 +40,9 @@ if [ "$COMMON_BTC_NETWORK" == "testnet" ]; then
 fi
 
 bitcoind "${bitcoind_options[@]}"
-exitCode=$?
 
-if [ $exitCode -eq 0 ]; then
-  # Loop keeping the container up
-  # after bitcoind has been stopped
-  while true
-  do
-    tail -f /dev/null > /dev/null
-  done
-fi
+# Keep the container up
+while true
+do
+  sleep 1
+done
diff --git a/docker/my-dojo/dojo.sh b/docker/my-dojo/dojo.sh
index 089cd93..9331981 100755
--- a/docker/my-dojo/dojo.sh
+++ b/docker/my-dojo/dojo.sh
@@ -87,8 +87,9 @@ stop() {
     i="0"
     while [ $i -lt 18 ]
     do
+      echo "Waiting for shutdown of Bitcoin server."
       # Check if bitcoind rpc api is responding
-      timeout 5 docker exec -it bitcoind  bitcoin-cli \
+      timeout -k 12 10 docker exec -it bitcoind  bitcoin-cli \
         -rpcconnect=bitcoind \
         --rpcport=28256 \
         --rpcuser="$BITCOIND_RPC_USER" \
@@ -99,8 +100,6 @@ stop() {
         echo "Bitcoin server stopped."
         break
       fi
-      # Pause before next try
-      sleep 5
       i=$[$i+1]
     done
     # Bitcoin daemon is still up