diff --git a/0020-kdump-lib-always-disable-systemd-gpt-auto-generator.patch b/0020-kdump-lib-always-disable-systemd-gpt-auto-generator.patch
new file mode 100644
index 0000000..0ac7ba3
--- /dev/null
+++ b/0020-kdump-lib-always-disable-systemd-gpt-auto-generator.patch
@@ -0,0 +1,53 @@
+From 3985d49be06faca6120c6fc10687dc295a46f201 Mon Sep 17 00:00:00 2001
+From: Philipp Rudo <prudo@redhat.com>
+Date: Tue, 2 Sep 2025 16:15:02 +0200
+Subject: [PATCH] kdump-lib: always disable systemd-gpt-auto-generator
+
+Resolves: KEX-330
+
+The systemd-gpt-auto-generator automatically discovers and mounts
+various partitions, e.g. the root partition, based on the GPT partition
+type GUIDs. So far anaconda hasn't set the GUIDs during an installation
+and users relying on it, e.g. for UKIs where the root= parameter cannot
+be passed on the kernel command line, had to set them manually. This
+seems to have changed and causes the kdump kernel to hang. In addition
+we know which disk/partition shall be used as dump target and add it
+explicitly to the kdump initrd. So it is save to always disable the
+gpt-auto-generator for the kdump kernel.
+
+Signed-off-by: Philipp Rudo <prudo@redhat.com>
+Signed-off-by: Coiby Xu <coxu@redhat.com>
+---
+ kdump-lib.sh           | 2 +-
+ spec/kdump-lib_spec.sh | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/kdump-lib.sh b/kdump-lib.sh
+index 7d3ec9b..32e43c6 100755
+--- a/kdump-lib.sh
++++ b/kdump-lib.sh
+@@ -799,7 +799,7 @@ prepare_cmdline()
+ 	# Always disable gpt-auto-generator as it hangs during boot of the
+ 	# crash kernel. Furthermore we know which disk will be used for dumping
+ 	# (if at all) and add it explicitly.
+-	is_uki "$KDUMP_KERNEL" && out+="rd.systemd.gpt_auto=no "
++	out+="rd.systemd.gpt_auto=no "
+ 
+ 	# Trim unnecessary whitespaces
+ 	echo "$out" | sed -e "s/^ *//g" -e "s/ *$//g" -e "s/ \+/ /g"
+diff --git a/spec/kdump-lib_spec.sh b/spec/kdump-lib_spec.sh
+index ec7294d..41755a4 100644
+--- a/spec/kdump-lib_spec.sh
++++ b/spec/kdump-lib_spec.sh
+@@ -97,7 +97,7 @@ Describe 'kdump-lib'
+ 			echo foo
+ 		}
+ 
+-		add="disable_cpu_apicid=1 foo.pretimeout=0"
++		add="disable_cpu_apicid=1 foo.pretimeout=0 rd.systemd.gpt_auto=no"
+ 
+ 		Parameters
+ 		       #test  cmdline       remove    add       result
+-- 
+2.52.0
+