diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index 97a0c8fbda12b4f40b0956c542ffa3096ed57d52..1b467562d6ba4101847616599446f44b767a2e5d 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -9,7 +9,7 @@ Keystone is a Python implementation of the OpenStack \
 
 Name:           openstack-keystone
 Version:        16.0.2
-Release:        1
+Release:        2
 Summary:        OpenStack Identity Service
 License:        ASL 2.0
 URL:            http://keystone.openstack.org/
@@ -217,10 +217,7 @@ mv %{buildroot}%{python3_sitelib}/%{service}/locale %{buildroot}%{_datadir}/loca
 %find_lang %{service} --all-name
 
 %pre
-getent group keystone >/dev/null || groupadd -r --gid 163 keystone
-getent passwd keystone >/dev/null || \
-useradd --uid 163 -r -g keystone -d %{_sharedstatedir}/keystone -s /sbin/nologin \
--c "OpenStack Keystone Daemons" keystone
+%openstack_pre_user_group_create -u 163 keystone -g 163 keystone /sbin/nologin
 exit 0
 
 %post
@@ -278,6 +275,9 @@ chmod 660 %{_localstatedir}/log/keystone/keystone.log
 %endif
 
 %changelog
+* Sat Oct 8 2022 binshuozu <binshuo@isrc.iscas.ac.cn> - 16.0.2-2
+- Migrate to openstack-macros to create user & group
+
 * Fri Nov 05 2021 wangxiyuan <wangxiyuan1007@gmail.com> - 16.0.2-1
 - Support OpenStack Train release