diff --git a/debian/dovecot-keylookupd.postinst b/debian/dovecot-keylookupd.postinst
new file mode 100755
index 0000000000000000000000000000000000000000..5c22785fc040adcf7fa7bbd2bd91286fcb75019a
--- /dev/null
+++ b/debian/dovecot-keylookupd.postinst
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+configure)
+    addgroup --system --quiet dovecot-keylookupd
+    adduser --system --no-create-home --home /run/dovecot-keylookupd \
+      --disabled-password --disabled-login \
+      --quiet --ingroup dovecot-keylookupd dovecot-keylookupd
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/dovecot-keylookupd.service b/debian/dovecot-keylookupd.service
index 38f45af234665ae24195a9475cdff96b1d2aa624..71ded2720e832dea3f9db2c8ac13ddcc977a43dc 100644
--- a/debian/dovecot-keylookupd.service
+++ b/debian/dovecot-keylookupd.service
@@ -6,7 +6,7 @@ Requires=dovecot-keylookupd.socket
 Type=notify
 ExecStart=/usr/bin/dovecot-keylookupd --systemd-socket
 Restart=on-failure
-User=dovecot
+User=dovecot-keylookupd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/debian/dovecot-keylookupd.socket b/debian/dovecot-keylookupd.socket
index bbd6f09f872010368e5b5e953f457ed595f242ad..58957b872bec74ae7bafdfd5b4dbe3aa274f3864 100644
--- a/debian/dovecot-keylookupd.socket
+++ b/debian/dovecot-keylookupd.socket
@@ -5,7 +5,7 @@ Description=Dovecot keylookupd socket
 ListenStream=/run/dovecot-keylookupd/socket
 SocketMode=660
 DirectoryMode=755
-SocketUser=dovecot
-SocketGroup=dovecot
+SocketUser=dovecot-keylookupd
+SocketGroup=dovecot-keylookupd
 Accept=false
 
diff --git a/debian/postinst b/debian/keystored.postinst
similarity index 100%
rename from debian/postinst
rename to debian/keystored.postinst