diff --git a/mysql.tmpfiles.d.in b/mysql.tmpfiles.d.in
index d2c4b31..097295c 100644
--- a/mysql.tmpfiles.d.in
+++ b/mysql.tmpfiles.d.in
@@ -1 +1,8 @@
 d @PID_FILE_DIR@ 0755 mysql mysql -
+
+# Rules for ephemeral file systems (ImageMode)
+d /var/lib/mysql 0755 mysql mysql -
+d /var/log/mysql 0750 mysql mysql -
+f /var/log/mysql/mysql.log 0640 mysql mysql -
+d /var/lib/mysql-files 0750 mysql mysql -
+d /var/lib/mysql-keyring 0700 mysql mysql -
diff --git a/mysql8.4.spec b/mysql8.4.spec
index bb59718..623c634 100644
--- a/mysql8.4.spec
+++ b/mysql8.4.spec
@@ -104,7 +104,7 @@ ExcludeArch: %{ix86}
 
 Name:             %{majorname}%{majorversion}
 Version:          %{package_version}
-Release:          1%{?with_debug:.debug}%{?dist}.alma.1
+Release:          2%{?with_debug:.debug}%{?dist}.alma.1
 Summary:          MySQL client programs and shared libraries
 URL:              http://www.mysql.com
 
@@ -674,6 +674,13 @@ install -D -p -m 644 %{_vpath_builddir}/scripts/mysql@.service %{buildroot}%{_un
 install -D -p -m 0644 %{_vpath_builddir}/scripts/mysql.tmpfiles.d %{buildroot}%{_tmpfilesdir}/%{daemon_name}.conf
 rm -r %{buildroot}%{_tmpfilesdir}/mysql.conf
 
+# Create a sysusers.d config file
+# We no longer enforce the hardcoded UID/GID 27
+mkdir -p %{buildroot}%{_sysusersdir}
+cat > %{buildroot}%{_sysusersdir}/%{name}.conf << EOF
+u mysql 27 'MariaDB and MySQL Server' %{dbdatadir} -
+EOF
+
 # helper scripts for service starting
 install -D -p -m 755 %{_vpath_builddir}/scripts/mysql-prepare-db-dir %{buildroot}%{_libexecdir}/mysql-prepare-db-dir
 install -p -m 755 %{_vpath_builddir}/scripts/mysql-wait-stop %{buildroot}%{_libexecdir}/mysql-wait-stop
@@ -993,11 +1000,15 @@ popd
 %{_libexecdir}/mysql-scripts-common
 
 %{_tmpfilesdir}/%{daemon_name}.conf
+%{_sysusersdir}/%{name}.conf
+
+# Remember to also update the mysql.tmpfiles.d.in file when updating these permissions
 %attr(0755,mysql,mysql) %dir %{dbdatadir}
 %attr(0750,mysql,mysql) %dir %{_localstatedir}/lib/mysql-files
 %attr(0700,mysql,mysql) %dir %{_localstatedir}/lib/mysql-keyring
 %attr(0755,mysql,mysql) %dir %{pidfiledir}
 %attr(0750,mysql,mysql) %dir %{logfiledir}
+
 %config(noreplace) %{logrotateddir}/%{daemon_name}
 
 %if %{with devel}
@@ -1133,9 +1144,12 @@ popd
 %endif
 
 %changelog
-* Fri Feb 13 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 8.4.8-1.alma.1
+* Wed Mar 04 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 8.4.8-2.alma.1
 - Add riscv64 support
 
+* Tue Feb 24 2026 Lukas Javorsky <ljavorsk@redhat.com> - 8.4.8-2
+- Revert to soft static allocation of MariaDB and MySQL sysusers.d files
+
 * Fri Jan 23 2026 Michal Schorm <mschorm@redhat.com> - 8.4.8-1
 - Rebase to 8.4.8