diff --git a/debian/vitastor-mon.install b/debian/vitastor-mon.install
index d344f91f..b5f61f6d 100644
--- a/debian/vitastor-mon.install
+++ b/debian/vitastor-mon.install
@@ -1 +1,2 @@
 mon usr/lib/vitastor
+mon/vitastor-mon.service /lib/systemd/system
diff --git a/debian/vitastor-mon.postinst b/debian/vitastor-mon.postinst
new file mode 100644
index 00000000..b627d9bb
--- /dev/null
+++ b/debian/vitastor-mon.postinst
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+	addgroup --system --quiet vitastor
+	adduser --system --quiet --ingroup vitastor --no-create-home --home /nonexistent vitastor
+fi
diff --git a/debian/vitastor-osd.install b/debian/vitastor-osd.install
index bce2fb9c..07e37a51 100644
--- a/debian/vitastor-osd.install
+++ b/debian/vitastor-osd.install
@@ -2,4 +2,5 @@ usr/bin/vitastor-osd
 usr/bin/vitastor-disk
 usr/bin/vitastor-dump-journal
 mon/vitastor-osd@.service /lib/systemd/system
+mon/vitastor.target /lib/systemd/system
 mon/90-vitastor.rules /lib/udev/rules.d
diff --git a/debian/vitastor-osd.postinst b/debian/vitastor-osd.postinst
new file mode 100644
index 00000000..3b05abfb
--- /dev/null
+++ b/debian/vitastor-osd.postinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+	addgroup --system --quiet vitastor
+	adduser --system --quiet --ingroup vitastor --no-create-home --home /nonexistent vitastor
+	install -o vitastor -g vitastor -d /var/log/vitastor
+fi
diff --git a/mon/make-units.sh b/mon/make-etcd.sh
similarity index 57%
rename from mon/make-units.sh
rename to mon/make-etcd.sh
index ab74faff..4650e58e 100755
--- a/mon/make-units.sh
+++ b/mon/make-etcd.sh
@@ -1,13 +1,12 @@
 #!/bin/bash
-# Very simple systemd unit generator for etcd & vitastor-mon services
-# Not the final solution yet, mostly for tests
+# Simple systemd unit generator for etcd
 # Copyright (c) Vitaliy Filippov, 2019+
 # License: MIT
 
-# USAGE: ./make-units.sh
+# USAGE: [IP_SUBSTR=10.200.1.] [ETCD_HOSTS=etcd0=http://10.200.1.10:2380,...] ./make-etcd.sh
 
-IP_SUBSTR="10.200.1."
-ETCD_HOSTS="etcd0=http://10.200.1.10:2380,etcd1=http://10.200.1.11:2380,etcd2=http://10.200.1.12:2380"
+IP_SUBSTR=${IP_SUBSTR:-10.200.1.}
+ETCD_HOSTS=${ETCD_HOSTS:-etcd0=http://10.200.1.10:2380,etcd1=http://10.200.1.11:2380,etcd2=http://10.200.1.12:2380}
 
 # determine IP
 IP=`ip -json a s | jq -r '.[].addr_info[] | select(.local | startswith("'$IP_SUBSTR'")) | .local'`
@@ -16,7 +15,6 @@ ETCD_NUM=${ETCD_HOSTS/$IP*/}
 [ "$ETCD_NUM" != "$ETCD_HOSTS" ] || exit 1
 ETCD_NUM=$(echo $ETCD_NUM | tr -d -c , | wc -c)
 
-# etcd
 useradd etcd
 
 mkdir -p /var/lib/etcd$ETCD_NUM.etcd
@@ -50,37 +48,3 @@ EOF
 systemctl daemon-reload
 systemctl enable etcd
 systemctl start etcd
-
-useradd vitastor
-chmod 755 /root
-
-# Vitastor target
-cat >/etc/systemd/system/vitastor.target <<EOF
-[Unit]
-Description=vitastor target
-[Install]
-WantedBy=multi-user.target
-EOF
-
-# Monitor unit
-ETCD_MON=$(echo $ETCD_HOSTS | perl -pe 's/:2380/:2379/g; s/etcd\d*=//g;')
-cat >/etc/systemd/system/vitastor-mon.service <<EOF
-[Unit]
-Description=Vitastor monitor
-After=network-online.target local-fs.target time-sync.target
-Wants=network-online.target local-fs.target time-sync.target
-
-[Service]
-Restart=always
-ExecStart=node /usr/lib/vitastor/mon/mon-main.js --etcd_url '$ETCD_MON' --etcd_prefix '/vitastor' --etcd_start_timeout 5
-WorkingDirectory=/
-User=vitastor
-PrivateTmp=false
-TasksMax=infinity
-Restart=always
-StartLimitInterval=0
-RestartSec=10
-
-[Install]
-WantedBy=vitastor.target
-EOF
diff --git a/mon/mon-main.js b/mon/mon-main.js
index 571a0269..ff90b8ce 100755
--- a/mon/mon-main.js
+++ b/mon/mon-main.js
@@ -12,7 +12,7 @@ for (let i = 2; i < process.argv.length; i++)
     if (process.argv[i] === '-h' || process.argv[i] === '--help')
     {
         console.error('USAGE: '+process.argv[0]+' '+process.argv[1]+' [--verbose 1]'+
-            ' [--etcd_address "http://127.0.0.1:2379,..."] [--config_file /etc/vitastor/vitastor.conf]'+
+            ' [--etcd_address "http://127.0.0.1:2379,..."] [--config_path /etc/vitastor/vitastor.conf]'+
             ' [--etcd_prefix "/vitastor"] [--etcd_start_timeout 5]');
         process.exit();
     }
diff --git a/mon/vitastor-mon.service b/mon/vitastor-mon.service
new file mode 100644
index 00000000..2887e8df
--- /dev/null
+++ b/mon/vitastor-mon.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=Vitastor monitor
+After=network-online.target local-fs.target time-sync.target
+Wants=network-online.target local-fs.target time-sync.target
+
+[Service]
+Restart=always
+ExecStart=node /usr/lib/vitastor/mon/mon-main.js
+WorkingDirectory=/
+User=vitastor
+PrivateTmp=false
+TasksMax=infinity
+Restart=always
+StartLimitInterval=0
+RestartSec=10
+
+[Install]
+WantedBy=vitastor.target
diff --git a/mon/vitastor.target b/mon/vitastor.target
new file mode 100644
index 00000000..f85ac6a6
--- /dev/null
+++ b/mon/vitastor.target
@@ -0,0 +1,4 @@
+[Unit]
+Description=vitastor target
+[Install]
+WantedBy=multi-user.target
diff --git a/rpm/vitastor-el7.spec b/rpm/vitastor-el7.spec
index ff8ab37b..18cdd4bc 100644
--- a/rpm/vitastor-el7.spec
+++ b/rpm/vitastor-el7.spec
@@ -106,7 +106,7 @@ cd ..
 mkdir -p %buildroot/usr/lib/vitastor
 cp -r mon %buildroot/usr/lib/vitastor
 mkdir -p %buildroot/lib/systemd/system
-cp mon/vitastor-osd@.service %buildroot/lib/systemd/system
+cp mon/vitastor.target mon/vitastor-mon.service mon/vitastor-osd@.service %buildroot/lib/systemd/system
 mkdir -p %buildroot/lib/udev/rules.d
 cp mon/90-vitastor.rules %buildroot/lib/udev/rules.d
 
@@ -120,11 +120,24 @@ cp mon/90-vitastor.rules %buildroot/lib/udev/rules.d
 %_bindir/vitastor-disk
 %_bindir/vitastor-dump-journal
 /lib/systemd/system/vitastor-osd@.service
+/lib/systemd/system/vitastor.target
 /lib/udev/rules.d/90-vitastor.rules
 
 
+%pre -n vitastor-osd
+groupadd -r -f vitastor 2>/dev/null ||:
+useradd -r -g vitastor -s /sbin/nologin -c "Vitastor daemons" -M -d /nonexistent vitastor 2>/dev/null ||:
+install -o vitastor -g vitastor -d /var/log/vitastor
+
+
 %files -n vitastor-mon
 /usr/lib/vitastor/mon
+/lib/systemd/system/vitastor-mon.service
+
+
+%pre -n vitastor-mon
+groupadd -r -f vitastor 2>/dev/null ||:
+useradd -r -g vitastor -s /sbin/nologin -c "Vitastor daemons" -M -d /nonexistent vitastor 2>/dev/null ||:
 
 
 %files -n vitastor-client
diff --git a/rpm/vitastor-el8.spec b/rpm/vitastor-el8.spec
index 6cec9eaa..3a6c850c 100644
--- a/rpm/vitastor-el8.spec
+++ b/rpm/vitastor-el8.spec
@@ -103,7 +103,7 @@ cd ..
 mkdir -p %buildroot/usr/lib/vitastor
 cp -r mon %buildroot/usr/lib/vitastor
 mkdir -p %buildroot/lib/systemd/system
-cp mon/vitastor-osd@.service %buildroot/lib/systemd/system
+cp mon/vitastor.target mon/vitastor-mon.service mon/vitastor-osd@.service %buildroot/lib/systemd/system
 mkdir -p %buildroot/lib/udev/rules.d
 cp mon/90-vitastor.rules %buildroot/lib/udev/rules.d
 
@@ -117,11 +117,24 @@ cp mon/90-vitastor.rules %buildroot/lib/udev/rules.d
 %_bindir/vitastor-disk
 %_bindir/vitastor-dump-journal
 /lib/systemd/system/vitastor-osd@.service
+/lib/systemd/system/vitastor.target
 /lib/udev/rules.d/90-vitastor.rules
 
 
+%pre -n vitastor-osd
+groupadd -r -f vitastor 2>/dev/null ||:
+useradd -r -g vitastor -s /sbin/nologin -c "Vitastor daemons" -M -d /nonexistent vitastor 2>/dev/null ||:
+install -o vitastor -g vitastor -d /var/log/vitastor
+
+
 %files -n vitastor-mon
 /usr/lib/vitastor/mon
+/lib/systemd/system/vitastor-mon.service
+
+
+%pre -n vitastor-mon
+groupadd -r -f vitastor 2>/dev/null ||:
+useradd -r -g vitastor -s /sbin/nologin -c "Vitastor daemons" -M -d /nonexistent vitastor 2>/dev/null ||:
 
 
 %files -n vitastor-client