diff --git a/code/docker/bitcoind-regtest/Dockerfile b/code/docker/bitcoind/Dockerfile
similarity index 100%
rename from code/docker/bitcoind-regtest/Dockerfile
rename to code/docker/bitcoind/Dockerfile
diff --git a/code/docker/bitcoind-regtest/bashrc b/code/docker/bitcoind/bashrc
similarity index 100%
rename from code/docker/bitcoind-regtest/bashrc
rename to code/docker/bitcoind/bashrc
diff --git a/code/docker/bitcoind-regtest/bitcoind-entrypoint.sh b/code/docker/bitcoind/bitcoind-entrypoint.sh
similarity index 100%
rename from code/docker/bitcoind-regtest/bitcoind-entrypoint.sh
rename to code/docker/bitcoind/bitcoind-entrypoint.sh
diff --git a/code/docker/bitcoind-regtest/bitcoind/bitcoin.conf b/code/docker/bitcoind/bitcoind/bitcoin.conf
similarity index 100%
rename from code/docker/bitcoind-regtest/bitcoind/bitcoin.conf
rename to code/docker/bitcoind/bitcoind/bitcoin.conf
diff --git a/code/docker/bitcoind-regtest/bitcoind/keys/demo_address.txt b/code/docker/bitcoind/bitcoind/keys/demo_address.txt
similarity index 100%
rename from code/docker/bitcoind-regtest/bitcoind/keys/demo_address.txt
rename to code/docker/bitcoind/bitcoind/keys/demo_address.txt
diff --git a/code/docker/bitcoind-regtest/bitcoind/keys/demo_mnemonic.txt b/code/docker/bitcoind/bitcoind/keys/demo_mnemonic.txt
similarity index 100%
rename from code/docker/bitcoind-regtest/bitcoind/keys/demo_mnemonic.txt
rename to code/docker/bitcoind/bitcoind/keys/demo_mnemonic.txt
diff --git a/code/docker/bitcoind-regtest/bitcoind/keys/demo_privkey.txt b/code/docker/bitcoind/bitcoind/keys/demo_privkey.txt
similarity index 100%
rename from code/docker/bitcoind-regtest/bitcoind/keys/demo_privkey.txt
rename to code/docker/bitcoind/bitcoind/keys/demo_privkey.txt
diff --git a/code/docker/bitcoind-regtest/mine.sh b/code/docker/bitcoind/mine.sh
similarity index 100%
rename from code/docker/bitcoind-regtest/mine.sh
rename to code/docker/bitcoind/mine.sh
diff --git a/code/docker/c-lightning/Dockerfile b/code/docker/c-lightning/Dockerfile
index 91c6713..757ae41 100644
--- a/code/docker/c-lightning/Dockerfile
+++ b/code/docker/c-lightning/Dockerfile
@@ -9,6 +9,8 @@ RUN add-apt-repository -u ppa:lightningnetwork/ppa
 RUN apt-get install -yqq \
  	lightningd
 
+ADD https://raw.githubusercontent.com/ElementsProject/lightning/master/contrib/lightning-cli.bash-completion /usr/share/bash-completion/completions/lightning-cli
+
 FROM c-lightning-base AS c-lightning-run
 
 ADD lightningd /lightningd
@@ -20,7 +22,8 @@ ADD c-lightning-entrypoint.sh /usr/local/bin
 RUN chmod +x /usr/local/bin/c-lightning-entrypoint.sh
 ADD fund-c-lightning.sh /usr/local/bin
 RUN chmod +x /usr/local/bin/fund-c-lightning.sh
-ADD https://raw.githubusercontent.com/ElementsProject/lightning/master/contrib/lightning-cli.bash-completion /usr/share/bash-completion/completions/lightning-cli
+ADD logtail.sh /usr/local/bin
+RUN chmod +x /usr/local/bin/logtail.sh
 
 EXPOSE 9735 9835
 ENTRYPOINT ["/usr/local/bin/c-lightning-entrypoint.sh"]
diff --git a/code/docker/c-lightning/lightningd/config b/code/docker/c-lightning/lightningd/config
index 70875e8..d80836b 100644
--- a/code/docker/c-lightning/lightningd/config
+++ b/code/docker/c-lightning/lightningd/config
@@ -6,3 +6,4 @@ bitcoin-rpcconnect=bitcoind
 bitcoin-rpcport=18443
 
 log-level=debug
+log-file=/lightningd/lightningd.log
diff --git a/code/docker/c-lightning/logtail.sh b/code/docker/c-lightning/logtail.sh
new file mode 100644
index 0000000..d8eba20
--- /dev/null
+++ b/code/docker/c-lightning/logtail.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -Eeuo pipefail
+
+# Show LND log from beginning and follow
+tail -n +1 -f /lightningd/lightningd.log || true
diff --git a/code/docker/eclair/Dockerfile b/code/docker/eclair/Dockerfile
index 46dc195..50b32ae 100644
--- a/code/docker/eclair/Dockerfile
+++ b/code/docker/eclair/Dockerfile
@@ -23,7 +23,8 @@ RUN ln -s /eclair /root/.eclair
 ADD bashrc /root/.bashrc
 ADD eclair-entrypoint.sh /usr/local/bin
 RUN chmod +x /usr/local/bin/eclair-entrypoint.sh
-
+ADD logtail.sh /usr/local/bin
+RUN chmod +x /usr/local/bin/logtail.sh
 
 EXPOSE 9735
 ENTRYPOINT ["/usr/local/bin/eclair-entrypoint.sh"]
diff --git a/code/docker/eclair/logtail.sh b/code/docker/eclair/logtail.sh
new file mode 100644
index 0000000..228acd5
--- /dev/null
+++ b/code/docker/eclair/logtail.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -Eeuo pipefail
+
+# Show LND log from beginning and follow
+tail -n +1 -f /eclair/eclair.log || true
diff --git a/code/docker/lnbook-app/docker-compose.yml b/code/docker/lnbook-app/docker-compose.yml
index 0a8669c..572ffc6 100644
--- a/code/docker/lnbook-app/docker-compose.yml
+++ b/code/docker/lnbook-app/docker-compose.yml
@@ -1,18 +1,72 @@
 version: "3.3"
+networks:
+  lnnet:
+
 services:
-  bitcoind-regtest:
-      container_name: bitcoind
-      build:
-        context: ../bitcoind-regtest/.
-        dockerfile: ./Dockerfile
-      image: lnbook/bitcoind-regtest:latest
-      ports:
-      - "18443:18443"
-      - "12005:12005"
-      - "12006:12006"
-  lnd-run:
-      container_name: lnd
-      build:
-        context: ../lnd-run
-        dockerfile: ./Dockerfile
-      image: lnbook/lnd-run:latest
+  bitcoind:
+    container_name: bitcoind
+    build:
+        context: ../bitcoind
+    image: lnbook/bitcoind:latest
+    networks:
+      - lnnet
+    expose:
+      - "18443"
+      - "12005"
+      - "12006"
+    healthcheck:
+      test: bitcoin-cli -datadir=/bitcoind getblockchaininfo
+      interval: 2s
+      timeout: 5s
+      retries: 30
+
+  Alice:
+    container_name: Alice
+    build:
+        context: ../lnd
+    image: lnbook/lnd:latest
+    depends_on:
+      - bitcoind
+    networks:
+      - lnnet
+    expose:
+      - "9735"
+
+  Bob:
+    container_name: Bob
+    build:
+      context: ../c-lightning
+    image: lnbook/c-lightning:latest
+    depends_on:
+      - bitcoind
+      - Alice
+    networks:
+      - lnnet
+    expose:
+      - "9735"
+
+  Wei:
+    container_name: Wei
+    build:
+        context: ../eclair
+    image: lnbook/eclair:latest
+    depends_on:
+      - bitcoind
+      - Bob
+    networks:
+      - lnnet
+    expose:
+      - "9735"
+
+  Gloria:
+    container_name: Gloria
+    build:
+        context: ../lnd
+    image: lnbook/lnd:latest
+    depends_on:
+      - bitcoind
+      - Wei
+    networks:
+      - lnnet
+    expose:
+      - "9735"
diff --git a/code/docker/lnd-run/Dockerfile b/code/docker/lnd/Dockerfile
similarity index 100%
rename from code/docker/lnd-run/Dockerfile
rename to code/docker/lnd/Dockerfile
diff --git a/code/docker/lnd-run/bashrc b/code/docker/lnd/bashrc
similarity index 100%
rename from code/docker/lnd-run/bashrc
rename to code/docker/lnd/bashrc
diff --git a/code/docker/lnd-run/fund-lnd.sh b/code/docker/lnd/fund-lnd.sh
similarity index 100%
rename from code/docker/lnd-run/fund-lnd.sh
rename to code/docker/lnd/fund-lnd.sh
diff --git a/code/docker/lnd-run/lnd-entrypoint.sh b/code/docker/lnd/lnd-entrypoint.sh
similarity index 100%
rename from code/docker/lnd-run/lnd-entrypoint.sh
rename to code/docker/lnd/lnd-entrypoint.sh
diff --git a/code/docker/lnd-run/lnd/lnd.conf b/code/docker/lnd/lnd/lnd.conf
similarity index 100%
rename from code/docker/lnd-run/lnd/lnd.conf
rename to code/docker/lnd/lnd/lnd.conf
diff --git a/code/docker/lnd-run/logtail.sh b/code/docker/lnd/logtail.sh
similarity index 100%
rename from code/docker/lnd-run/logtail.sh
rename to code/docker/lnd/logtail.sh