diff --git a/.goreleaser.yml b/.goreleaser.yml
index 7fbc61ca4a..acafc4abc0 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -75,12 +75,18 @@ nfpms:
     description: Polygon Blockchain
     license: GPLv3 LGPLv3
 
+    bindir: /usr/local/bin
+
     formats:
       - apk
       - deb
       - rpm
 
     contents:
+      - dst: /var/lib/bor
+        type: dir
+        file_info:
+          mode: 0777
       - src: builder/files/bor.service
         dst: /lib/systemd/system/bor.service
         type: config
@@ -94,6 +100,9 @@ nfpms:
         dst: /var/lib/bor/config.toml
         type: config
 
+    scripts:
+      postinstall: builder/files/bor-post-install.sh
+
     overrides:
       rpm:
         replacements:
diff --git a/builder/files/bor-post-install.sh b/builder/files/bor-post-install.sh
new file mode 100644
index 0000000000..1419479983
--- /dev/null
+++ b/builder/files/bor-post-install.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+PKG="bor"
+
+if ! getent passwd $PKG >/dev/null ; then
+    adduser --disabled-password --disabled-login --shell /usr/sbin/nologin --quiet --system --no-create-home --home /nonexistent $PKG
+    echo "Created system user $PKG"
+fi
diff --git a/builder/files/bor.service b/builder/files/bor.service
index 4b628cbf6e..2deff3dbc9 100644
--- a/builder/files/bor.service
+++ b/builder/files/bor.service
@@ -8,7 +8,7 @@
   RestartSec=5s
   ExecStart=/usr/local/bin/bor server -config="/var/lib/bor/config.toml"
   Type=simple
-  User=ubuntu
+  User=bor
   KillSignal=SIGINT
   TimeoutStopSec=120