diff --git a/gating.yaml b/gating.yaml
index 4ca9235..3442642 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -3,4 +3,4 @@ product_versions:
   - rhel-10
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
diff --git a/libservicelog.spec b/libservicelog.spec
index 75d6200..2ce4247 100644
--- a/libservicelog.spec
+++ b/libservicelog.spec
@@ -1,6 +1,6 @@
 Name:          libservicelog
 Version:       1.1.19
-Release:       13%{?dist}
+Release:       14%{?dist}
 Summary:       Servicelog Database and Library
 
 #v29_notify_gram.c v29_notify_gram.h are GPLv2+
@@ -8,10 +8,15 @@ License:       LGPL-2.0-only AND GPL-2.0-or-later
 
 URL:           https://github.com/power-ras/%{name}/releases
 Source:        https://github.com/power-ras/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
+# sysusers.d config file
+Source1:       libservicelog.sysusers.conf
 
 # Link with needed libraries
 Patch0: libservicelog-1.1.9-libs.patch
 
+# sysusers_create_compat macro
+BuildRequires: systemd-rpm-macros
+%{?sysusers_requires_compat}
 BuildRequires: sqlite-devel autoconf libtool bison librtas-devel flex
 BuildRequires: make
 
@@ -38,10 +43,6 @@ Contains header files for building with libservicelog.
 %setup -q
 %patch 0 -p1 -b .libs
 
-# Create a sysusers.d config file
-cat >libservicelog.sysusers.conf <<EOF
-g service -
-EOF
 
 %build
 autoreconf -fiv
@@ -57,11 +58,14 @@ make CFLAGS="$CFLAGS" %{?_smp_mflags}
 make install DESTDIR=%{buildroot}
 rm -f %{buildroot}%{_libdir}/*.la
 
-install -m0644 -D libservicelog.sysusers.conf %{buildroot}%{_sysusersdir}/libservicelog.conf
+install -m0644 -D %{SOURCE1} %{buildroot}%{_sysusersdir}/libservicelog.conf
 
 %check
 make check || true
 
+%pre
+%sysusers_create_compat %{SOURCE1}
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -82,6 +86,10 @@ make check || true
 
 
 %changelog
+* Thu Apr 10 2025 Than Ngo <than@redhat.com> - 1.1.19-14
+- Manual creation of users and groups for old release
+  Resolves: RHEL-86305
+
 * Tue Apr 08 2025 Than Ngo <than@redhat.com> - 1.1.19-13
 - Add sysusers.d config file to allow rpm to create users/groups automatically
   Resolves: RHEL-86305
diff --git a/libservicelog.sysusers.conf b/libservicelog.sysusers.conf
new file mode 100644
index 0000000..5c42ba9
--- /dev/null
+++ b/libservicelog.sysusers.conf
@@ -0,0 +1 @@
+g service -