diff --git a/scripts/pkg-common/node.initd.in b/scripts/pkg-common/node.initd.in
index 891577cdec19f3af3f27faaa5841fd8e5eaeb591..36805b0c5908b222572ad7d3d42c6d90e9bfbac3 100755
--- a/scripts/pkg-common/node.initd.in
+++ b/scripts/pkg-common/node.initd.in
@@ -14,7 +14,7 @@
 #		     maintains a local copy of the Tezos blockchain.
 ### END INIT INFO
 
-set -eu
+#set -eu
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 export DESC="octez node"
diff --git a/scripts/pkg-common/vdf.initd.in b/scripts/pkg-common/vdf.initd.in
index 4ae9194eefec48966126de95f1ee8f2ee5b5ee6e..790171258f412020fa947a03d69cf3cd56a41cf5 100755
--- a/scripts/pkg-common/vdf.initd.in
+++ b/scripts/pkg-common/vdf.initd.in
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Start/stop the Octez Bakers and Accusers
+# Start/stop the Octez VDF daemon
 #
 ### BEGIN INIT INFO
 # Provides:          octez-vdf
@@ -14,8 +14,6 @@
 #		     blockchain to improve randomness.
 ### END INIT INFO
 
-set -ue
-
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 export DESC="octez vdf"
 NAME=octez-vdf
diff --git a/scripts/rpm/node-spec.in b/scripts/rpm/node-spec.in
index ccd00103c76e9c08f11b5a3e714bb96a19211596..5a43c68c1d32e24ce584628059b31a67671c751f 100644
--- a/scripts/rpm/node-spec.in
+++ b/scripts/rpm/node-spec.in
@@ -27,6 +27,6 @@ The Octez Node daemons
 
 %post 
 getent group tezos >/dev/null 2>&1 || groupadd tezos
-getent passwd tezos >/dev/null 2>&1 || useradd -g tezos tezos
+getent passwd tezos >/dev/null 2>&1 || useradd -g tezos -d /var/tezos tezos
 /usr/bin/systemctl daemon-reload