diff --git a/build.sh b/build.sh
index ad9fb0531..239f6c6ca 100755
--- a/build.sh
+++ b/build.sh
@@ -2,15 +2,15 @@
 
 TRACING=1
 
-# CYPHERNODE VERSION "v0.3.2"
-CONF_VERSION="v0.3.2-local"
-GATEKEEPER_VERSION="v0.3.2-local"
-TOR_VERSION="v0.3.2-local"
-PROXY_VERSION="v0.3.2-local"
-NOTIFIER_VERSION="v0.3.2-local"
-PROXYCRON_VERSION="v0.3.2-local"
-OTSCLIENT_VERSION="v0.3.2-local"
-PYCOIN_VERSION="v0.3.2-local"
+# CYPHERNODE VERSION "v0.4.0"
+CONF_VERSION="v0.4.0-local"
+GATEKEEPER_VERSION="v0.4.0-local"
+TOR_VERSION="v0.4.0-local"
+PROXY_VERSION="v0.4.0-local"
+NOTIFIER_VERSION="v0.4.0-local"
+PROXYCRON_VERSION="v0.4.0-local"
+OTSCLIENT_VERSION="v0.4.0-local"
+PYCOIN_VERSION="v0.4.0-local"
 BITCOIN_VERSION="v0.19.1"
 LIGHTNING_VERSION="v0.8.2"
 
diff --git a/cyphernodeconf_docker/build.sh b/cyphernodeconf_docker/build.sh
index d4826b1e2..0087afdcc 100755
--- a/cyphernodeconf_docker/build.sh
+++ b/cyphernodeconf_docker/build.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-VERSION=v0.3.2
+VERSION=v0.4.0
 
 docker build . -t cyphernode/cyphernodeconf:${VERSION}
diff --git a/cyphernodeconf_docker/run.sh b/cyphernodeconf_docker/run.sh
index 6ced72504..c6666a36e 100755
--- a/cyphernodeconf_docker/run.sh
+++ b/cyphernodeconf_docker/run.sh
@@ -3,17 +3,17 @@
 export SETUP_DIR=$(pwd)/../dist
 export DEFAULT_USER=$USER
 export DEFAULT_CERT_HOSTNAME=disk0book.local
-export PROXYCRON_VERSION=v0.3.2
-export PYCOIN_VERSION=v0.3.2
-export SETUP_VERSION=v0.3.2
+export PROXYCRON_VERSION=v0.4.0
+export PYCOIN_VERSION=v0.4.0
+export SETUP_VERSION=v0.4.0
 export BITCOIN_VERSION=v0.19.1
 export LIGHTNING_VERSION=v0.8.2
 export DEFAULT_DATADIR_BASE=$HOME
-export GATEKEEPER_VERSION=v0.3.2
-export TOR_VERSION=v0.3.2
-export PROXY_VERSION=v0.3.2
-export OTSCLIENT_VERSION=v0.3.2
-export NOTIFIER_VERSION=v0.3.2
+export GATEKEEPER_VERSION=v0.4.0
+export TOR_VERSION=v0.4.0
+export PROXY_VERSION=v0.4.0
+export OTSCLIENT_VERSION=v0.4.0
+export NOTIFIER_VERSION=v0.4.0
 export EDITOR=/usr/bin/nano
 export TRAEFIK_VERSION="v1.7.9-alpine"
 export MOSQUITTO_VERSION="1.6"
diff --git a/dist/setup.sh b/dist/setup.sh
index d59775f63..43965c8f8 100755
--- a/dist/setup.sh
+++ b/dist/setup.sh
@@ -777,16 +777,16 @@ ALWAYSYES=0
 SUDO_REQUIRED=0
 AUTOSTART=0
 
-# CYPHERNODE VERSION "v0.3.2"
-SETUP_VERSION="v0.3.2"
-CONF_VERSION="v0.3.2"
-GATEKEEPER_VERSION="v0.3.2"
-TOR_VERSION="v0.3.2"
-PROXY_VERSION="v0.3.2"
-NOTIFIER_VERSION="v0.3.2"
-PROXYCRON_VERSION="v0.3.2"
-OTSCLIENT_VERSION="v0.3.2"
-PYCOIN_VERSION="v0.3.2"
+# CYPHERNODE VERSION "v0.4.0"
+SETUP_VERSION="v0.4.0"
+CONF_VERSION="v0.4.0"
+GATEKEEPER_VERSION="v0.4.0"
+TOR_VERSION="v0.4.0"
+PROXY_VERSION="v0.4.0"
+NOTIFIER_VERSION="v0.4.0"
+PROXYCRON_VERSION="v0.4.0"
+OTSCLIENT_VERSION="v0.4.0"
+PYCOIN_VERSION="v0.4.0"
 CYPHERAPPS_VERSION="v0.3.0"
 BITCOIN_VERSION="v0.19.1"
 LIGHTNING_VERSION="v0.8.2"
diff --git a/docker-build.sh b/docker-build.sh
index 138ff77b7..9d54f89c6 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -66,8 +66,8 @@ aarch64_docker="arm64"
 arch_docker=${x86_docker}
 
 v1="v0"
-v2="v0.3"
-v3="v0.3.2"
+v2="v0.4"
+v3="v0.4.0"
 
 echo "\nBuilding Cyphernode Core containers\n"
 echo "arch_docker=$arch_docker\n"
diff --git a/docker-compose-sample.yml b/docker-compose-sample.yml
index de80c8338..5bbcfc6d8 100644
--- a/docker-compose-sample.yml
+++ b/docker-compose-sample.yml
@@ -32,7 +32,7 @@ services:
   ##########################
 
   proxy:
-    image: cyphernode/proxy:v0.3.2-local
+    image: cyphernode/proxy:v0.4.0-local
     command: $USER ./startproxy.sh
     environment:
       - "TRACING=1"
@@ -75,7 +75,7 @@ services:
   ##########################
 
   proxycron:
-    image: cyphernode/proxycron:v0.3.2-local
+    image: cyphernode/proxycron:v0.4.0-local
     environment:
       - "TX_CONF_URL=proxy:8888/executecallbacks"
       - "OTS_URL=proxy:8888/ots_backoffice"
@@ -106,7 +106,7 @@ services:
   ##########################
 
   notifier:
-    image: cyphernode/notifier:v0.3.2-local
+    image: cyphernode/notifier:v0.4.0-local
     command: $USER ./startnotifier.sh
     networks:
       - cyphernodenet
@@ -123,7 +123,7 @@ services:
   ##########################
 
   pycoin:
-    image: cyphernode/pycoin:v0.3.2-local
+    image: cyphernode/pycoin:v0.4.0-local
     command: $USER ./startpycoin.sh
     environment:
       - "TRACING=1"
@@ -142,7 +142,7 @@ services:
   ##########################
 
   otsclient:
-    image: cyphernode/otsclient:v0.3.2-local
+    image: cyphernode/otsclient:v0.4.0-local
     command: $USER /script/startotsclient.sh
     environment:
       - "TRACING=1"
@@ -168,7 +168,7 @@ services:
 
   gatekeeper:
     # HTTP authentication API gate
-    image: cyphernode/gatekeeper:v0.3.2-local
+    image: cyphernode/gatekeeper:v0.4.0-local
     command: $USER
     environment:
       - "TRACING=1"
diff --git a/tor_docker/Dockerfile b/tor_docker/Dockerfile
index 4a645c796..94e874cf4 100644
--- a/tor_docker/Dockerfile
+++ b/tor_docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.10.2
 
-ARG TOR_VER=0.4.1.6
+ARG TOR_VER=0.4.3.5
 ARG TORGZ=https://dist.torproject.org/tor-$TOR_VER.tar.gz
 
 RUN apk --no-cache add --update \