diff --git a/seed/postgresql-client/dictionaries/23_postgresql.xml b/seed/postgresql-client/dictionaries/23_postgresql.xml
index 9afde856..58dfcb60 100644
--- a/seed/postgresql-client/dictionaries/23_postgresql.xml
+++ b/seed/postgresql-client/dictionaries/23_postgresql.xml
@@ -6,6 +6,7 @@
       <file>/etc/pki/ca-trust/source/anchors/ca_PostgreSQL.crt</file>
       <file>/etc/pki/tls/certs/postgresql.crt</file>
       <file owner_type="variable" owner="pg_client_key_owner" mode="400">/etc/pki/tls/private/postgresql.key</file>
+      <file filelist="postgresql_debian" engine="none" source="sysuser-postgresql-client.conf">/sysusers.d/0postgresqlclient.conf</file>
     </service>
   </services>
   <variables>
@@ -41,5 +42,9 @@
       <param type="variable">pg_client_username</param>
       <target>pg_client_database</target>
     </fill>
+    <condition name="disabled_if_not_in" source="os_name">
+      <param>Debian</param>
+      <target type="filelist">postgresql_debian</target>
+    </condition>
   </constraints>
 </rougail>
diff --git a/seed/postgresql-client/manual/image/preinstall/postgresql_client.sh b/seed/postgresql-client/manual/image/preinstall/postgresql_client.sh
index f5d15a18..1072cd97 100644
--- a/seed/postgresql-client/manual/image/preinstall/postgresql_client.sh
+++ b/seed/postgresql-client/manual/image/preinstall/postgresql_client.sh
@@ -1 +1,5 @@
-PKG="$PKG postgresql"
+if [ "$INSTALL_TOOL" = "dnf" ]; then
+  PKG="$PKG postgresql"
+else
+  PKG="$PKG postgresql-client"
+fi
diff --git a/seed/postgresql-client/templates/sysuser-postgresql-client.conf b/seed/postgresql-client/templates/sysuser-postgresql-client.conf
new file mode 100644
index 00000000..8d93c427
--- /dev/null
+++ b/seed/postgresql-client/templates/sysuser-postgresql-client.conf
@@ -0,0 +1,4 @@
+g ssl-cert 108
+g postgres 109
+u postgres 104:109 "PostgreSQL administrator" /var/lib/postgresql  /bin/bash
+m postgres ssl-cert