diff --git a/docker/my-dojo/bitcoin/Dockerfile b/docker/my-dojo/bitcoin/Dockerfile
index 3727e17b..8f72d004 100644
--- a/docker/my-dojo/bitcoin/Dockerfile
+++ b/docker/my-dojo/bitcoin/Dockerfile
@@ -1,4 +1,4 @@
-FROM    debian:stretch
+FROM    debian:buster
 
 
 #################################################################
@@ -14,7 +14,7 @@ ENV     BITCOIN_PGP_KEY     01EA5486DE18A882D4C2684590C8019E36C2E964
 
 RUN     set -ex && \
         apt-get update && \
-        apt-get install -qq --no-install-recommends ca-certificates dirmngr gosu gpg wget && \
+        apt-get install -qq --no-install-recommends ca-certificates dirmngr gosu gpg gpg-agent wget && \
         rm -rf /var/lib/apt/lists/*
 
 # Build and install bitcoin binaries
diff --git a/docker/my-dojo/explorer/Dockerfile b/docker/my-dojo/explorer/Dockerfile
index e0b33b8f..5c7dd545 100644
--- a/docker/my-dojo/explorer/Dockerfile
+++ b/docker/my-dojo/explorer/Dockerfile
@@ -1,4 +1,4 @@
-FROM    node:8.12.0-stretch
+FROM    node:12-buster
 
 ENV     LOGS_DIR             /data/logs
 ENV     APP_DIR              /home/node/app
diff --git a/docker/my-dojo/node/Dockerfile b/docker/my-dojo/node/Dockerfile
index 418d6fad..1a50cb39 100644
--- a/docker/my-dojo/node/Dockerfile
+++ b/docker/my-dojo/node/Dockerfile
@@ -1,4 +1,4 @@
-FROM    node:8.12.0-stretch
+FROM    node:12-buster
 
 ENV     LOGS_DIR    /data/logs
 ENV     APP_DIR     /home/node/app
diff --git a/docker/my-dojo/tor/Dockerfile b/docker/my-dojo/tor/Dockerfile
index 10987850..f0313dda 100644
--- a/docker/my-dojo/tor/Dockerfile
+++ b/docker/my-dojo/tor/Dockerfile
@@ -1,4 +1,4 @@
-FROM    debian:stretch
+FROM    debian:buster
 
 ENV     TOR_HOME            /var/lib/tor
 ENV     TOR_URL             https://archive.torproject.org/tor-package-archive