diff --git a/build.sh b/build.sh
index a03dd62..a5deed5 100755
--- a/build.sh
+++ b/build.sh
@@ -2,6 +2,17 @@
 
 TRACING=1
 
+# CYPHERNODE VERSION "v0.1"
+CONF_VERSION="v0.1"
+GATEKEEPER_VERSION="v0.1"
+PROXY_VERSION="v0.1"
+PROXYCRON_VERSION="v0.1"
+OTSCLIENT_VERSION="v0.1"
+PYCOIN_VERSION="v0.1"
+BITCOIN_VERSION="v0.17.0"
+LIGHTNING_VERSION="v0.6.2"
+GRAFANA_VERSION="v0.1"
+
 trace()
 {
   if [ -n "${TRACING}" ]; then
@@ -38,6 +49,7 @@ build_docker_images() {
   local bitcoin_dockerfile=Dockerfile.amd64
   local clightning_dockerfile=Dockerfile.amd64
   local proxy_dockerfile=Dockerfile.amd64
+  local grafana_dockerfile=Dockerfile.amd64
 
   # compat mode for SatoshiPortal repo
   # TODO: add more mappings?
@@ -45,31 +57,23 @@ build_docker_images() {
     bitcoin_dockerfile="Dockerfile.arm32v6"
     clightning_dockerfile="Dockerfile.arm32v6"
     proxy_dockerfile="Dockerfile.arm32v6"
+    grafana_dockerfile="Dockerfile.arm32v6"
   fi
 
   trace "Creating cyphernodeconf image"
-  build_docker_image install/ cyphernode/cyphernodeconf:$CN_VERSION
+  build_docker_image install/ cyphernode/cyphernodeconf:$CONF_VERSION
 
   trace "Creating SatoshiPortal images"
-  build_docker_image install/SatoshiPortal/dockers/bitcoin-core cyphernode/bitcoin:$BC_VERSION $bitcoin_dockerfile
-  build_docker_image install/SatoshiPortal/dockers/c-lightning cyphernode/clightning:$CL_VERSION $clightning_dockerfile
+  build_docker_image install/SatoshiPortal/dockers/bitcoin-core cyphernode/bitcoin:$BITCOIN_VERSION $bitcoin_dockerfile
+  build_docker_image install/SatoshiPortal/dockers/c-lightning cyphernode/clightning:$LIGHTNING_VERSION $clightning_dockerfile
 
   trace "Creating cyphernode images"
-  build_docker_image api_auth_docker/ cyphernode/gatekeeper:$CN_VERSION
-  build_docker_image proxy_docker/ cyphernode/proxy:$CN_VERSION $proxy_dockerfile
-  build_docker_image cron_docker/ cyphernode/proxycron:$CN_VERSION
-  build_docker_image pycoin_docker/ cyphernode/pycoin:$CN_VERSION
-  build_docker_image otsclient_docker/ cyphernode/otsclient:$CN_VERSION
+  build_docker_image api_auth_docker/ cyphernode/gatekeeper:$GATEKEEPER_VERSION
+  build_docker_image proxy_docker/ cyphernode/proxy:$PROXY_VERSION $proxy_dockerfile
+  build_docker_image cron_docker/ cyphernode/proxycron:$PROXYCRON_VERSION
+  build_docker_image pycoin_docker/ cyphernode/pycoin:$PYCOIN_VERSION
+  build_docker_image otsclient_docker/ cyphernode/otsclient:$OTSCLIENT_VERSION
 
 }
 
-# CYPHERNODE VERSION
-GATEKEEPER_VERSION="latest"
-PROXY_VERSION="latest"
-PROXYCRON_VERSION="latest"
-OTSCLIENT_VERSION="latest"
-PYCOIN_VERSION="latest"
-BITCOIN_VERSION="latest"
-LIGHTNING_VERSION="latest"
-
 build_docker_images
diff --git a/dist/setup.sh b/dist/setup.sh
index 94b25c4..708361a 100755
--- a/dist/setup.sh
+++ b/dist/setup.sh
@@ -183,6 +183,8 @@ configure() {
   # configure features of cyphernode
   docker run -v $current_path:/data \
              -e DEFAULT_USER=$USER \
+             -e DEFAULT_DATADIR_BASE=$HOME \
+             -e SETUP_DIR=$SETUP_DIR \
              -e DEFAULT_CERT_HOSTNAME=$(hostname) \
              -e VERSION_OVERRIDE=$VERSION_OVERRIDE \
              -e GATEKEEPER_VERSION=$GATEKEEPER_VERSION \
@@ -551,6 +553,11 @@ check_bitcoind() {
   echo 0
 }
 
+realpath() {
+  [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"
+}
+
+
 sanity_checks() {
 
   echo "    check requirements."
@@ -649,6 +656,8 @@ PYCOIN_VERSION="v0.1"
 BITCOIN_VERSION="v0.17.0"
 LIGHTNING_VERSION="v0.6.2"
 
+SETUP_DIR=$(dirname $(realpath $0))
+
 # trap ctrl-c and call ctrl_c()
 trap ctrl_c INT
 
diff --git a/install/generator-cyphernode/generators/app/index.js b/install/generator-cyphernode/generators/app/index.js
index 6053f7e..feca97b 100644
--- a/install/generator-cyphernode/generators/app/index.js
+++ b/install/generator-cyphernode/generators/app/index.js
@@ -124,6 +124,8 @@ module.exports = class extends Generator {
   }
 
   async _initConfig() {
+    this.defaultDataDirBase = process.env.DEFAULT_DATADIR_BASE;
+    this.setupDir = process.env.SETUP_DIR;
     const versionOverride = process.env.VERSION_OVERRIDE==='true';
     if( fs.existsSync(this.destinationPath('config.7z')) ) {
       let r = {};
diff --git a/install/generator-cyphernode/generators/app/prompters/999_installer.js b/install/generator-cyphernode/generators/app/prompters/999_installer.js
index a8e5ea7..24e04eb 100644
--- a/install/generator-cyphernode/generators/app/prompters/999_installer.js
+++ b/install/generator-cyphernode/generators/app/prompters/999_installer.js
@@ -37,16 +37,20 @@ module.exports = {
       default: utils._getDefault( 'gatekeeper_datapath' ),
       choices: [
         {
-          name: "/var/run/cyphernode/gatekeeper (needs sudo and "+chalk.red('incompatible with OSX')+")",
-          value: "/var/run/cyphernode/gatekeeper"
+          name: utils.setupDir+"/cyphernode/gatekeeper",
+          value: utils.setupDir+"/cyphernode/gatekeeper"
         },
         {
-          name: "~/.cyphernode/gatekeeper",
-          value: "~/.cyphernode/gatekeeper"
+          name: utils.defaultDataDirBase+"/cyphernode/gatekeeper",
+          value: utils.defaultDataDirBase+"/cyphernode/gatekeeper"
         },
         {
-          name: "~/gatekeeper",
-          value: "~/gatekeeper"
+          name: utils.defaultDataDirBase+"/.cyphernode/gatekeeper",
+          value: utils.defaultDataDirBase+"/.cyphernode/gatekeeper"
+        },
+        {
+          name: utils.defaultDataDirBase+"/gatekeeper",
+          value: utils.defaultDataDirBase+"/gatekeeper"
         },
         {
           name: "Custom path",
@@ -71,16 +75,20 @@ module.exports = {
       default: utils._getDefault( 'proxy_datapath' ),
       choices: [
         {
-          name: "/var/run/cyphernode/proxy (needs sudo and "+chalk.red('incompatible with OSX')+")",
-          value: "/var/run/cyphernode/proxy"
+          name: utils.setupDir+"/cyphernode/proxy",
+          value: utils.setupDir+"/cyphernode/proxy"
         },
         {
-          name: "~/.cyphernode/proxy",
-          value: "~/.cyphernode/proxy"
+          name: utils.defaultDataDirBase+"/cyphernode/proxy",
+          value: utils.defaultDataDirBase+"/cyphernode/proxy"
         },
         {
-          name: "~/proxy",
-          value: "~/proxy"
+          name: utils.defaultDataDirBase+"/.cyphernode/proxy",
+          value: utils.defaultDataDirBase+"/.cyphernode/proxy"
+        },
+        {
+          name: utils.defaultDataDirBase+"/proxy",
+          value: utils.defaultDataDirBase+"/proxy"
         },
         {
           name: "Custom path",
@@ -105,16 +113,20 @@ module.exports = {
       default: utils._getDefault( 'bitcoin_datapath' ),
       choices: [
         {
-          name: "/var/run/cyphernode/bitcoin (needs sudo and "+chalk.red('incompatible with OSX')+")",
-          value: "/var/run/cyphernode/bitcoin"
+          name: utils.setupDir+"/cyphernode/bitcoin",
+          value: utils.setupDir+"/cyphernode/bitcoin"
         },
         {
-          name: "~/.cyphernode/bitcoin",
-          value: "~/.cyphernode/bitcoin"
+          name: utils.defaultDataDirBase+"/cyphernode/bitcoin",
+          value: utils.defaultDataDirBase+"/cyphernode/bitcoin"
         },
         {
-          name: "~/bitcoin",
-          value: "~/bitcoin"
+          name: utils.defaultDataDirBase+"/.cyphernode/bitcoin",
+          value: utils.defaultDataDirBase+"/.cyphernode/bitcoin"
+        },
+        {
+          name: utils.defaultDataDirBase+"/bitcoin",
+          value: utils.defaultDataDirBase+"/bitcoin"
         },
         {
           name: "Custom path",
@@ -139,16 +151,20 @@ module.exports = {
       default: utils._getDefault( 'lightning_datapath' ),
       choices: [
         {
-          name: "/var/run/cyphernode/lightning (needs sudo - "+chalk.red('incompatible with OSX')+")",
-          value: "/var/run/cyphernode/lightning"
+          name: utils.setupDir+"/cyphernode/lightning",
+          value: utils.setupDir+"/cyphernode/lightning"
         },
         {
-          name: "~/.cyphernode/lightning",
-          value: "~/.cyphernode/lightning"
+          name: utils.defaultDataDirBase+"/cyphernode/lightning",
+          value: utils.defaultDataDirBase+"/cyphernode/lightning"
         },
         {
-          name: "~/lightning",
-          value: "~/lightning"
+          name: utils.defaultDataDirBase+"/.cyphernode/lightning",
+          value: utils.defaultDataDirBase+"/.cyphernode/lightning"
+        },
+        {
+          name: utils.defaultDataDirBase+"/lightning",
+          value: utils.defaultDataDirBase+"/lightning"
         },
         {
           name: "Custom path",
@@ -173,16 +189,20 @@ module.exports = {
       default: utils._getDefault( 'otsclient_datapath' ),
       choices: [
         {
-          name: "/var/run/cyphernode/otsclient (needs sudo and "+chalk.red('incompatible with OSX')+")",
-          value: "/var/run/cyphernode/otsclient"
+          name: utils.setupDir+"/cyphernode/otsclient",
+          value: utils.setupDir+"/cyphernode/otsclient"
         },
         {
-          name: "~/.cyphernode/otsclient",
-          value: "~/.cyphernode/otsclient"
+          name: utils.defaultDataDirBase+"/cyphernode/otsclient",
+          value: utils.defaultDataDirBase+"/cyphernode/otsclient"
         },
         {
-          name: "~/otsclient",
-          value: "~/otsclient"
+          name: utils.defaultDataDirBase+"/.cyphernode/otsclient",
+          value: utils.defaultDataDirBase+"/.cyphernode/otsclient"
+        },
+        {
+          name: utils.defaultDataDirBase+"/otsclient",
+          value: utils.defaultDataDirBase+"/otsclient"
         },
         {
           name: "Custom path",