diff --git a/build-and-update-all-branches b/build-and-update-all-branches
index 9d7b6da..e93f5d8 100755
--- a/build-and-update-all-branches
+++ b/build-and-update-all-branches
@@ -1,14 +1,13 @@
 #! /bin/sh
 
-# Prepare rawhide branch, review the list of branches below and then execute this
+# Prepare main branch, review the list of branches below and then execute this
 # script.
 
-main=main
-branches="$main epel8 epel9 f41 f42"
+branches='main f40 f39 f38 epel7 epel8 epel9'
 
 exit_handler ()
 {
-    git checkout $main
+    git checkout main
 }
 
 trap exit_handler EXIT
@@ -20,18 +19,21 @@ koji hello
 
 tasks=
 for branch in $branches; do
-    if test $branch != $main; then
+    if test $branch != main; then
         git checkout "$branch"
-        git merge $main
+        git merge main
     fi
     git push
-    tasks="${tasks}`fedpkg build --nowait | grep 'Created task' | cut -d: -f2`"
+    skip_nvr_check=
+    if test $branch = epel7; then
+        skip_nvr_check=--skip-nvr-check
+    fi
+    tasks="${tasks}`fedpkg build $skip_nvr_check --nowait | grep 'Created task' | cut -d: -f2`"
 done
 
 if test -n "$tasks"; then
     koji watch-task $tasks
 fi
 
-set -- $branches
-git checkout $1
+git checkout main
 fedpkg update
diff --git a/resalloc.spec b/resalloc.spec
index 7093616..db45191 100644
--- a/resalloc.spec
+++ b/resalloc.spec
@@ -33,25 +33,13 @@ the purposes of CI/CD tasks.
 %bcond_with    python3
 %endif
 
-# Modern distributions (using RPM v4.19+; for example, Fedora 39+) do not
-# require the %%pre scriptlet for creating users/groups because the sysusers
-# feature is now built directly into RPM.  Simply including the sysusers
-# `mock.conf` file in a package payload is sufficient to leverage this feature.
-# However, for older distributions that lack this capability, we still define
-# the %%pre scriptlet.
-%if (0%{?rhel} && 0%{?rhel} < 10) || (0%{?mageia} && 0%{?mageia} < 10) || (0%{?suse_version} && 0%{?suse_version} < 1660)
-%bcond_without sysusers_compat
-%else
-%bcond_with sysusers_compat
-%endif
-
 %global default_python  %{?with_python3:python3}%{!?with_python3:python2}
 %global default_sitelib %{?with_python3:%python3_sitelib}%{!?with_python3:%python_sitelib}
 
 Name:       %srcname
 Summary:    %sum - client tooling
-Version:    5.11
-Release:    4%{?dist}
+Version:    5.5
+Release:    1%{?dist}
 License:    GPL-2.0-or-later
 URL:        https://github.com/praiskup/resalloc
 BuildArch:  noarch
@@ -94,10 +82,6 @@ BuildRequires: python-yaml
 
 Requires:   %default_python-%srcname = %version-%release
 
-%if %{with sysusers_compat}
-Requires(pre): shadow-utils
-%endif
-
 Source0: https://github.com/praiskup/%name/releases/download/v%version/%name-%version.tar.gz
 Source1: resalloc.service
 Source5: resalloc-agent-spawner.service
@@ -132,6 +116,7 @@ Requires: python-sqlalchemy
 Requires: python-yaml
 %endif
 
+Requires(pre): /usr/sbin/useradd
 %description server
 %desc
 
@@ -171,6 +156,7 @@ it shows page with information about resalloc resources.
 %package agent-spawner
 Summary: %sum - daemon starting agent-like resources
 
+Requires(pre): /usr/sbin/useradd
 Requires: python3-copr-common >= 0.23
 Requires: python3-daemon
 Requires: python3-redis
@@ -233,16 +219,6 @@ restorecon -R %_var/www/cgi-%{name} || :
 rm -r resalloc_agent_spawner
 %endif
 
-# Create sysusers.d config files
-cat >resalloc.sysusers.conf <<EOF
-u resalloc - '%sysuser service user' %_homedir /bin/bash
-m resalloc %sysgroup
-EOF
-cat >resalloc-agent-spawner.sysusers.conf <<EOF
-u resalloc-agent-spawner - '%agent_user service user' - -
-m resalloc-agent-spawner %agent_group
-EOF
-
 
 %build
 %if %{with python2}
@@ -290,9 +266,6 @@ rm %buildroot%_bindir/%name-agent-*
 rm %buildroot%_sysconfdir/resalloc-agent-spawner/config.yaml
 %endif
 
-install -m0644 -D resalloc.sysusers.conf %{buildroot}%{_sysusersdir}/resalloc.conf
-install -m0644 -D resalloc-agent-spawner.sysusers.conf %{buildroot}%{_sysusersdir}/resalloc-agent-spawner.conf
-
 
 %if %{with check}
 %check
@@ -308,10 +281,8 @@ make check TEST_PYTHONS="python3"
 ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project
 
 
-%if %{with sysusers_compat}
 %pre server
 %create_user_group %sysuser %sysgroup /bin/bash %_homedir
-%endif
 
 %post server
 %systemd_post resalloc.service
@@ -321,10 +292,8 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project
 
 
 %if %{with python3}
-%if %{with sysusers_compat}
 %pre agent-spawner
 %create_user_group %agent_user %agent_group /bin/false /
-%endif
 
 %post agent-spawner
 %systemd_post resalloc-agent-spawner.service
@@ -377,7 +346,6 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project
 %config %_sysconfdir/logrotate.d/resalloc-server
 %_libexecdir/resalloc-merge-hook-logs
 %config %attr(0755, root, root) %{_sysconfdir}/cron.hourly/resalloc
-%{_sysusersdir}/resalloc.conf
 
 
 %files helpers
@@ -393,7 +361,6 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project
 %{default_sitelib}/%{name}_agent_spawner
 %_unitdir/resalloc-agent-spawner.service
 %config(noreplace) %_sysconfdir/resalloc-agent-spawner
-%{_sysusersdir}/resalloc-agent-spawner.conf
 
 %files webui
 %doc %doc_files
@@ -407,44 +374,6 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project
 
 
 %changelog
-* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 5.11-4
-- Rebuilt for Python 3.14.0rc3 bytecode
-
-* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 5.11-3
-- Rebuilt for Python 3.14.0rc2 bytecode
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.11-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Mon Jul 21 2025 Pavel Raiskup <praiskup@redhat.com> - 5.11-1
-- new upstream release, don't keep cleanup processes indefinitely:
-  https://github.com/praiskup/resalloc/releases/tag/v5.11
-
-* Thu Jun 12 2025 Pavel Raiskup <praiskup@redhat.com> - 5.10-1
-- new upstream release, packages use RPM built-in sysusers support:
-  https://github.com/praiskup/resalloc/releases/tag/v5.10
-
-* Thu Jun 05 2025 Python Maint <python-maint@redhat.com> - 5.9-2
-- Rebuilt for Python 3.14
-
-* Sat Jan 18 2025 Pavel Raiskup <praiskup@redhat.com> - 5.9-1
-- New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.9
-
-* Thu Jan 16 2025 Jakub Kadlcik <frostyx@email.cz> - 5.8-1
-- New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.8
-
-* Fri Jan 10 2025 Jakub Kadlcik <frostyx@email.cz> - 5.7-1
-- New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.7
-
-* Mon Oct 07 2024 Pavel Raiskup <praiskup@redhat.com> - 5.6-1
-- New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.6
-
-* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sun Jun 09 2024 Python Maint <python-maint@redhat.com> - 5.5-2
-- Rebuilt for Python 3.13
-
 * Wed Apr 24 2024 Pavel Raiskup <praiskup@redhat.com> - 5.5-1
 - New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.5
 
diff --git a/sources b/sources
index f458908..30218a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (resalloc-5.11.tar.gz) = 73becebe671a59912006eb4b227c10f6ac7be91a91e94cff470ac6bb32eb4447ec905b1d151c5eeb54fdc6c2a6179f9b7d606bcf25c3f9caeb63bde171759ac3
+SHA512 (resalloc-5.5.tar.gz) = d555ab49825a238d6e06ab8feadb3dbac6bae5bede3b38aedcbf433001b9c9a2dfd27f6fadab7d3c9471ff1996e60e6a5124ef2da1ec51bf5d525244e30b71c7