diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec
index b856548..160a44a 100644
--- a/gnome-initial-setup.spec
+++ b/gnome-initial-setup.spec
@@ -2,7 +2,7 @@
 ## (rpmautospec version 0.6.5)
 ## RPMAUTOSPEC: autorelease, autochangelog
 %define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
-    release_number = 1;
+    release_number = 2;
     base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
     print(release_number + base_release_number - 1);
 }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}.alma.1
@@ -32,6 +32,7 @@ License:        GPL-2.0-or-later
 URL:            https://wiki.gnome.org/Design/OS/InitialSetup
 Source0:        https://download.gnome.org/sources/%{name}/46/%{name}-%{tarball_version}.tar.xz
 Source1:        vendor.conf
+Source2:        gnome-initial-setup.sysusers.conf
 
 %if 0%{!?almalinux}
 # Downstream branding
@@ -67,6 +68,7 @@ BuildRequires:  pkgconfig(pango)
 BuildRequires:  pkgconfig(polkit-gobject-1)
 BuildRequires:  pkgconfig(pwquality)
 BuildRequires:  pkgconfig(rest-1.0)
+BuildRequires:  systemd-rpm-macros
 %if %{with webkitgtk}
 BuildRequires:  pkgconfig(webkitgtk-6.0)
 %endif
@@ -80,7 +82,7 @@ Requires: gnome-desktop4%{?_isa} >= %{gnome_desktop_version}
 Requires: polkit-js-engine
 Requires: /usr/bin/tecla
 
-Requires(pre): shadow-utils
+%{?sysusers_requires_compat}
 
 Provides: user(%name)
 
@@ -116,10 +118,8 @@ cp %{SOURCE1} %{buildroot}%{_datadir}/gnome-initial-setup/
 %find_lang %{name}
 
 %pre
-# we do not use sysusers yet because we need /var/lib/gnome-initial-setup
-# to be owned by the gnome-initial-setup user. please do not convert
-# to sysusers without making sure this is handled, maybe by tmpfiles
-useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null || :
+%sysusers_create_compat %{SOURCE2}
+
 
 %files -f %{name}.lang
 %license COPYING
@@ -140,10 +140,13 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null ||
 %{_userunitdir}/*
 
 %changelog
-* Tue Nov 11 2025 Eduard Abdullin <eabdullin@almalinux.org> - 46.7-1.alma.1
+* Fri Nov 14 2025 Eduard Abdullin <eabdullin@almalinux.org> - 46.7-2.alma.1
 - Don’t apply the RHEL patch on AlmaLinux
 
 ## START: Generated by rpmautospec
+* Wed Sep 03 2025 Tomas Pelka <tpelka@redhat.com> - 46.7-2
+- Use systemd sysusers config to create user and group
+
 * Mon Mar 17 2025 Michael Catanzaro <mcatanzaro@redhat.com> - 46.7-1
 - Update to 46.7
 
diff --git a/gnome-initial-setup.sysusers.conf b/gnome-initial-setup.sysusers.conf
new file mode 100644
index 0000000..b61480f
--- /dev/null
+++ b/gnome-initial-setup.sysusers.conf
@@ -0,0 +1 @@
+u gnome-initial-setup - - /run/gnome-initial-setup/ /sbin/nologin