diff --git a/SOURCES/cyrus-imapd-init.service b/SOURCES/cyrus-imapd-init.service
index 10823b7..3cecdea 100644
--- a/SOURCES/cyrus-imapd-init.service
+++ b/SOURCES/cyrus-imapd-init.service
@@ -9,4 +9,4 @@ ConditionPathExists=!/etc/pki/cyrus-imapd/cyrus-imapd-ca.pem
 Type=oneshot
 Group=mail
 RemainAfterExit=no
-ExecStart=/usr/bin/sscg --package cyrus-imapd --cert-file /etc/pki/cyrus-imapd/cyrus-imapd.pem --cert-key-file /etc/pki/cyrus-imapd/cyrus-imapd-key.pem --ca-file /etc/pki/cyrus-imapd/cyrus-imapd-ca.pem --cert-key-mode=0640 
+ExecStart=/usr/bin/sscg --cert-file /etc/pki/cyrus-imapd/cyrus-imapd.pem --cert-key-file /etc/pki/cyrus-imapd/cyrus-imapd-key.pem --ca-file /etc/pki/cyrus-imapd/cyrus-imapd-ca.pem --cert-key-mode=0640
diff --git a/SOURCES/cyrus-imapd.tmpfiles.conf b/SOURCES/cyrus-imapd.tmpfiles.conf
deleted file mode 100644
index 14a2791..0000000
--- a/SOURCES/cyrus-imapd.tmpfiles.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-d /run/cyrus        0750 cyrus mail -
-d /run/cyrus/db     0700 cyrus mail -
-d /run/cyrus/lock   0700 cyrus mail -
-d /run/cyrus/proc   0700 cyrus mail -
-d /run/cyrus/socket 0750 cyrus mail -
diff --git a/SOURCES/cyrus-imapd.sysusers b/SOURCES/systemd-sysusers.conf
similarity index 100%
rename from SOURCES/cyrus-imapd.sysusers
rename to SOURCES/systemd-sysusers.conf
diff --git a/SOURCES/systemd-tmpfiles.conf b/SOURCES/systemd-tmpfiles.conf
new file mode 100644
index 0000000..10f80a3
--- /dev/null
+++ b/SOURCES/systemd-tmpfiles.conf
@@ -0,0 +1,21 @@
+d /run/cyrus             0750 cyrus mail -
+d /run/cyrus/db          0700 cyrus mail -
+d /run/cyrus/lock        0700 cyrus mail -
+d /run/cyrus/proc        0700 cyrus mail -
+d /run/cyrus/socket      0750 cyrus mail -
+d /var/lib/imap          0750 cyrus mail -
+d /var/lib/imap/backup   0700 cyrus mail -
+d /var/lib/imap/db       0700 cyrus mail -
+d /var/lib/imap/log      0700 cyrus mail -
+d /var/lib/imap/meta     0700 cyrus mail -
+d /var/lib/imap/md5      0700 cyrus mail -
+d /var/lib/imap/msg      0700 cyrus mail -
+d /var/lib/imap/proc     0700 cyrus mail -
+d /var/lib/imap/ptclient 0700 cyrus mail -
+d /var/lib/imap/quota    0700 cyrus mail -
+d /var/lib/imap/rpm      0700 cyrus mail -
+d /var/lib/imap/sieve    0700 cyrus mail -
+d /var/lib/imap/socket   0750 cyrus mail -
+d /var/lib/imap/sync     0700 cyrus mail -
+d /var/lib/imap/user     0700 cyrus mail -
+d /var/spool/imap        0700 cyrus mail -
diff --git a/SPECS/cyrus-imapd.spec b/SPECS/cyrus-imapd.spec
index ac1f919..459f312 100644
--- a/SPECS/cyrus-imapd.spec
+++ b/SPECS/cyrus-imapd.spec
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 3.4.8
-Release: 2%{?dist}
+Release: 4%{?dist}
 Summary: A high-performance email, contacts and calendar server
 License: BSD
 URL: http://www.cyrusimap.org/
@@ -36,8 +36,8 @@ Source14: cyrus-imapd.cron-daily
 Source15: README.rpm
 Source16: cyrus-imapd.service
 Source17: cyrus-imapd-init.service
-Source18: cyrus-imapd.tmpfiles.conf
-Source19: cyrus-imapd.sysusers
+Source18: systemd-tmpfiles.conf
+Source19: systemd-sysusers.conf
 
 # A template config file for cassandane; we will substitute in varions values.
 Source81: cassandane.ini
@@ -813,6 +813,14 @@ fi
 
 
 %changelog
+* Fri Dec 12 2025 Martin Osvald <mosvald@redhat.com> - 3.4.8-4
+- Create directory structure under /var using tmpfiles.d
+  Resolves: RHEL-129881
+
+* Fri Dec 05 2025 Martin Osvald <mosvald@redhat.com> - 3.4.8-3
+- Remove sscg option --package from cyrus-imapd-init.service
+  Resolves: RHEL-132242
+
 * Tue Dec 10 2024 Joe Orton <jorton@redhat.com> - 3.4.8-2
 - tls: enable automatic DH parameter selection
   Resolves: RHEL-70762