diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 6057412844..3a40d78c95 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bitsquare</groupId>
-        <version>0.2.1</version>
+        <version>0.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/pom.xml b/core/pom.xml
index 26e4703e10..a22a91369a 100755
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bitsquare</groupId>
-        <version>0.2.1</version>
+        <version>0.3.1</version>
     </parent>
 
     <artifactId>core</artifactId>
diff --git a/core/src/main/java/io/bitsquare/app/Version.java b/core/src/main/java/io/bitsquare/app/Version.java
index 3482ee0ae5..ece16c10bb 100644
--- a/core/src/main/java/io/bitsquare/app/Version.java
+++ b/core/src/main/java/io/bitsquare/app/Version.java
@@ -24,7 +24,7 @@ public class Version {
     private static final Logger log = LoggerFactory.getLogger(Version.class);
 
     public static final int MAJOR_VERSION = 0;
-    public static final int MINOR_VERSION = 2;
+    public static final int MINOR_VERSION = 3;
     public static final int PATCH_VERSION = 1;
 
     public static final String VERSION = MAJOR_VERSION + "." + MINOR_VERSION + "." + PATCH_VERSION;
diff --git a/gui/pom.xml b/gui/pom.xml
index 846dcf7de7..a998af13a9 100644
--- a/gui/pom.xml
+++ b/gui/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bitsquare</groupId>
-        <version>0.2.1</version>
+        <version>0.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/gui/src/main/java/io/bitsquare/app/UpdateProcess.java b/gui/src/main/java/io/bitsquare/app/UpdateProcess.java
index 43a5497cd5..42d7c9a7f6 100644
--- a/gui/src/main/java/io/bitsquare/app/UpdateProcess.java
+++ b/gui/src/main/java/io/bitsquare/app/UpdateProcess.java
@@ -21,9 +21,8 @@ import io.bitsquare.util.Utilities;
 
 import com.google.inject.Inject;
 
-import java.io.File;
-
 import java.nio.file.Path;
+import java.nio.file.Paths;
 
 import java.util.List;
 import java.util.Timer;
@@ -91,7 +90,11 @@ public class UpdateProcess {
         timeoutTimer = Utilities.setTimeout(10000, () -> process.onCompleted());
 
         String agent = environment.getProperty(BitsquareEnvironment.APP_NAME_KEY) + Version.VERSION;
-        Path dataDirPath = new File(environment.getProperty(BitsquareEnvironment.APP_DATA_DIR_KEY)).toPath();
+
+        // We use the outer dir not the app data dir including version and btc network
+        Path dataDirPath = Paths.get(environment.getProperty(BitsquareEnvironment.USER_DATA_DIR_KEY),
+                environment.getProperty(BitsquareEnvironment.APP_NAME_KEY));
+        
         Updater updater = new Updater(UPDATES_BASE_URL, agent, Version.PATCH_VERSION, dataDirPath, ROOT_CLASS_PATH,
                 UPDATE_SIGNING_KEYS, UPDATE_SIGNING_THRESHOLD) {
             @Override
diff --git a/package/linux/create_app.sh b/package/linux/create_app.sh
index efaf12805b..1aa45de458 100644
--- a/package/linux/create_app.sh
+++ b/package/linux/create_app.sh
@@ -5,7 +5,7 @@ cd ../../
 set -e
 
 # Edit versions
-fullVersion=0.2.1
+fullVersion=0.3.1
 
 # Copy jar file from mac build (1.jar from processed folder) to linux box 
 # Note: fakeroot needs to be installed on linux
diff --git a/package/mac/update.sh b/package/mac/update.sh
index 43489bd0f4..cee442cf3c 100644
--- a/package/mac/update.sh
+++ b/package/mac/update.sh
@@ -4,12 +4,25 @@ cd ../../
 
 set -e
 
-# Extract the version number. patchVersion is used for ever increasing integer at UpdateFX. fullVersion contains major and minor version + patchVersion 
+# Extract the version numbers. 
+majorVersion=$( sed -n 's/^.*final int MAJOR_VERSION = //p' core/src/main/java/io/bitsquare/app/Version.java )
+minorVersion=$( sed -n 's/^.*final int MINOR_VERSION = //p' core/src/main/java/io/bitsquare/app/Version.java )
+# PatchVersion is used for ever increasing integer at UpdateFX. fullVersion contains major and minor version + patchVersion 
 patchVersion=$( sed -n 's/^.*final int PATCH_VERSION = //p' core/src/main/java/io/bitsquare/app/Version.java )
 
 # remove trailing;
-buildVersion="${buildVersion:0:${#buildVersion}-1}"
+majorVersion="${majorVersion:0:${#majorVersion}-1}"
+minorVersion="${minorVersion:0:${#minorVersion}-1}"
+patchVersion="${patchVersion:0:${#patchVersion}-1}"
+
+fullVersion=$( sed -n 's/^.*final String VERSION = "//p' core/src/main/java/io/bitsquare/app/Version.java )
+# remove trailing ";
+fullVersion=$majorVersion.$minorVersion.$patchVersion
+
+echo majorVersion = $majorVersion
+echo minorVersion = $minorVersion
 echo patchVersion = $patchVersion
+echo fullVersion = $fullVersion
 
 mvn clean package -DskipTests -Dmaven.javadoc.skip=true
 cp gui/target/shaded.jar gui/updatefx/builds/$patchVersion.jar
diff --git a/package/windows/Bitsquare.iss b/package/windows/Bitsquare.iss
index 802d97ba14..fc30a6b58a 100755
--- a/package/windows/Bitsquare.iss
+++ b/package/windows/Bitsquare.iss
@@ -3,7 +3,7 @@
 [Setup]
 AppId={{bitsquare}}
 AppName=Bitsquare
-AppVersion=0.2.1
+AppVersion=0.3.1
 AppVerName=Bitsquare
 AppPublisher=Bitsquare
 AppComments=Bitsquare
diff --git a/package/windows/create_app.bat b/package/windows/create_app.bat
index ec4435b598..49599743ed 100644
--- a/package/windows/create_app.bat
+++ b/package/windows/create_app.bat
@@ -1,16 +1,16 @@
 cd ..\..\
 
-:: edit iss file -> AppVersion=0.2.1
+:: edit iss file -> AppVersion=0.3.1
 
 :: Copy jar file from mac build (1.jar from processed folder) to windows
-:: edit -> -BappVersion=0.2.1 and -srcfiles
+:: edit -> -BappVersion=0.3.1 and -srcfiles
 
 :: 64 bit build
 :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
 :: Build with jdk1.8.0_40 fails but jdk1.8.0_3 works
-call "C:\Program Files\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.2.1 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\updatefx\builds\processed\1.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_31\jre"
+call "C:\Program Files\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.3.1 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\updatefx\builds\processed\1.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_31\jre"
 
 :: 32 bit build
-:: call "C:\Program Files (x86)\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.2.1 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\updatefx\builds\processed\1.jar" -outfile Bitsquare -Bruntime="C:\Program Files (x86)\Java\jdk1.8.0_31\jre"
+:: call "C:\Program Files (x86)\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.3.1 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\updatefx\builds\processed\1.jar" -outfile Bitsquare -Bruntime="C:\Program Files (x86)\Java\jdk1.8.0_31\jre"
 
 cd package\windows
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index cab92e5ce5..ab270302dc 100755
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>io.bitsquare</groupId>
     <artifactId>parent</artifactId>
     <packaging>pom</packaging>
-    <version>0.2.1</version>
+    <version>0.3.1</version>
     <description>The decentralized bitcoin exchange</description>
     <url>https://bitsquare.io</url>