diff --git a/frr-tmpfiles.conf b/frr-tmpfiles.conf
index c1613b2..89d6865 100644
--- a/frr-tmpfiles.conf
+++ b/frr-tmpfiles.conf
@@ -1 +1,2 @@
 d /run/frr 0755 frr frr -
+d /var/log/frr 0755 frr frr
diff --git a/frr.spec b/frr.spec
index 4be1838..e599e68 100644
--- a/frr.spec
+++ b/frr.spec
@@ -7,7 +7,7 @@
 
 Name: frr
 Version: 8.5.3
-Release: 11%{?checkout}%{?dist}
+Release: 12%{?checkout}%{?dist}
 Summary: Routing daemon
 License: GPLv2+
 URL: http://www.frrouting.org
@@ -153,8 +153,7 @@ bzip2 -9 selinux/%{name}.pp
 
 %install
 mkdir -p %{buildroot}/etc/{frr,rc.d/init.d,sysconfig,logrotate.d,pam.d,default} \
-         %{buildroot}/var/log/frr %{buildroot}%{_infodir} \
-         %{buildroot}%{_unitdir}
+         %{buildroot}%{_infodir} %{buildroot}%{_unitdir}
 
 mkdir -p -m 0755 %{buildroot}%{_libdir}/frr
 mkdir -p %{buildroot}%{_tmpfilesdir}
@@ -261,7 +260,6 @@ make check PYTHON=%{__python3}
 %license COPYING
 %doc doc/mpls
 %dir %attr(750,frr,frr) %{_sysconfdir}/frr
-%dir %attr(755,frr,frr) /var/log/frr
 %dir %attr(755,frr,frr) /run/frr
 %{_infodir}/*info*
 %{_mandir}/man*/*
@@ -289,6 +287,9 @@ make check PYTHON=%{__python3}
 %endif
 
 %changelog
+* Fri Jan 16 2026 Michal Ruprich <mruprich@redhat.com> - 8.5.3-12
+- Resolves: RHEL-137180 - Files under /var are not properly created in image-mode
+
 * Wed Oct 29 2025 Michal Ruprich <mruprich@redhat.com> - 8.5.3-11
 - Resolves: RHEL-64427 - FRR ignores kernel routes from the system
 
diff --git a/plans.fmf b/plans.fmf
index 6d03d85..076916f 100644
--- a/plans.fmf
+++ b/plans.fmf
@@ -5,40 +5,34 @@ environment+:
   plan:
     import:
       url: https://gitlab.com/redhat/centos-stream/tests/frr.git
-      name: /plans/tier1/internal
       name: /plans/frr/tier1/internal
 
 /tier1-public:
   plan:
     import:
       url: https://gitlab.com/redhat/centos-stream/tests/frr.git
-      name: /plans/tier1/public
       name: /plans/frr/tier1/public
 
 /tier2-tier3-internal:
   plan:
     import:
       url: https://gitlab.com/redhat/centos-stream/tests/frr.git
-      name: /plans/tier2-tier3/internal
       name: /plans/frr/tier2-tier3/internal
 
 /tier2-tier3-public:
   plan:
     import:
       url: https://gitlab.com/redhat/centos-stream/tests/frr.git
-      name: /plans/tier2-tier3/public
       name: /plans/frr/tier2-tier3/public
 
 /others-internal:
   plan:
     import:
       url: https://gitlab.com/redhat/centos-stream/tests/frr.git
-      name: /plans/others/internal
       name: /plans/frr/others/internal
 
 /others-public:
   plan:
     import:
       url: https://gitlab.com/redhat/centos-stream/tests/frr.git
-      name: /plans/others/public
-      name: /plans/frr/others/public
\ No newline at end of file
+      name: /plans/frr/others/public