diff --git a/.SRCINFO b/.SRCINFO
index 42c048049733d..ffe32623d929a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = tori-cli-bin
 	pkgdesc = Lightweight Docker monitoring with alerting
 	pkgver = 0.3.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/thobiasn/tori-cli
 	install = tori-cli.install
 	arch = x86_64
@@ -21,9 +21,9 @@ pkgbase = tori-cli-bin
 	sha256sums = dd4323e456ce3acd4d0cb493238861b3eca0f1a1df5845b9babf0b6e5738dff8
 	sha256sums = dc02531f019bb5f48aeeda9feec15e9faa3c5be3b27d81657af390659ba74ec9
 	sha256sums = 81c3df0de337c3cd841f1f942ec2f99ada6db1b7d178b3bb30d179093e9f16a6
-	sha256sums = 8e7643af97932406d4de791a4d540df324d20ce40ee6d59f2729efd1ca835901
+	sha256sums = 6a5808aabf9eb9e8f7c726dacb5639f21cec05561c40ff7bcf059da99ade3ed0
 	sha256sums = b9e0bcaaf31788d36e08c0673d1e36c65d287aecad96ec8dae15f59047713870
-	sha256sums = 57cd1949897e7280e98b50df088880af2ca5dfd984b5ff6016db355c2439b7a7
+	sha256sums = ee8f595d25051af044ad365b189df703842084b8ef5edc164c6b7e54e900dbdb
 	source_x86_64 = tori-cli-x86_64-0.3.0::https://github.com/thobiasn/tori-cli/releases/download/v0.3.0/tori_0.3.0_linux_amd64
 	sha256sums_x86_64 = 9be0c2a1a0d0270367c5335aeaa66bb6340cfa071f772159f7d000e84e47d8bf
 	source_aarch64 = tori-cli-aarch64-0.3.0::https://github.com/thobiasn/tori-cli/releases/download/v0.3.0/tori_0.3.0_linux_arm64
diff --git a/PKGBUILD b/PKGBUILD
index b6bedf857d716..f8ebbb71a7a5d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgdesc="Lightweight Docker monitoring with alerting"
 _appname=${_pkgname%%-cli}
 
 pkgver=0.3.0
-pkgrel=1
+pkgrel=2
 _pkgvername=v${pkgver}
 
 arch=('x86_64' 'aarch64')
@@ -39,9 +39,9 @@ sha256sums=('83f6ec88eb8e6ffd6ce08ad18a604c61fc60be0d68a07193ae4884081f0920aa'
             'dd4323e456ce3acd4d0cb493238861b3eca0f1a1df5845b9babf0b6e5738dff8'
             'dc02531f019bb5f48aeeda9feec15e9faa3c5be3b27d81657af390659ba74ec9'
             '81c3df0de337c3cd841f1f942ec2f99ada6db1b7d178b3bb30d179093e9f16a6'
-            '8e7643af97932406d4de791a4d540df324d20ce40ee6d59f2729efd1ca835901'
+            '6a5808aabf9eb9e8f7c726dacb5639f21cec05561c40ff7bcf059da99ade3ed0'
             'b9e0bcaaf31788d36e08c0673d1e36c65d287aecad96ec8dae15f59047713870'
-            '57cd1949897e7280e98b50df088880af2ca5dfd984b5ff6016db355c2439b7a7')
+            'ee8f595d25051af044ad365b189df703842084b8ef5edc164c6b7e54e900dbdb')
 sha256sums_x86_64=('9be0c2a1a0d0270367c5335aeaa66bb6340cfa071f772159f7d000e84e47d8bf')
 sha256sums_aarch64=('09625d87cc3021a4dfdfbe8a89a63c24533b5658e9a6c17edea0c5ffbfa65a65')
 
@@ -51,7 +51,7 @@ package() {
 
 	install -Dm755 "${_pkgname}-${CARCH}-${pkgver}" "${pkgdir}/usr/bin/${_appname}"
 
-	install -Dm644 "${_pkgname}.config" "${pkgdir}/etc/${_appname}/config.toml"
+	install -Dm600 "${_pkgname}.config" "${pkgdir}/etc/${_appname}/config.toml"
 
 	install -Dm644 "${_pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${_appname}.service"
 
diff --git a/tori-cli.install b/tori-cli.install
index e9d73756e8780..3ea3bfa7b0ea2 100644
--- a/tori-cli.install
+++ b/tori-cli.install
@@ -1,12 +1,15 @@
 post_install() {
+  chown tori:tori /etc/tori/config.toml
   echo "
-Welcome to the tori!
+Welcome to tori!
 -----------------------------------------------------------------------------
 Default Config Path: /etc/tori/
 Default Data Path: /var/lib/tori/
 Default User & Group: tori:tori
 
-$ sudo usermod -aG tori $USER
+$ sudo usermod -aG docker tori
+$ sudo usermod -aG tori \$USER
+$ newgrp tori  # activate group without logging out
 $ sudo systemctl start tori.service
 -----------------------------------------------------------------------------
 
@@ -14,12 +17,19 @@ More: https://github.com/thobiasn/tori-cli
 "
 }
 
+post_upgrade() {
+  chown tori:tori /etc/tori/config.toml
+  chmod 600 /etc/tori/config.toml
+}
+
 post_remove() {
-  echo "You need to remove database and config by yourself.
+  echo "
+To fully remove tori, clean up the following:
 -----------------------------------------------------------------------------
-Default Config Path: /etc/tori/
-Default Data Path: /var/lib/tori/
-Default User & Group: tori:tori
+$ sudo gpasswd -d \$USER tori
+$ sudo userdel tori
+$ sudo groupdel tori
+$ sudo rm -rf /etc/tori /var/lib/tori
 -----------------------------------------------------------------------------
 "
 }
diff --git a/tori-cli.sysusers b/tori-cli.sysusers
index 076474906182c..52248560dc790 100644
--- a/tori-cli.sysusers
+++ b/tori-cli.sysusers
@@ -1 +1 @@
-u tori - "Tori monitoring agent" /var/lib/tori /bin/bash
+u tori - "Tori monitoring agent" /var/lib/tori /usr/bin/nologin