diff --git a/build.sh b/build.sh
index df5c74e..3557eb1 100755
--- a/build.sh
+++ b/build.sh
@@ -3,15 +3,15 @@
 TRACING=1
 
 # CYPHERNODE VERSION "v0.1.1"
-CONF_VERSION="v0.2.0-rc.5-local"
-GATEKEEPER_VERSION="v0.2.0-rc.5-local"
-PROXY_VERSION="v0.2.0-rc.5-local"
-PROXYCRON_VERSION="v0.2.0-rc.5-local"
-OTSCLIENT_VERSION="v0.2.0-rc.5-local"
-PYCOIN_VERSION="v0.2.0-rc.5-local"
+CONF_VERSION="v0.2.0-rc.6-local"
+GATEKEEPER_VERSION="v0.2.0-rc.6-local"
+PROXY_VERSION="v0.2.0-rc.6-local"
+PROXYCRON_VERSION="v0.2.0-rc.6-local"
+OTSCLIENT_VERSION="v0.2.0-rc.6-local"
+PYCOIN_VERSION="v0.2.0-rc.6-local"
 BITCOIN_VERSION="v0.17.1"
 LIGHTNING_VERSION="v0.7.0"
-GRAFANA_VERSION="v0.2.0-rc.5-local"
+GRAFANA_VERSION="v0.2.0-rc.6-local"
 
 trace()
 {
diff --git a/dist/setup.sh b/dist/setup.sh
index 782682e..6ecafa3 100755
--- a/dist/setup.sh
+++ b/dist/setup.sh
@@ -711,12 +711,12 @@ AUTOSTART=0
 
 # CYPHERNODE VERSION "v0.1.1"
 VERSION_OVERRIDE="true"
-CONF_VERSION="v0.2.0-rc.5"
-GATEKEEPER_VERSION="v0.2.0-rc.5"
-PROXY_VERSION="v0.2.0-rc.5"
-PROXYCRON_VERSION="v0.2.0-rc.5"
-OTSCLIENT_VERSION="v0.2.0-rc.5"
-PYCOIN_VERSION="v0.2.0-rc.5"
+CONF_VERSION="v0.2.0-rc.6"
+GATEKEEPER_VERSION="v0.2.0-rc.6"
+PROXY_VERSION="v0.2.0-rc.6"
+PROXYCRON_VERSION="v0.2.0-rc.6"
+OTSCLIENT_VERSION="v0.2.0-rc.6"
+PYCOIN_VERSION="v0.2.0-rc.6"
 BITCOIN_VERSION="v0.17.1"
 LIGHTNING_VERSION="v0.7.0"
 
diff --git a/doc/CYPHERAPPS.md b/doc/CYPHERAPPS.md
index 44263ee..e60a62f 100644
--- a/doc/CYPHERAPPS.md
+++ b/doc/CYPHERAPPS.md
@@ -8,7 +8,7 @@ We are also providing Spark Wallet as a Cyphernode application.  It is a hybrid
 
 As you already know it, we want Cyphernode to be modular and decoupled.  That's why we created a completely separated repository for the Cyphernode Apps: https://github.com/SatoshiPortal/cypherapps
 
-Cypherapps acts as an indirection layer between Cyphernode and the actual applications.  The repo is cloned into the Cyphernode directory during setup, depending on the selected optional features.  The corresponding docker images are taken from our Docker hub.
+Cypherapps acts as an indirection layer between Cyphernode and the actual applications.  The repo is cloned into the Cyphernode directory during setup, depending on the selected optional features.  The corresponding docker images are taken from the Docker hub repositories.
 
 Separating Cypherapps from Cyphernode allows us to add applications without changing Cyphernode.
 
diff --git a/doc/INSTALL.md b/doc/INSTALL.md
index cbce0cc..0b4839c 100644
--- a/doc/INSTALL.md
+++ b/doc/INSTALL.md
@@ -34,6 +34,8 @@ cd dist
 
 ## Upgrading
 
+To upgrade to the most recent version, just get and run the most recent version of the setup.sh file as described in the previous section.  Migration should be taken care by the script.
+
 Your proxy's database won't be lost.  Migration scripts are taking care of automatically migrating the database when starting the proxy.
 
 ```
diff --git a/doc/UPGRADE.md b/doc/UPGRADE.md
index be7961e..8e2f3ae 100644
--- a/doc/UPGRADE.md
+++ b/doc/UPGRADE.md
@@ -1,4 +1,6 @@
-# Upgrade notes from 0.1 to 0.2
+# Upgrade notes from 0.1 to 0.2, to upgrade manually
+
+Usually no need to do this since it will be done during setup.sh v0.2.
 
 1. cd currentInstallation, where setup.sh is located
 2. ./stop.sh current running cyphernode
@@ -14,7 +16,7 @@ cd conf
 <enter your password>
 
 ```
-k=$(dd if=/dev/urandom bs=32 count=1 2> /dev/null | xxd -pc 32) && l="kapi_id=\\\"000\\\";kapi_key=\\\"$k\\\";kapi_groups=\\\"stats\\\";eval ugroups_\${kapi_id}=\${kapi_groups};eval ukey_\${kapi_id}=\${kapi_key}" && cat config.json | sed 's/kapi_groups=\\"/kapi_groups=\\"stats,/g' | jq ".gatekeeper_keys.configEntries = [\"$l\"] + .gatekeeper_keys.configEntries" | jq ".gatekeeper_keys.clientInformation = [\"000=$k\"] + .gatekeeper_keys.clientInformation" | jq ".gatekeeper_apiproperties = \"$(curl -fsSL https://raw.githubusercontent.com/SatoshiPortal/cyphernode/v0.2.0-rc.5/api_auth_docker/api-sample.properties | paste -s -d '\n')\"" > config.json
+k=$(dd if=/dev/urandom bs=32 count=1 2> /dev/null | xxd -pc 32) && l="kapi_id=\\\"000\\\";kapi_key=\\\"$k\\\";kapi_groups=\\\"stats\\\";eval ugroups_\${kapi_id}=\${kapi_groups};eval ukey_\${kapi_id}=\${kapi_key}" && cat config.json | sed 's/kapi_groups=\\"/kapi_groups=\\"stats,/g' | jq ".gatekeeper_keys.configEntries = [\"$l\"] + .gatekeeper_keys.configEntries" | jq ".gatekeeper_keys.clientInformation = [\"000=$k\"] + .gatekeeper_keys.clientInformation" | jq ".gatekeeper_apiproperties = \"$(curl -fsSL https://raw.githubusercontent.com/SatoshiPortal/cyphernode/v0.2.0/api_auth_docker/api-sample.properties | paste -s -d '\n')\"" > config.json
 
 7z u config.7z config.json
 ```
@@ -23,5 +25,5 @@ k=$(dd if=/dev/urandom bs=32 count=1 2> /dev/null | xxd -pc 32) && l="kapi_id=\\
 <CTRL-D>
 
 ```
-curl -fsSL https://raw.githubusercontent.com/SatoshiPortal/cyphernode/v0.2.0-rc.5/dist/setup.sh -o setup_cyphernode.sh && chmod +x setup_cyphernode.sh && ./setup_cyphernode.sh
+curl -fsSL https://raw.githubusercontent.com/SatoshiPortal/cyphernode/v0.2.0/dist/setup.sh -o setup_cyphernode.sh && chmod +x setup_cyphernode.sh && ./setup_cyphernode.sh
 ```
diff --git a/docker-build.sh b/docker-build.sh
index 61b6106..e05fca4 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -91,9 +91,9 @@ arm="arm32v6"
 #arch=${arm}
 arch=${x86}
 
-v1="v0-rc.5"
-v2="v0.2-rc.5"
-v3="v0.2.0-rc.5"
+v1="v0-rc.6"
+v2="v0.2-rc.6"
+v3="v0.2.0-rc.6"
 
 echo "arch=$arch"