diff --git a/backport-docker-compose-use-docker-compose-when-not-using-old.patch b/backport-docker-compose-use-docker-compose-when-not-using-old.patch
new file mode 100644
index 0000000000000000000000000000000000000000..6caf6058569f440ed63d24d2d247ed1afe830d00
--- /dev/null
+++ b/backport-docker-compose-use-docker-compose-when-not-using-old.patch
@@ -0,0 +1,33 @@
+From 33d73b0113b3acf77b8346ceac1bfdcf3cdaebe6 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Fri, 13 Sep 2024 09:41:20 +0200
+Subject: [PATCH 02/10] docker-compose: use "docker compose" when not using
+ older docker-compose command
+
+---
+ heartbeat/docker-compose | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/heartbeat/docker-compose b/heartbeat/docker-compose
+index 696f3a36..9d11ee4b 100755
+--- a/heartbeat/docker-compose
++++ b/heartbeat/docker-compose
+@@ -113,9 +113,15 @@ exit $OCF_SUCCESS
+ if [ -r "$OCF_RESKEY_binpath" -a -x "$OCF_RESKEY_binpath" ]; then
+ 	COMMAND="$OCF_RESKEY_binpath"
+ else
++	OCF_RESKEY_binpath="$OCF_RESKEY_binpath_default"
+ 	COMMAND="$OCF_RESKEY_binpath_default"
+ fi
+ 
++if ! $COMMAND -v 2>&1 | grep -q "^docker-compose version 1\."; then
++	OCF_RESKEY_binpath="${OCF_RESKEY_binpath%%-compose}"
++	COMMAND="$OCF_RESKEY_binpath compose"
++fi
++
+ DIR="$OCF_RESKEY_dirpath"
+ PRE="$(echo ${DIR##*/} | tr A-Z a-z | sed 's/[^a-z0-9]//g')"
+ YML="$OCF_RESKEY_ymlfile"
+-- 
+2.25.1
+
diff --git a/backport-nfsserver-also-stop-rpc-statd-for-nfsv4_only-to-avoi.patch b/backport-nfsserver-also-stop-rpc-statd-for-nfsv4_only-to-avoi.patch
new file mode 100644
index 0000000000000000000000000000000000000000..eff1e23d52595a68bf33cecb2430c806cbdba6c1
--- /dev/null
+++ b/backport-nfsserver-also-stop-rpc-statd-for-nfsv4_only-to-avoi.patch
@@ -0,0 +1,41 @@
+From 38eaf00bc81af7530c56eba282918762a47a9326 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Thu, 19 Sep 2024 13:01:53 +0200
+Subject: [PATCH 06/10] nfsserver: also stop rpc-statd for nfsv4_only to avoid
+ stop failing in some cases
+
+E.g. nfs_no_notify=true nfsv4_only=true nfs_shared_infodir=/nfsmq/nfsinfo would cause a "Failed to unmount a bind mount" error
+---
+ heartbeat/nfsserver | 16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/heartbeat/nfsserver b/heartbeat/nfsserver
+index 5793d7a7..fd9268af 100755
+--- a/heartbeat/nfsserver
++++ b/heartbeat/nfsserver
+@@ -947,15 +947,13 @@ nfsserver_stop ()
+ 			sleep 1
+ 		  done
+ 
+-		  if ! ocf_is_true "$OCF_RESKEY_nfsv4_only"; then
+-			nfs_exec stop rpc-statd > /dev/null 2>&1
+-			ocf_log info "Stop: rpc-statd"
+-			rpcinfo -t localhost 100024 > /dev/null 2>&1
+-			rc=$?
+-			if [ "$rc" -eq "0" ]; then
+-				ocf_exit_reason "Failed to stop rpc-statd"
+-				return $OCF_ERR_GENERIC
+-			fi
++		  nfs_exec stop rpc-statd > /dev/null 2>&1
++		  ocf_log info "Stop: rpc-statd"
++		  rpcinfo -t localhost 100024 > /dev/null 2>&1
++		  rc=$?
++		  if [ "$rc" -eq "0" ]; then
++		  	ocf_exit_reason "Failed to stop rpc-statd"
++		  	return $OCF_ERR_GENERIC
+ 		  fi
+ 
+ 		  nfs_exec stop nfs-idmapd > /dev/null 2>&1
+-- 
+2.25.1
+
diff --git a/resource-agents.spec b/resource-agents.spec
index 0ee100967981279be0fe05b6420f2e789fb18e37..4b5636fc2b193ba42e6d7d5021c6225f92eb94ec 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -1,7 +1,7 @@
 Name:                resource-agents
 Summary:             Open Source HA Reusable Cluster Resource Scripts
 Version:             4.15.1
-Release:             4
+Release:             5
 License:             GPLv2+ and LGPLv2+
 URL:                 https://github.com/ClusterLabs/resource-agents
 Source0:             https://github.com/ClusterLabs/resource-agents/archive/v%{version}.tar.gz
@@ -12,7 +12,8 @@ Patch2:              backport-powervs-subnet-Modify-gathering-of-Apikey-calculat
 Patch3:              backport-findif.sh-ignore-unreachable-blackhole-and-prohibit-.patch
 Patch4:              backport-powervs-subnet-Add-optional-argument-route_table-196.patch
 Patch5:              backport-IPsrcaddr-specify-dev-for-default-route-as-e.g.-fe80.patch
-
+Patch6:              backport-docker-compose-use-docker-compose-when-not-using-old.patch
+Patch7:              backport-nfsserver-also-stop-rpc-statd-for-nfsv4_only-to-avoi.patch
 Obsoletes:           heartbeat-resources <= %{version}
 Provides:            heartbeat-resources = %{version}
 BuildRequires:       automake autoconf pkgconfig gcc perl-interpreter perl-generators python3-devel
@@ -110,6 +111,10 @@ export CFLAGS="$(echo '%{optflags}')"
 %{_mandir}/man8/{ocf-tester.8*,ldirectord.8*}
 
 %changelog
+* Wed Oct 23 2024 bixiaoyan <bixiaoyan@kylinos.cn> - 4.15.1-5
+- docker-compose: use "docker compose" when not using older docker-compose command
+- nfsserver: also stop rpc-statd for nfsv4_only to avoid stop failing in some cases
+
 * Mon Oct 21 2024 liupei <liupei@kylinos.cn> - 4.15.1-4
 - powervs-subnet: Add optional argument route_table
 - IPsrcaddr: specify dev for default route, as e.g. fe80:: routes can be present on multiple interfaces