diff --git a/build.gradle b/build.gradle
index f6a3ce5d6b..85930680d7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -386,7 +386,7 @@ configure(project(':desktop')) {
     apply plugin: 'witness'
     apply from: '../gradle/witness/gradle-witness.gradle'
 
-    version = '1.5.8'
+    version = '1.5.8-SNAPSHOT'
 
     mainClassName = 'bisq.desktop.app.BisqAppMain'
 
diff --git a/desktop/package/linux/Dockerfile b/desktop/package/linux/Dockerfile
index 2619ed911d..eca8f31ab3 100644
--- a/desktop/package/linux/Dockerfile
+++ b/desktop/package/linux/Dockerfile
@@ -8,7 +8,7 @@
 
 # pull base image
 FROM openjdk:8-jdk
-ENV version 1.5.8
+ENV version 1.5.8-SNAPSHOT
 
 RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* &&
 apt-get install -y vim fakeroot
diff --git a/desktop/package/linux/package.sh b/desktop/package/linux/package.sh
index 1939e60cda..6e14e7a009 100755
--- a/desktop/package/linux/package.sh
+++ b/desktop/package/linux/package.sh
@@ -6,7 +6,7 @@
 #   - Update version below
 #   - Ensure JAVA_HOME below is pointing to OracleJDK 10 directory
 
-version=1.5.8
+version=1.5.8-SNAPSHOT
 version_base=$(echo $version | awk -F'[_-]' '{print $1}')
 if [ ! -f "$JAVA_HOME/bin/javapackager" ]; then
 	if [ -d "/usr/lib/jvm/jdk-10.0.2" ]; then
diff --git a/desktop/package/linux/release.sh b/desktop/package/linux/release.sh
index 9f89f2df64..b6c901eb30 100755
--- a/desktop/package/linux/release.sh
+++ b/desktop/package/linux/release.sh
@@ -4,7 +4,7 @@
 # Prior to running this script:
 #   - Update version below
 
-version=1.5.8
+version=1.5.8-SNAPSHOT
 base_dir=$( cd "$(dirname "$0")" ; pwd -P )/../../..
 package_dir=$base_dir/desktop/package
 release_dir=$base_dir/desktop/release/$version
diff --git a/desktop/package/macosx/create_app.sh b/desktop/package/macosx/create_app.sh
index 3f200803bb..6f41e7f7ab 100755
--- a/desktop/package/macosx/create_app.sh
+++ b/desktop/package/macosx/create_app.sh
@@ -6,7 +6,7 @@ mkdir -p deploy
 
 set -e
 
-version="1.5.8"
+version="1.5.8-SNAPSHOT"
 
 cd ..
 ./gradlew :desktop:build -x test shadowJar
diff --git a/desktop/package/macosx/finalize.sh b/desktop/package/macosx/finalize.sh
index cc3f345212..a9f4df6cc6 100755
--- a/desktop/package/macosx/finalize.sh
+++ b/desktop/package/macosx/finalize.sh
@@ -2,7 +2,7 @@
 
 cd ../../
 
-version="1.5.8"
+version="1.5.8-SNAPSHOT"
 
 target_dir="releases/$version"
 
diff --git a/desktop/package/macosx/insert_snapshot_version.sh b/desktop/package/macosx/insert_snapshot_version.sh
index d1cd983809..033053cd6b 100755
--- a/desktop/package/macosx/insert_snapshot_version.sh
+++ b/desktop/package/macosx/insert_snapshot_version.sh
@@ -2,7 +2,7 @@
 
 cd $(dirname $0)/../../../
 
-version=1.5.7
+version=1.5.8
 
 find . -type f \( -name "finalize.sh" \
 -o -name "create_app.sh" \
diff --git a/desktop/package/windows/package.bat b/desktop/package/windows/package.bat
index 537b7c0dde..5161af8043 100644
--- a/desktop/package/windows/package.bat
+++ b/desktop/package/windows/package.bat
@@ -11,7 +11,7 @@
 
 @echo off
 
-set version=1.5.8
+set version=1.5.8-SNAPSHOT
 if not exist "%JAVA_HOME%\bin\javapackager.exe" (
     if not exist "%ProgramFiles%\Java\jdk-10.0.2" (
         echo Javapackager not found. Update JAVA_HOME variable to point to OracleJDK.
diff --git a/desktop/package/windows/release.bat b/desktop/package/windows/release.bat
index ea12bf2f7e..e9f0f5e65f 100644
--- a/desktop/package/windows/release.bat
+++ b/desktop/package/windows/release.bat
@@ -6,7 +6,7 @@
 
 @echo off
 
-set version=1.5.8
+set version=1.5.8-SNAPSHOT
 set release_dir=%~dp0..\..\..\releases\%version%
 set package_dir=%~dp0..
 
diff --git a/relay/src/main/resources/version.txt b/relay/src/main/resources/version.txt
index 1cc9c180e2..26a69f98ba 100644
--- a/relay/src/main/resources/version.txt
+++ b/relay/src/main/resources/version.txt
@@ -1 +1 @@
-1.5.8
+1.5.8-SNAPSHOT