diff --git a/avahi.spec b/avahi.spec
index 38db5c729f0a2b683d634e978ec65d5271e37ef4..c3743a1bac45295480a8caf0dcda949c1adc2f83 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -3,7 +3,7 @@
 
 Name:             avahi
 Version:          0.8
-Release:          21
+Release:          22
 Summary:          Avahi is a local network service discovery
 License:          LGPL-2.1-or-later AND LGPL-2.0-or-later AND BSD-2-Clause-Views AND MIT
 URL:              https://avahi.org
@@ -333,31 +333,25 @@ done
 %endif
 
 %pre
-%define gid_uid 70
-if ! getent group avahi > /dev/null ; then
-    groupadd -f -g %{gid_uid} -r avahi
-fi
-
+getent group avahi >/dev/null || groupadd -f -g 70 -r avahi
 if ! getent passwd avahi > /dev/null ; then
-  if ! getent passwd %{gid_uid} > /dev/null ; then
-    useradd -r -l -u %{gid_uid} -g avahi -d %{_localstatedir}/run/avahi-daemon -s /sbin/nologin -c "Avahi mDNS/DNS-SD Stack" avahi
+  if ! getent passwd 70 > /dev/null ; then
+    useradd -r -l -u 70 -g avahi -d %{_localstatedir}/run/avahi-daemon -s /sbin/nologin -c "Avahi mDNS/DNS-SD Stack" avahi
   else
     useradd -r -l -g avahi -d %{_localstatedir}/run/avahi-daemon -s /sbin/nologin -c "Avahi mDNS/DNS-SD Stack" avahi
   fi
 fi
+exit 0
 
-%define autoipd_gid_pid 170
-if ! getent group avahi-autoipd >/dev/null ; then
-    groupadd -f -g %{autoipd_gid_pid} -r avahi-autoipd
-fi
+%pre autoipd
+getent group avahi-autoipd >/dev/null || groupadd -f -g 170 -r avahi-autoipd
 if ! getent passwd avahi-autoipd > /dev/null ; then
-  if ! getent passwd %{autoipd_gid_pid} > /dev/null; then
-    useradd -r -u %{autoipd_gid_pid} -l -g avahi-autoipd -d %{_localstatedir}/lib/avahi-autoipd -s /sbin/nologin -c "Avahi IPv4LL Stack" avahi-autoipd
+  if ! getent passwd 170 > /dev/null; then
+    useradd -r -u 170 -l -g avahi-autoipd -d %{_localstatedir}/lib/avahi-autoipd -s /sbin/nologin -c "Avahi IPv4LL Stack" avahi-autoipd
   else
     useradd -r -l -g avahi-autoipd -d %{_localstatedir}/lib/avahi-autoipd -s /sbin/nologin -c "Avahi IPv4LL Stack" avahi-autoipd
   fi
 fi
-
 exit 0
 
 %preun
@@ -541,6 +535,9 @@ fi
 %{_mandir}/man?/*
 
 %changelog
+* Mon Apr 21 2025 Funda Wang <fundawang@yeah.net> - 0.8-22
+- move autoipd user creation into autoipd's pre section
+
 * Sun Aug 11 2024 Funda Wang <fundawang@yeah.net> - 0.8-21
 - fix wrongly splitted tools and ui-tools
 - cleanup spec