diff --git a/.gitignore b/.gitignore
index 2f984e3..2a86409 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/ClusterLabs-resource-agents-e76b7d3a.tar.gz
+SOURCES/ClusterLabs-resource-agents-fd0720f7.tar.gz
 SOURCES/sap_cluster_connector-0015fe2.tar.gz
diff --git a/.resource-agents-sap.metadata b/.resource-agents-sap.metadata
index a5b33e8..230873d 100644
--- a/.resource-agents-sap.metadata
+++ b/.resource-agents-sap.metadata
@@ -1,2 +1,2 @@
-b1c1e65d690d94e080319217486f8dcd248b2a2a SOURCES/ClusterLabs-resource-agents-e76b7d3a.tar.gz
+3b517ecdbe2103df77813050e5c998e102c5de7e SOURCES/ClusterLabs-resource-agents-fd0720f7.tar.gz
 731c683ecc63b50fbc0823170e966b74ec2a0f51 SOURCES/sap_cluster_connector-0015fe2.tar.gz
diff --git a/SPECS/resource-agents-sap.spec b/SPECS/resource-agents-sap.spec
index db375de..2b3126e 100644
--- a/SPECS/resource-agents-sap.spec
+++ b/SPECS/resource-agents-sap.spec
@@ -20,7 +20,7 @@
 #
 
 %global upstream_prefix ClusterLabs-resource-agents
-%global upstream_version e76b7d3a
+%global upstream_version fd0720f7
 
 %global sap_script_prefix sap_cluster_connector
 %global sap_script_hash 0015fe2
@@ -47,8 +47,8 @@
 
 Name:		resource-agents-sap
 Summary:	SAP cluster resource agents
-Version:	4.8.0
-Release:	2%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.1
+Version:	4.10.0
+Release:	2%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 Source0:	%{upstream_prefix}-%{upstream_version}.tar.gz
@@ -158,16 +158,16 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 
 %files
 %defattr(-,root,root)
-/usr/lib/ocf/resource.d/heartbeat/SAP*
-/usr/lib/ocf/lib/heartbeat/sap*
+%{_usr}/lib/ocf/resource.d/heartbeat/SAP*
+%{_usr}/lib/ocf/lib/heartbeat/sap*
 %{_mandir}/man7/*SAP*
 %{_sbindir}/sap_redhat_cluster_connector
 
 %exclude /etc
 %exclude /usr/include
-%exclude /usr/lib/debug
-%exclude /usr/lib/systemd
-%exclude /usr/lib/tmpfiles.d
+%exclude %{_usr}/lib/debug
+%exclude %{_usr}/lib/systemd
+%exclude %{_usr}/lib/tmpfiles.d
 %exclude /usr/libexec/heartbeat
 %exclude /usr/sbin/ldirectord
 %exclude /usr/sbin/ocf*
@@ -176,6 +176,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 %exclude /usr/src
 
 %changelog
+* Mon Nov 22 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-2
+- Rebase to resource-agents 4.10.0 upstream release.
+
+  Resolves: rhbz#2024660
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 4.8.0-2.1
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688