diff --git a/site-cookbooks/kosmos-bitcoin/attributes/default.rb b/site-cookbooks/kosmos-bitcoin/attributes/default.rb
index a16f9c3..764fff4 100644
--- a/site-cookbooks/kosmos-bitcoin/attributes/default.rb
+++ b/site-cookbooks/kosmos-bitcoin/attributes/default.rb
@@ -5,7 +5,7 @@ node.default['bitcoin']['usergroup'] = 'bitcoin'
 node.default['bitcoin']['network']   = 'mainnet'
 node.default['bitcoin']['conf_path'] = '/home/satoshi/.bitcoin/bitcoin.conf'
 node.default['bitcoin']['walletdir'] = '/home/satoshi/.bitcoin'
-node.default['bitcoin']['datadir']   = '/mnt/data/bitcoin'
+node.default['bitcoin']['datadir']   = '/home/satoshi/.bitcoin'
 node.default['bitcoin']['blocksdir'] = '/mnt/data/blocks'
 node.default['bitcoin']['blocksdir_mount_type'] = 'cifs'
 
diff --git a/site-cookbooks/kosmos-bitcoin/recipes/source.rb b/site-cookbooks/kosmos-bitcoin/recipes/source.rb
index 92671b6..a44cc89 100644
--- a/site-cookbooks/kosmos-bitcoin/recipes/source.rb
+++ b/site-cookbooks/kosmos-bitcoin/recipes/source.rb
@@ -3,27 +3,6 @@
 # Recipe:: source
 #
 
-# TODO move to custom kosmos cookbook before publishing bitcoin cookbook
-systemd_unit "mnt-data-bitcoin.mount" do
-  content({
-    Unit: {
-      Description: 'Bitcoin Core data directory',
-    },
-    Mount: {
-      What: '/var/lib/vmshare-bitcoin',
-      Where: '/mnt/data/bitcoin',
-      Type: '9p',
-      Options: 'trans=virtio,version=9p2000.L'
-    },
-    Install: {
-      WantedBy: 'multi-user.target'
-    }
-  })
-  verify false
-  triggers_reload true
-  action [:create, :enable, :start]
-end
-
 build_essential
 include_recipe 'ark'
 
@@ -126,7 +105,7 @@ systemd_unit 'bitcoind.service' do
     Service: {
       User: bitcoin_user,
       Type: 'simple',
-      ExecStart: "bitcoind -conf=#{bitcoin_conf_path} -datadir=#{bitcoin_datadir} #{bitcoind_blocksdir_argument} -walletdir=#{bitcoin_walletdir} -pid=#{bitcoin_datadir}/bitcoind.pid",
+      ExecStart: "bitcoind -conf=#{bitcoin_conf_path} -datadir=#{bitcoin_datadir} -walletdir=#{bitcoin_walletdir} #{bitcoind_blocksdir_argument} -pid=#{bitcoin_datadir}/bitcoind.pid",
       PIDFile: "#{bitcoin_datadir}/bitcoind.pid",
       Restart: 'always',
       PrivateTmp: true,