diff --git a/RHEL-85048-tomcat-fix-CATALINA_PID-not-set-and-parameter-defaults.patch b/RHEL-85048-tomcat-fix-CATALINA_PID-not-set-and-parameter-defaults.patch
new file mode 100644
index 0000000..fa236bb
--- /dev/null
+++ b/RHEL-85048-tomcat-fix-CATALINA_PID-not-set-and-parameter-defaults.patch
@@ -0,0 +1,72 @@
+From f6a5f38405a93ab88e887aa657ee79593d1a4485 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Wed, 26 Mar 2025 09:48:06 +0100
+Subject: [PATCH 1/2] tomcat: fix CATALINA_PID not set issue
+
+---
+ heartbeat/tomcat | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/heartbeat/tomcat b/heartbeat/tomcat
+index fa2715140b..6d47980296 100755
+--- a/heartbeat/tomcat
++++ b/heartbeat/tomcat
+@@ -695,10 +695,12 @@ CATALINA_BASE="${OCF_RESKEY_catalina_base-${OCF_RESKEY_catalina_home}}"
+ CATALINA_OUT="${OCF_RESKEY_catalina_out}"
+ 
+ CATALINA_PID=$OCF_RESKEY_catalina_pid
+-if [ -z "$CATALINA_PID" ] && [ "$__OCF_ACTION" = "start" ]; then
+-	mkdir -p "${HA_RSCTMP}/${TOMCAT_NAME}_tomcatstate/"
+-	if [ "${RESOURCE_TOMCAT_USER}" != "root" ]; then
+-		chown ${RESOURCE_TOMCAT_USER} "${HA_RSCTMP}/${TOMCAT_NAME}_tomcatstate/"
++if [ -z "$CATALINA_PID" ]; then
++	if [ "$__OCF_ACTION" = "start" ]; then
++		mkdir -p "${HA_RSCTMP}/${TOMCAT_NAME}_tomcatstate/"
++		if [ "${RESOURCE_TOMCAT_USER}" != "root" ]; then
++			chown ${RESOURCE_TOMCAT_USER} "${HA_RSCTMP}/${TOMCAT_NAME}_tomcatstate/"
++		fi
+ 	fi
+ 	CATALINA_PID="${HA_RSCTMP}/${TOMCAT_NAME}_tomcatstate/catalina.pid"
+ fi
+
+From b0da375699ebfa544e6e4a13eae554af3e7d65c9 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Fri, 28 Mar 2025 10:50:17 +0100
+Subject: [PATCH 2/2] tomcat: fix catalina_base and catalina_out parameter
+ defaults
+
+---
+ heartbeat/tomcat | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/heartbeat/tomcat b/heartbeat/tomcat
+index 6d47980296..1e8f216384 100755
+--- a/heartbeat/tomcat
++++ b/heartbeat/tomcat
+@@ -650,7 +650,6 @@ OCF_RESKEY_statusurl_default="http://127.0.0.1:8080"
+ OCF_RESKEY_max_stop_time_default=""
+ OCF_RESKEY_java_home_default=""
+ OCF_RESKEY_java_opts_default=""
+-OCF_RESKEY_catalina_out_default="${OCF_RESKEY_catalina_base-${OCF_RESKEY_catalina_home}}/logs/catalina.out"
+ OCF_RESKEY_catalina_pid_default=""
+ OCF_RESKEY_tomcat_start_script_default="${TOMCAT_START_SCRIPT}"
+ OCF_RESKEY_tomcat_start_opts_default=""
+@@ -670,7 +669,6 @@ OCF_RESKEY_logging_manager_default=""
+ : ${OCF_RESKEY_max_stop_time=${OCF_RESKEY_max_stop_time_default}}
+ : ${OCF_RESKEY_java_home=${OCF_RESKEY_java_home_default}}
+ : ${OCF_RESKEY_java_opts=${OCF_RESKEY_java_opts_default}}
+-: ${OCF_RESKEY_catalina_out=${OCF_RESKEY_catalina_out_default}}
+ : ${OCF_RESKEY_catalina_pid=${OCF_RESKEY_catalina_pid_default}}
+ : ${OCF_RESKEY_tomcat_start_script=${OCF_RESKEY_tomcat_start_script_default}}
+ : ${OCF_RESKEY_tomcat_start_opts=${OCF_RESKEY_tomcat_start_opts_default}}
+@@ -691,7 +689,9 @@ RESOURCE_STATUSURL="${OCF_RESKEY_statusurl}"
+ JAVA_HOME="${OCF_RESKEY_java_home}"
+ JAVA_OPTS="${OCF_RESKEY_java_opts}"
+ CATALINA_HOME="${OCF_RESKEY_catalina_home}"
+-CATALINA_BASE="${OCF_RESKEY_catalina_base-${OCF_RESKEY_catalina_home}}"
++CATALINA_BASE="${OCF_RESKEY_catalina_base:-${OCF_RESKEY_catalina_home}}"
++OCF_RESKEY_catalina_out_default="${OCF_RESKEY_catalina_base:-${OCF_RESKEY_catalina_home}}/logs/catalina.out"
++: ${OCF_RESKEY_catalina_out=${OCF_RESKEY_catalina_out_default}}
+ CATALINA_OUT="${OCF_RESKEY_catalina_out}"
+ 
+ CATALINA_PID=$OCF_RESKEY_catalina_pid
diff --git a/resource-agents.spec b/resource-agents.spec
index 9cba2e1..7bfc5d7 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -73,7 +73,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.9.0
-Release:	54%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.11
+Release:	54%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.12
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -170,6 +170,7 @@ Patch73:	RHEL-72956-2-openstack-cinder-volume-fix-detach-not-working-during-star
 Patch74:	RHEL-79823-portblock-fix-version-detection.patch
 Patch75: 	RHEL-81960-1-aws-agents-reuse-imds-token-until-it-expires.patch
 Patch76: 	RHEL-81960-2-aws-agents-reuse-imds-token-improvements.patch
+Patch77: 	RHEL-85048-tomcat-fix-CATALINA_PID-not-set-and-parameter-defaults.patch
 
 # bundle patches
 Patch1000:	7-gcp-bundled.patch
@@ -430,6 +431,7 @@ exit 1
 %patch -p1 -P 74
 %patch -p1 -P 75
 %patch -p1 -P 76
+%patch -p1 -P 77
 
 chmod 755 heartbeat/nova-compute-wait
 chmod 755 heartbeat/NovaEvacuate
@@ -1019,6 +1021,12 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
+* Fri Mar 28 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-54.12
+- tomcat: fix CATALINA_PID not set, and catalina_base and catalina_out
+  parameter defaults
+
+  Resolves: RHEL-85048
+
 * Tue Mar  4 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-54.11
 - AWS agents: reuse IMDS token until it expires