diff --git a/bacula.spec b/bacula.spec
index 8a1d454..1722745 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -9,7 +9,7 @@
 
 Name:               bacula
 Version:            11.0.1
-Release:            5%{?dist}
+Release:            6%{?dist}
 Summary:            Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:            AGPLv3 with exceptions
@@ -29,6 +29,8 @@ Source15:           %{name}-fd.sysconfig
 Source16:           %{name}-dir.sysconfig
 Source17:           %{name}-sd.sysconfig
 Source19:           https://salsa.debian.org/bacula-team/bacula/-/raw/master/debian/additions/bacula-tray-monitor.png#/bacula-tray-monitor.png
+Source20:           %{name}.sysusers.conf
+Source21:           %{name}.tmpfiles.conf
 
 Patch1:             %{name}-openssl.patch
 Patch2:             %{name}-queryfile.patch
@@ -54,6 +56,8 @@ Patch15:            %{name}-use-crypto-from-openssl.patch
 BuildRequires:      desktop-file-utils
 BuildRequires:      perl-generators
 BuildRequires:      sed
+BuildRequires:      systemd-rpm-macros
+%{?sysusers_requires_compat}
 
 BuildRequires:      autoconf
 BuildRequires:      automake
@@ -131,7 +135,7 @@ Summary:            Common Bacula files
 Provides:           group(%username) = %uid
 Provides:           user(%username) = %uid
 Requires:           bacula-libs%{?_isa} = %{version}-%{release}
-Requires(pre):      shadow-utils
+%{?sysusers_requires_compat}
 Requires(postun):   shadow-utils
 
 %description common
@@ -428,6 +432,10 @@ chmod 755 %{buildroot}%{_libdir}/%{name}/*
 chmod 755 %{buildroot}%{_libexecdir}/bacula/*
 chmod 644 %{buildroot}%{_libexecdir}/bacula/btraceback.*
 
+# Install sysusers and tmpfiles configs
+install -m0644 -D %{SOURCE20} %{buildroot}%{_sysusersdir}/bacula.conf
+install -m0644 -D %{SOURCE21} %{buildroot}%{_tmpfilesdir}/bacula.conf
+
 %ldconfig_scriptlets libs
 
 %post libs-sql
@@ -459,10 +467,7 @@ fi
 %ldconfig_postun libs-sql
 
 %pre common
-getent group %username >/dev/null || groupadd -g %uid -r %username &>/dev/null || :
-getent passwd %username >/dev/null || useradd -u %uid -r -s /sbin/nologin \
-    -d /var/spool/bacula -M -c 'Bacula Backup System' -g %username %username &>/dev/null || :
-exit 0
+%sysusers_create_compat %{SOURCE20}
 
 %post client
 %systemd_post %{name}-fd.service
@@ -527,6 +532,8 @@ exit 0
 %{_libexecdir}/%{name}/btraceback.mdb
 %{_mandir}/man8/btraceback.8*
 %{_sbindir}/btraceback
+%{_sysusersdir}/bacula.conf
+%{_tmpfilesdir}/bacula.conf
 
 %files director
 %doc updatedb examples/sample-query.sql
@@ -650,6 +657,9 @@ exit 0
 %endif
 
 %changelog
+* Fri May 30 2025 Lukáš Zaoral <lzaoral@redhat.com> - 11.0.1-6
+- fix bacula compatibility with Image Mode (RHEL-6862)
+
 * Tue Feb 15 2022 Pavel Cahyna <pcahyna@redhat.com> - 11.0.1-5
 - Make nagios-plugin build conditional and disabled on RHEL to avoid
   generating this subpackage that has missing dependencies
diff --git a/bacula.sysusers.conf b/bacula.sysusers.conf
new file mode 100644
index 0000000..86f5cbb
--- /dev/null
+++ b/bacula.sysusers.conf
@@ -0,0 +1 @@
+u bacula 133 'Bacula Backup System' /var/spool/bacula -
diff --git a/bacula.tmpfiles.conf b/bacula.tmpfiles.conf
new file mode 100644
index 0000000..07d7813
--- /dev/null
+++ b/bacula.tmpfiles.conf
@@ -0,0 +1,2 @@
+d /var/log/bacula   0750 bacula bacula -
+d /var/spool/bacula 0750 bacula bacula -