diff --git a/SOURCES/0001-fix-remove-PathExists-condition-from-unit.patch b/SOURCES/0001-fix-remove-PathExists-condition-from-unit.patch
index 7698e4e..e291cf0 100644
--- a/SOURCES/0001-fix-remove-PathExists-condition-from-unit.patch
+++ b/SOURCES/0001-fix-remove-PathExists-condition-from-unit.patch
@@ -1,4 +1,4 @@
-From ec3502eaef144838bec85dfed497de7a404a66bf Mon Sep 17 00:00:00 2001
+From 7caac84ed4119ff6013585d187720dff3fdd73fe Mon Sep 17 00:00:00 2001
 From: Link Dupont <link@sub-pop.net>
 Date: Mon, 31 Jan 2022 10:53:04 -0500
 Subject: [PATCH] fix: remove PathExists condition from unit
@@ -7,6 +7,7 @@ The PathExists= directive in the Path section of the
 insights-client-results.path unit is unnecessary.
 
 Fixes: RHBZ#2022191
+(cherry picked from commit ec3502eaef144838bec85dfed497de7a404a66bf)
 ---
  data/systemd/insights-client-results.path.in | 1 -
  1 file changed, 1 deletion(-)
@@ -23,6 +24,3 @@ index be53998..928296b 100644
  PathModified=@pkgsysconfdir@/.lastupload
  
  [Install]
--- 
-2.34.1
-
diff --git a/SPECS/insights-client.spec b/SPECS/insights-client.spec
index c11c9c4..75dcc28 100644
--- a/SPECS/insights-client.spec
+++ b/SPECS/insights-client.spec
@@ -3,7 +3,7 @@
 Name:                   insights-client
 Summary:                Uploads Insights information to Red Hat on a periodic basis
 Version:                3.1.7
-Release:                5%{?dist}
+Release:                8%{?dist}
 Source0:                https://github.com/RedHatInsights/insights-client/releases/download/v%{version}/insights-client-%{version}.tar.gz
 Epoch:                  0
 License:                GPLv2+
@@ -11,7 +11,10 @@ URL:                    https://console.redhat.com/insights
 Group:                  Applications/System
 Vendor:                 Red Hat, Inc.
 
-Patch0:                 0001-fix-remove-PathExists-condition-from-unit.patch
+#
+# patches_ignore=DROP-IN-RPM
+# patches_base=3.1.7
+Patch0001: 0001-fix-remove-PathExists-condition-from-unit.patch
 
 Provides: redhat-access-insights = %{version}-%{release}%{?dist}
 
@@ -55,6 +58,10 @@ Sends insightful information to Red Hat for automated analysis
 %{make_install}
 %{__install} -D -m 644 %{_builddir}/%{name}-%{version}/data/insights-client.motd %{buildroot}/%{_sysconfdir}/insights-client/insights-client.motd
 
+# Create different insights directories in /var
+mkdir -p %{buildroot}%{_localstatedir}/log/insights-client/
+mkdir -p %{buildroot}%{_localstatedir}/lib/insights/
+mkdir -p %{buildroot}%{_localstatedir}/cache/insights/
 
 %post
 %systemd_post %{name}.timer
@@ -110,7 +117,9 @@ rm -rf %{buildroot}
 %{python3_sitelib}/insights_client/
 %{_defaultdocdir}/%{name}
 %{_presetdir}/*.preset
-
+%attr(700,root,root) %dir %{_localstatedir}/log/insights-client/
+%attr(750,root,root) %dir %{_localstatedir}/cache/insights/
+%attr(750,root,root) %dir %{_localstatedir}/lib/insights/
 
 %doc
 %defattr(-, root, root)
@@ -119,6 +128,16 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Apr 08 2022 Gael Chamoulaud <gchamoul@redhat.com> 0:3.1.7-8
+- Add several insights /var directories in files directives
+
+* Mon Mar 14 2022 Gael Chamoulaud (Strider) <gchamoul@redhat.com> 0:3.1.7-7
+- Update patches
+
+* Mon Mar 14 2022 Gaël Chamoulaud <gchamoul@redhat.com> - 3.1.7-6
+- Update patches
+- Add DROP-IN-RPM patches_ignore rule for rdopkg
+
 * Wed Feb 16 2022 Gaël Chamoulaud <gchamoul@redhat.com> - 3.1.7-5
 - Restore insights-client-boot.service preun/postun (RHBZ#2024836)