diff --git a/gating.yaml b/gating.yaml
index c821aac..a7510b0 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-9
+  - rhel-10
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.general-kpatch.tier0.functional}
diff --git a/kpatch.spec b/kpatch.spec
index 1231fc4..71a57ad 100644
--- a/kpatch.spec
+++ b/kpatch.spec
@@ -2,7 +2,7 @@
 
 Name:		kpatch
 Version:	0.9.8
-Release:	1.3%{?dist}
+Release:	1.4%{?dist}
 Summary:	Dynamic kernel patch manager
 
 Group:		System Environment/Kernel
@@ -49,6 +49,7 @@ kpatch-build is a tool to build patches for kpatch.
 
 %package -n kpatch-runtime
 Summary:	Dynamic kernel patch manager
+BuildRequires:	make
 Requires:	bash kmod binutils
 Suggests:	kpatch-dnf
 Provides:	kpatch = %{version}-%{release}
@@ -75,23 +76,23 @@ kpatch-patch packages updates.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
 # Use this to apply upstream patches to kpatch
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
-%patch104 -p1
-%patch105 -p1
-%patch106 -p1
-%patch107 -p1
-%patch108 -p1
-%patch109 -p1
-%patch110 -p1
-%patch111 -p1
-%patch112 -p1
+%patch -P 100 -p1
+%patch -P 101 -p1
+%patch -P 102 -p1
+%patch -P 103 -p1
+%patch -P 104 -p1
+%patch -P 105 -p1
+%patch -P 106 -p1
+%patch -P 107 -p1
+%patch -P 108 -p1
+%patch -P 109 -p1
+%patch -P 110 -p1
+%patch -P 111 -p1
+%patch -P 112 -p1
 
 %setup -D -T -a 1
 
@@ -134,9 +135,16 @@ echo "To enable automatic kpatch-patch subscription, run:"
 echo -e "\t$ dnf kpatch auto"
 
 %changelog
+* Wed Jun 12 2024 Davide Cavalca <dcavalca@centosproject.org> - 0.9.8-1.4
+- Merge upstream changes for c10s into Hyperscale
+
 * Fri May 31 2024 Davide Cavalca <dcavalca@centosproject.org> - 0.9.8-1.3
 - Backport two more fixes and refresh patches
 
+* Fri May 3 2024 Joe Lawrence <joe.lawrence@redhat.com> 0.9.7-3
+- Fix cs10 build error on missing `make` command
+- Fix "warning: %%patchN is deprecated"
+
 * Fri Oct 27 2023 Davide Cavalca <dcavalca@centosproject.org> - 0.9.8-1.2
 - Backport three upstream fixes