diff --git a/bz2189243-Filesystem-improve-stop-action.patch b/bz2189243-Filesystem-1-improve-stop-action.patch
similarity index 100%
rename from bz2189243-Filesystem-improve-stop-action.patch
rename to bz2189243-Filesystem-1-improve-stop-action.patch
diff --git a/bz2189243-Filesystem-2-fix-incorrect-parameter-types.patch b/bz2189243-Filesystem-2-fix-incorrect-parameter-types.patch
new file mode 100644
index 0000000..9f61043
--- /dev/null
+++ b/bz2189243-Filesystem-2-fix-incorrect-parameter-types.patch
@@ -0,0 +1,49 @@
+From 7056635f3f94c1bcaaa5ed5563dc3b0e9f6749e0 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Tue, 18 Jul 2023 14:12:27 +0200
+Subject: [PATCH] Filesystem: dont use boolean type for non-boolean parameters
+
+---
+ heartbeat/Filesystem | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
+index ee55a4843..b9aae8d50 100755
+--- a/heartbeat/Filesystem
++++ b/heartbeat/Filesystem
+@@ -269,7 +269,7 @@ fuser cli tool. fuser is known to perform operations that can potentially
+ block if unresponsive nfs mounts are in use on the system.
+ </longdesc>
+ <shortdesc lang="en">Kill processes before unmount</shortdesc>
+-<content type="boolean" default="${OCF_RESKEY_force_unmount_default}" />
++<content type="string" default="${OCF_RESKEY_force_unmount_default}" />
+ </parameter>
+ 
+ <parameter name="term_signals">
+@@ -277,7 +277,7 @@ block if unresponsive nfs mounts are in use on the system.
+ Signals (names or numbers, whitespace separated) to send processes during graceful termination phase in stop-action.
+ </longdesc>
+ <shortdesc lang="en">Signals (names or numbers, whitespace separated) to send processes during graceful termination phase in stop-action</shortdesc>
+-<content type="boolean" default="${OCF_RESKEY_term_signals_default}" />
++<content type="string" default="${OCF_RESKEY_term_signals_default}" />
+ </parameter>
+ 
+ <parameter name="kill_signals">
+@@ -285,7 +285,7 @@ Signals (names or numbers, whitespace separated) to send processes during gracef
+ Signals (names or numbers, whitespace separated) to send processes during forceful killing phase in stop-action.
+ </longdesc>
+ <shortdesc lang="en">Signals (names or numbers, whitespace separated) to send processes during forceful killing phase in stop-action</shortdesc>
+-<content type="boolean" default="${OCF_RESKEY_kill_signals_default}" />
++<content type="string" default="${OCF_RESKEY_kill_signals_default}" />
+ </parameter>
+ 
+ <parameter name="signal_delay">
+@@ -293,7 +293,7 @@ Signals (names or numbers, whitespace separated) to send processes during forcef
+ How many seconds to wait after sending term/kill signals to processes in stop-action.
+ </longdesc>
+ <shortdesc lang="en">How many seconds to wait after sending term/kill signals to processes in stop-action</shortdesc>
+-<content type="boolean" default="${OCF_RESKEY_kill_signal_delay}" />
++<content type="string" default="${OCF_RESKEY_kill_signal_delay}" />
+ </parameter>
+ 
+ </parameters>
diff --git a/resource-agents.spec b/resource-agents.spec
index b7e2c3f..2e1a8cd 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -69,7 +69,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.9.0
-Release:	45%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	46%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -145,7 +145,8 @@ Patch53:	bz2181019-azure-events-2-improve-logic.patch
 Patch54:	bz2183152-Filesystem-fail-efs-utils-not-installed.patch
 Patch55:	bz2039692-mysql-2-fix-demoted-score-bounce.patch
 Patch56:	bz2040110-IPaddr2-IPsrcaddr-2-fix-table-parameter.patch
-Patch57:	bz2189243-Filesystem-improve-stop-action.patch
+Patch57:	bz2189243-Filesystem-1-improve-stop-action.patch
+Patch58:	bz2189243-Filesystem-2-fix-incorrect-parameter-types.patch
 
 # bundle patches
 Patch1000:	7-gcp-bundled.patch
@@ -383,6 +384,7 @@ exit 1
 %patch55 -p1
 %patch56 -p1
 %patch57 -p1
+%patch58 -p1
 
 chmod 755 heartbeat/nova-compute-wait
 chmod 755 heartbeat/NovaEvacuate
@@ -958,7 +960,7 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
-* Wed Jul 12 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-45
+* Tue Jul 18 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-46
 - Filesystem: improve stop-action and allow setting term/kill signals
   and signal_delay for large filesystems