diff --git a/RHEL-133928-podman-etcd-align-variable-names-with-etcd-3.6-pod-manifest.patch b/RHEL-133928-podman-etcd-align-variable-names-with-etcd-3.6-pod-manifest.patch
new file mode 100644
index 0000000..0eb6dd4
--- /dev/null
+++ b/RHEL-133928-podman-etcd-align-variable-names-with-etcd-3.6-pod-manifest.patch
@@ -0,0 +1,52 @@
+From 8b70d5026fee0910a52f0fdefcaf930b2c0a3909 Mon Sep 17 00:00:00 2001
+From: Carlo Lobrano <c.lobrano@gmail.com>
+Date: Wed, 3 Dec 2025 11:38:25 +0100
+Subject: [PATCH] podman-etcd: sync environment variables with Pod manifest
+
+The EXPERIMENTAL substring was removed from
+ETCD_EXPERIMENTAL_WARNING_APPLY_DURATION and
+ETCD_EXPERIMENTAL_WATCH_PROGRESS_NOTIFY_INTERNAL in the Pod
+manifest. This change aligns our config with those updates.
+
+NOTE: Some Etcd flags deprecated in v3.6 will be replaced in a future
+change.
+
+See: https://github.com/openshift/cluster-etcd-operator/pull/1507
+---
+ heartbeat/podman-etcd | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/heartbeat/podman-etcd b/heartbeat/podman-etcd
+index 242226bb1..bb2900536 100755
+--- a/heartbeat/podman-etcd
++++ b/heartbeat/podman-etcd
+@@ -604,8 +604,8 @@ prepare_env() {
+ 	fi
+ 	ETCD_ELECTION_TIMEOUT=$(get_env_from_manifest "ETCD_ELECTION_TIMEOUT")
+ 	ETCD_ENABLE_PPROF=$(get_env_from_manifest "ETCD_ENABLE_PPROF")
+-	ETCD_EXPERIMENTAL_WARNING_APPLY_DURATION=$(get_env_from_manifest "ETCD_EXPERIMENTAL_WARNING_APPLY_DURATION")
+-	ETCD_EXPERIMENTAL_WATCH_PROGRESS_NOTIFY_INTERVAL=$(get_env_from_manifest "ETCD_EXPERIMENTAL_WATCH_PROGRESS_NOTIFY_INTERVAL")
++	ETCD_WARNING_APPLY_DURATION=$(get_env_from_manifest "ETCD_WARNING_APPLY_DURATION")
++	ETCD_WATCH_PROGRESS_NOTIFY_INTERVAL=$(get_env_from_manifest "ETCD_WATCH_PROGRESS_NOTIFY_INTERVAL")
+ 	ETCD_HEARTBEAT_INTERVAL=$(get_env_from_manifest "ETCD_HEARTBEAT_INTERVAL")
+ 	ETCD_QUOTA_BACKEND_BYTES=$(get_env_from_manifest "ETCD_QUOTA_BACKEND_BYTES")
+ 	ETCD_SOCKET_REUSE_ADDRESS=$(get_env_from_manifest "ETCD_SOCKET_REUSE_ADDRESS")
+@@ -660,6 +660,7 @@ force-new-cluster-bump-amount: $BUMP_REV"
+ 
+ 	# the space indentation for client-transport-security and peer-transport-security
+ 	# is required for correct YAML formatting.
++	# TODO: replace flags deprecated in Etcd v3.6
+ 	cat > "$ETCD_CONFIGURATION_FILE" << EOF
+ logger: zap
+ log-level: info
+@@ -692,8 +693,8 @@ listen-metrics-urls: "$(ip_url ${LISTEN_METRICS_URLS}):9978"
+ metrics: extensive
+ experimental-initial-corrupt-check: true
+ experimental-max-learners: 1
+-experimental-warning-apply-duration: $(convert_duration_in_nanoseconds "$ETCD_EXPERIMENTAL_WARNING_APPLY_DURATION")
+-experimental-watch-progress-notify-interval: $(convert_duration_in_nanoseconds "$ETCD_EXPERIMENTAL_WATCH_PROGRESS_NOTIFY_INTERVAL")
++experimental-warning-apply-duration: $(convert_duration_in_nanoseconds "$ETCD_WARNING_APPLY_DURATION")
++experimental-watch-progress-notify-interval: $(convert_duration_in_nanoseconds "$ETCD_WATCH_PROGRESS_NOTIFY_INTERVAL")
+ EOF
+ 	rc=$?
+ 	if [ $rc -ne 0 ]; then
diff --git a/resource-agents.spec b/resource-agents.spec
index a0882e5..8e98940 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -45,7 +45,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.16.0
-Release:	46%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	47%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPL-2.0-or-later AND LGPL-2.1-or-later
 URL:		https://github.com/ClusterLabs/resource-agents
 Source0:	%{upstream_prefix}-%{upstream_version}.tar.gz
@@ -111,6 +111,7 @@ Patch58:	RHEL-130576-2-podman-etcd-remove-test-code.patch
 Patch59:	RHEL-126083-2-podman-etcd-fix-count-of-fnc-holders-in-container_health_check.patch
 Patch60:	RHEL-131181-podman-etcd-prevent-learner-from-starting-before-cluster-is-ready.patch
 Patch61:	RHEL-132047-podman-etcd-prevent-retries-on-fatal-errors.patch
+Patch62:	RHEL-133928-podman-etcd-align-variable-names-with-etcd-3.6-pod-manifest.patch
 
 # bundled ha-cloud-support libs
 Patch500:	ha-cloud-support-aliyun.patch
@@ -343,6 +344,7 @@ exit 1
 %patch -p1 -P 59
 %patch -p1 -P 60
 %patch -p1 -P 61
+%patch -p1 -P 62
 
 # bundled ha-cloud-support libs
 %patch -p1 -P 500
@@ -675,6 +677,12 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
+* Mon Dec  8 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-47
+- podman-etcd: align environment variable names with Etcd v3.6 Pod
+  manifest
+
+  Resolves: RHEL-133928
+
 * Tue Dec  2 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-46
 - podman-etcd: prevent retries on fatal errors