diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec
index ce889db..d0b465d 100644
--- a/gnome-initial-setup.spec
+++ b/gnome-initial-setup.spec
@@ -8,13 +8,14 @@
 
 Name:           gnome-initial-setup
 Version:        40.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Bootstrapping your OS
 
 License:        GPLv2+
 URL:            https://wiki.gnome.org/Design/OS/InitialSetup
 Source0:        https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_version}.tar.xz
 Source1:        vendor.conf
+Source2:        gnome-initial-setup.sysusers.conf
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=2097848
 Patch0:         timezones.patch
@@ -54,6 +55,7 @@ BuildRequires:  ibus-devel
 BuildRequires:  rest-devel
 BuildRequires:  polkit-devel
 BuildRequires:  libsecret-devel
+BuildRequires:  systemd-rpm-macros
 
 # gnome-initial-setup is being run by gdm
 Requires: gdm
@@ -63,7 +65,7 @@ Requires: glib2%{?_isa} >= %{glib_required_version}
 Requires: polkit-js-engine
 Requires: /usr/bin/gkbd-keyboard-display
 
-Requires(pre): shadow-utils
+%{?sysusers_requires_compat}
 
 Provides: user(%name)
 
@@ -91,7 +93,7 @@ cp %{SOURCE1} %{buildroot}%{_datadir}/gnome-initial-setup/
 %find_lang %{name}
 
 %pre
-useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null || :
+%sysusers_create_compat %{SOURCE2}
 
 %files -f %{name}.lang
 %license COPYING
@@ -111,6 +113,10 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null ||
 %{_datadir}/gnome-initial-setup/vendor.conf
 
 %changelog
+* Thu Apr 02 2026 Tomas Pelka <tpelka@redhat.com> - 40.4-6
+- Use systemd sysusers config to create user and group
+  Resolves: RHEL-82667
+
 * Mon Mar 09 2026 Nieves Montero <nmontero@redhat.com> - 40.4-5
 - Remove WebKit dependency
   Resolves: RHEL-153859
diff --git a/gnome-initial-setup.sysusers.conf b/gnome-initial-setup.sysusers.conf
new file mode 100644
index 0000000..a4ae4c7
--- /dev/null
+++ b/gnome-initial-setup.sysusers.conf
@@ -0,0 +1 @@
+u gnome-initial-setup - - /run/gnome-initial-setup/ /sbin/nologin
\ No newline at end of file