diff --git a/build.sh b/build.sh
index 76d102c..ef27e13 100755
--- a/build.sh
+++ b/build.sh
@@ -2,15 +2,15 @@
 
 TRACING=1
 
-# CYPHERNODE VERSION "v0.8.0-rc.4"
-CONF_VERSION="v0.8.0-rc.4-local"
-GATEKEEPER_VERSION="v0.8.0-rc.4-local"
-TOR_VERSION="v0.8.0-rc.4-local"
-PROXY_VERSION="v0.8.0-rc.4-local"
-NOTIFIER_VERSION="v0.8.0-rc.4-local"
-PROXYCRON_VERSION="v0.8.0-rc.4-local"
-OTSCLIENT_VERSION="v0.8.0-rc.4-local"
-PYCOIN_VERSION="v0.8.0-rc.4-local"
+# CYPHERNODE VERSION "v0.8.0"
+CONF_VERSION="v0.8.0-local"
+GATEKEEPER_VERSION="v0.8.0-local"
+TOR_VERSION="v0.8.0-local"
+PROXY_VERSION="v0.8.0-local"
+NOTIFIER_VERSION="v0.8.0-local"
+PROXYCRON_VERSION="v0.8.0-local"
+OTSCLIENT_VERSION="v0.8.0-local"
+PYCOIN_VERSION="v0.8.0-local"
 
 trace()
 {
diff --git a/dist/setup.sh b/dist/setup.sh
index 06646ed..91e2043 100755
--- a/dist/setup.sh
+++ b/dist/setup.sh
@@ -859,17 +859,17 @@ ALWAYSYES=0
 SUDO_REQUIRED=0
 AUTOSTART=0
 
-# CYPHERNODE VERSION "v0.8.0-rc.4"
-SETUP_VERSION="v0.8.0-rc.4"
-CONF_VERSION="v0.8.0-rc.4"
-GATEKEEPER_VERSION="v0.8.0-rc.4"
-TOR_VERSION="v0.8.0-rc.4"
-PROXY_VERSION="v0.8.0-rc.4"
-NOTIFIER_VERSION="v0.8.0-rc.4"
-PROXYCRON_VERSION="v0.8.0-rc.4"
-OTSCLIENT_VERSION="v0.8.0-rc.4"
-PYCOIN_VERSION="v0.8.0-rc.4"
-CYPHERAPPS_VERSION="releases/v0.8.0"
+# CYPHERNODE VERSION "v0.8.0"
+SETUP_VERSION="v0.8.0"
+CONF_VERSION="v0.8.0"
+GATEKEEPER_VERSION="v0.8.0"
+TOR_VERSION="v0.8.0"
+PROXY_VERSION="v0.8.0"
+NOTIFIER_VERSION="v0.8.0"
+PROXYCRON_VERSION="v0.8.0"
+OTSCLIENT_VERSION="v0.8.0"
+PYCOIN_VERSION="v0.8.0"
+CYPHERAPPS_VERSION="v0.8.0"
 BITCOIN_VERSION="v22.0"
 LIGHTNING_VERSION="v0.10.2"
 TRAEFIK_VERSION="v1.7.9-alpine"
diff --git a/doc/release-notes-v0.8.0.md b/doc/release-notes/release-notes-v0.8.0.md
similarity index 100%
rename from doc/release-notes-v0.8.0.md
rename to doc/release-notes/release-notes-v0.8.0.md
diff --git a/docker-build.sh b/docker-build.sh
index 1b29160..4431aeb 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -59,9 +59,9 @@ x86_docker="amd64"
 arm_docker="arm"
 aarch64_docker="arm64"
 
-v1="v0-rc.4"
-v2="v0.8-rc.4"
-v3="v0.8.0-rc.4"
+v1="v0"
+v2="v0.8"
+v3="v0.8.0"
 
 # Build amd64 and arm64 first, building for arm will trigger the manifest creation and push on hub