diff --git a/.gitignore b/.gitignore
index db3d9c8..a62c6ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/insights-client-3.1.5.tar.gz
+SOURCES/insights-client-3.1.7.tar.gz
diff --git a/.insights-client.metadata b/.insights-client.metadata
index 6bbdb70..85c6d92 100644
--- a/.insights-client.metadata
+++ b/.insights-client.metadata
@@ -1 +1 @@
-b87eeddf0612cdf44327e566c6045b4c5e3b936a SOURCES/insights-client-3.1.5.tar.gz
+0862807b4cb4e8bcbb6bad73e4d689da8f320bf8 SOURCES/insights-client-3.1.7.tar.gz
diff --git a/SOURCES/0001-DOWNSTREAM-ONLY-remove-cgroupv2-vars-in-systemd-conf.patch b/SOURCES/0001-DOWNSTREAM-ONLY-remove-cgroupv2-vars-in-systemd-conf.patch
new file mode 100644
index 0000000..5a1bb72
--- /dev/null
+++ b/SOURCES/0001-DOWNSTREAM-ONLY-remove-cgroupv2-vars-in-systemd-conf.patch
@@ -0,0 +1,23 @@
+From 527cdf173a5c863622352e9f58a47cd7a18fac65 Mon Sep 17 00:00:00 2001
+From: ahitacat <ahitacat@redhat.com>
+Date: Wed, 23 Feb 2022 11:27:18 +0100
+Subject: [PATCH] [DOWNSTREAM-ONLY] remove cgroupv2 vars in systemd configfiles
+
+Resolves: RHBZ#1993731
+---
+ data/systemd/insights-client-boot.service | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/systemd/insights-client-boot.service b/data/systemd/insights-client-boot.service
+index 44eb46c..0d44ddb 100644
+--- a/data/systemd/insights-client-boot.service
++++ b/data/systemd/insights-client-boot.service
+@@ -19,8 +19,6 @@ ExecStart=/usr/bin/insights-client --retry 3
+ Restart=no
+ WatchdogSec=900
+ CPUQuota=30%
+-MemoryHigh=1G
+-MemoryMax=2G
+ MemoryLimit=2G
+ TasksMax=300
+ BlockIOWeight=100
diff --git a/SPECS/insights-client.spec b/SPECS/insights-client.spec
index 30f8042..2d821e3 100644
--- a/SPECS/insights-client.spec
+++ b/SPECS/insights-client.spec
@@ -3,9 +3,14 @@
 
 Name:                   insights-client
 Summary:                Uploads Insights information to Red Hat on a periodic basis
-Version:                3.1.5
+Version:                3.1.7
 Release:                1%{?dist}
 Source0:                https://github.com/redhatinsights/insights-client/releases/download/v%{version}/insights-client-%{version}.tar.gz
+#
+# patches_ignore=DROP-IN-RPM
+# patches_base=3.1.7
+Patch0001: 0001-DOWNSTREAM-ONLY-remove-cgroupv2-vars-in-systemd-conf.patch
+
 Epoch:                  0
 License:                GPLv2+
 URL:                    http://cloud.redhat.com/insights
@@ -79,10 +84,6 @@ if [ $1 -eq 0 ]; then
 fi
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
 %config(noreplace) %{_sysconfdir}/insights-client/*.conf
 %{_sysconfdir}/insights-client/.fallback.json*
@@ -103,6 +104,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Mar 31 2022 Link Dupont <link@sub-pop.net> 0:3.1.7-1
+- Update to 3.1.7 (RHBZ#2047819)
+
 * Fri Jun 25 2021 Jeremy Crafts <jcrafts@redhat.com> - 3.1.5-1
 - Fix metrics auth and connection issues (RHBZ#1916455)