diff --git a/scripts/pkg-common/baker.initd.in b/scripts/pkg-common/baker.initd.in
index 86b7a85022071c4f9f846d8523ef246422a89766..d6f64f4f3bc8a775560a765cebe4ea8eff85a6f6 100755
--- a/scripts/pkg-common/baker.initd.in
+++ b/scripts/pkg-common/baker.initd.in
@@ -31,7 +31,7 @@ fi
 # Defaults
 user=tezos
 group=tezos
-nodedir=/var/tezos/node
+nodedir=/var/tezos/.tezos-node
 logdir=/var/log/tezos
 rotateonstart=yes
 protocols="@PROTOCOLS@"
diff --git a/scripts/pkg-common/node.conf b/scripts/pkg-common/node.conf
index dfe0b1139a5c39cf40efd2ed1910136c59b12a41..5e4ce2375a8523df4ad152dc819b4c6cb982daf5 100644
--- a/scripts/pkg-common/node.conf
+++ b/scripts/pkg-common/node.conf
@@ -6,7 +6,7 @@ group=tezos
 # Data Directory
 # An independent mount point of /var/tezos is recommended
 #
-nodedir=/var/tezos/node
+nodedir=/var/tezos/.tezos-node
 
 # Logfile
 #
diff --git a/scripts/pkg-common/node.initd.in b/scripts/pkg-common/node.initd.in
index 36805b0c5908b222572ad7d3d42c6d90e9bfbac3..65506a59983e199a4acf12d1e7b6f97064342573 100755
--- a/scripts/pkg-common/node.initd.in
+++ b/scripts/pkg-common/node.initd.in
@@ -35,7 +35,7 @@ fi
 # Defaults
 user=tezos
 group=tezos
-nodedir=/var/tezos/node
+nodedir=/var/tezos/.tezos-node
 logdir=/var/log/tezos
 rotateonstart=yes
 othercliopts_node=""
diff --git a/scripts/pkg-common/smartrollup.conf b/scripts/pkg-common/smartrollup.conf
index 6d447d81e101842ecd60d7de5758969f92eef9af..32ec2a1bd1fa231793e1024596eb4e2616aa70cf 100644
--- a/scripts/pkg-common/smartrollup.conf
+++ b/scripts/pkg-common/smartrollup.conf
@@ -3,9 +3,7 @@
 #group=tezos
 
 # Data directories
-#clientdir=/var/tezos/.tezos-client
-#rollupdatadir=/var/tezos/.tezos-smart-rollup-node
-rollupdatadir=/var/tezos/smartrollup
+rollupdatadir=/var/tezos/.tezos-smart-rollup-node
 
 # Assume the node is on the local machine. Change if not.
 nodeaddr=127.0.0.1
diff --git a/scripts/pkg-common/smartrollup.initd.in b/scripts/pkg-common/smartrollup.initd.in
index da795778ca3e3f6cfe8d557f7e49e139c1e897da..dc032655ea8a0d3cdf9405a5ea9b83bbc8a380c3 100755
--- a/scripts/pkg-common/smartrollup.initd.in
+++ b/scripts/pkg-common/smartrollup.initd.in
@@ -29,9 +29,9 @@ fi
 # Defaults
 user=tezos
 group=tezos
-nodedir=/var/tezos/node
-clientdir=~tezos/.tezos-client
-rollupdatadir=~tezos/.tezos-smart-rollup-node
+nodedir=/var/tezos/.tezos-node
+clientdir=/var/tezos/.tezos-client
+rollupdatadir=/var/tezos/.tezos-smart-rollup-node
 logdir=/var/log/tezos
 rotateonstart=yes
 nodeaddr=127.0.0.1