diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 9b39180fb6fdc..a6ebc68e2497f 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2019 The Dash developers
+# Copyright (c) 2018-2020 The Ion developers
 name: ioncore
 base: core18
 version: 5.0.99
@@ -135,7 +135,7 @@ parts:
   ion:
     source: https://bitbucket.org/ioncoin/ion
     source-type: git
-    source-tag: develop
+    source-tag: master
     plugin: nil
     override-build: |
       echo "+++++++++++++++++++++++++++++++++++++++++++++++"
@@ -182,11 +182,22 @@ parts:
       fi
       echo "-----------------------------------------------"
       echo "+++++++++++++++++++++++++++++++++++++++++++++++"
+      echo "Set gcc to gcc-8"
+      echo "+++++++++++++++++++++++++++++++++++++++++++++++"
+      echo $HOST
+      update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 100
+      update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 100
+      update-alternatives --install /usr/bin/${HOST}-gcc ${HOST}-gcc /usr/bin/${HOST}-gcc-8 100
+      update-alternatives --install /usr/bin/${HOST}-g++ ${HOST}-g++ /usr/bin/${HOST}-g++-8 100
+      echo "-----------------------------------------------"
+      echo "-----------------------------------------------"
+      echo "+++++++++++++++++++++++++++++++++++++++++++++++"
       echo "APPLY PATCHES ${BINPREF}-${SNAPCRAFT_PROJECT_VERSION}" # patches which have to be applied for compilation, replace splash screen
       echo "+++++++++++++++++++++++++++++++++++++++++++++++"
       cd ${SNAPCRAFT_PART_BUILD}
       echo "apply patches:"
-      git apply $SNAPCRAFT_PART_BUILD/snap/local/patches/X001-default_data_dir.patch
+      sed s/HOME/SNAP_USER_COMMON/g $SNAPCRAFT_PART_BUILD/src/util.cpp
+      #git apply $SNAPCRAFT_PART_BUILD/snap/local/patches/X001-default_data_dir.patch
       git apply $SNAPCRAFT_PART_BUILD/snap/local/patches/X002-fix-bdb-tmp-folder.patch
       git apply $SNAPCRAFT_PART_BUILD/snap/local/patches/X003-fix-use-snap-instead-of-dirty.patch
       sed -i 's/tar --strip-components/tar --no-same-owner --strip-components/' ${SNAPCRAFT_PART_BUILD}/depends/funcs.mk