diff --git a/base/comps/components.toml b/base/comps/components.toml
index 2ec3c6a9eeb..5332cf38cb0 100644
--- a/base/comps/components.toml
+++ b/base/comps/components.toml
@@ -81,7 +81,6 @@ includes = ["**/*.comp.toml", "components-full.toml", "component-check-disableme
 [components.gpm]
 [components.grep]
 [components.groff]
-[components.grub2]
 [components.grubby]
 [components.gssproxy]
 [components.gzip]
diff --git a/base/comps/grub2/grub2.comp.toml b/base/comps/grub2/grub2.comp.toml
new file mode 100644
index 00000000000..3c388c8d574
--- /dev/null
+++ b/base/comps/grub2/grub2.comp.toml
@@ -0,0 +1,18 @@
+[components.grub2]
+
+# Disable Xen module builds — not applicable to Azure Linux (Hyper-V/KVM).
+# grub.macros enables with_xen_arch and with_xen_pvh_arch on x86_64 by default,
+# producing grub2-xen-x64-modules and grub2-xen_pvh-i386-modules subpackages.
+[[components.grub2.overlays]]
+description = "Disable Xen module build (with_xen_arch) in grub.macros"
+type = "file-search-replace"
+file = "grub.macros"
+regex = '%global with_xen_arch 1'
+replacement = '%global with_xen_arch 0'
+
+[[components.grub2.overlays]]
+description = "Disable Xen PVH module build (with_xen_pvh_arch) in grub.macros"
+type = "file-search-replace"
+file = "grub.macros"
+regex = '%global with_xen_pvh_arch 1'
+replacement = '%global with_xen_pvh_arch 0'