diff --git a/.drone/update-deb-packages.sh b/.drone/update-deb-packages.sh
index 74cdd625e..13a256af6 100755
--- a/.drone/update-deb-packages.sh
+++ b/.drone/update-deb-packages.sh
@@ -64,9 +64,10 @@ cat <<EOF > "$GIT_BUILD_DIR/DEBIAN/postinst" && chmod +x "$GIT_BUILD_DIR/DEBIAN/
 set -e
 
 if [ "\$1" = "configure" ]; then
-  grep -e '^platypush:' /etc/passwd 2>/dev/null || useradd -r -s /bin/false -d /var/lib/platypush platypush
+  grep -e '^platypush:' /etc/passwd 2>/dev/null || useradd -U -r -s /bin/false -d /var/lib/platypush platypush
   mkdir -p /var/lib/platypush
-  chown platypush:platypush /var/lib/platypush
+  chown -R platypush:platypush /var/lib/platypush
+  chown -R platypush:platypush /etc/platypush
   if which systemctl; then systemctl daemon-reload; fi
 fi
 EOF
diff --git a/.drone/update-rpm-repo.sh b/.drone/update-rpm-repo.sh
index 37422eb4d..c567b2902 100755
--- a/.drone/update-rpm-repo.sh
+++ b/.drone/update-rpm-repo.sh
@@ -38,6 +38,8 @@ Requires: $(cat platypush/install/requirements/fedora.txt | tr '\n' ' ')
 Conflicts: $PKG_NAME
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-root
+BuildRequires: systemd-rpm-macros
+%{?sysusers_requires_compat}
 
 %description
 Universal command executor and automation hub.
@@ -45,13 +47,26 @@ Universal command executor and automation hub.
 %install
 mkdir -p %{buildroot}/
 cp -r "$BUILD_DIR"/* %{buildroot}/
+install -p -Dm0644 "${BUILD_DIR}/usr/lib/sysusers.d/platypush.conf" %{buildroot}%{_sysusersdir}/platypush.conf
+
+%pre
+%sysusers_create_compat "${BUILD_DIR}/usr/lib/sysusers.d/platypush.conf"
 
 %clean
 
 %files
+%defattr(750,platypush,platypush,750)
+%dir /etc/platypush
+/etc/platypush/*
 /usr/bin/*
 /usr/lib/python$(python3 --version | awk '{print $2}' | cut -d. -f 1,2)/site-packages/platypush
 /usr/lib/python$(python3 --version | awk '{print $2}' | cut -d. -f 1,2)/site-packages/platypush-$VERSION.dist-info
+/usr/lib/systemd/system/*
+/usr/lib/systemd/user/*
+%defattr(750,platypush,platypush,750)
+%dir /var/lib/platypush
+/var/lib/platypush/*
+%{_sysusersdir}/platypush.conf
 
 %changelog
 * $(date +'%a %b %d %Y') admin <admin@platypush.tech>
@@ -60,7 +75,28 @@ EOF
 
 echo "--- Building git package"
 mkdir -p "$BUILD_DIR"
+
 pip install --prefix="$BUILD_DIR/usr" --no-cache --no-deps .
+
+install -m755 -d "${BUILD_DIR}/usr/lib/systemd/system"
+install -m755 -d "${BUILD_DIR}/usr/lib/systemd/user"
+install -m755 -d "${BUILD_DIR}/usr/lib/sysusers.d"
+install -m750 -d "${BUILD_DIR}/var/lib/platypush"
+install -m750 -d "${BUILD_DIR}/etc/platypush/scripts"
+
+install -m644 "${SRCDIR}/platypush/config/config.yaml" "${BUILD_DIR}/etc/platypush/config.yaml"
+install -Dm644 "${SRCDIR}/platypush/config/systemd/platypush-sysusers.conf" "${BUILD_DIR}/usr/lib/sysusers.d/platypush.conf"
+install -m644 "${SRCDIR}/platypush/config/systemd/platypush.service" "${BUILD_DIR}/usr/lib/systemd/user/platypush.service"
+install -m644 "${SRCDIR}/platypush/config/systemd/platypush.service" "${BUILD_DIR}/usr/lib/systemd/system/platypush.service"
+sed -i "${BUILD_DIR}/usr/lib/systemd/system/platypush.service" -r \
+    -e 's/^#\s*Requires=(.*)/Requires=\1/' \
+    -e 's/^\[Service\]$/\[Service\]\
+User=platypush\
+Group=platypush\
+WorkingDirectory=\/var\/lib\/platypush\
+Environment="PLATYPUSH_CONFIG=\/etc\/platypush\/config.yaml"\
+Environment="PLATYPUSH_WORKDIR=\/var\/lib\/platypush"/'
+
 rpmbuild --target "noarch" -bb "$SPECFILE"
 
 echo "--- Copying the new RPM package"
@@ -106,6 +142,8 @@ Requires: $(cat platypush/install/requirements/fedora.txt | tr '\n' ' ')
 Conflicts: $PKG_NAME-git
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-root
+BuildRequires: systemd-rpm-macros
+%{?sysusers_requires_compat}
 
 %description
 Universal command executor and automation hub.
@@ -113,13 +151,26 @@ Universal command executor and automation hub.
 %install
 mkdir -p %{buildroot}/
 cp -r "$BUILD_DIR"/* %{buildroot}/
+install -p -Dm0644 "${BUILD_DIR}/usr/lib/sysusers.d/platypush.conf" %{buildroot}%{_sysusersdir}/platypush.conf
+
+%pre
+%sysusers_create_compat "${BUILD_DIR}/usr/lib/sysusers.d/platypush.conf"
 
 %clean
 
 %files
+%defattr(750,platypush,platypush,750)
+%dir /etc/platypush
+/etc/platypush/*
 /usr/bin/*
 /usr/lib/python$(python3 --version | awk '{print $2}' | cut -d. -f 1,2)/site-packages/platypush
 /usr/lib/python$(python3 --version | awk '{print $2}' | cut -d. -f 1,2)/site-packages/platypush-$VERSION.dist-info
+/usr/lib/systemd/system/*
+/usr/lib/systemd/user/*
+%defattr(750,platypush,platypush,750)
+%dir /var/lib/platypush
+/var/lib/platypush/*
+%{_sysusersdir}/platypush.conf
 
 %changelog
 * $(date +'%a %b %d %Y') admin <admin@platypush.tech>