diff --git a/base/comps/components.toml b/base/comps/components.toml
index e460cc32019..a9f322d1324 100644
--- a/base/comps/components.toml
+++ b/base/comps/components.toml
@@ -1107,7 +1107,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-min
 [components.grep]
 [components.groff]
 [components.grpc]
-[components.grubby]
 [components.gsettings-desktop-schemas]
 [components.gsl]
 [components.gsm]
diff --git a/base/comps/grubby/grubby.comp.toml b/base/comps/grubby/grubby.comp.toml
new file mode 100644
index 00000000000..d9acceb10e4
--- /dev/null
+++ b/base/comps/grubby/grubby.comp.toml
@@ -0,0 +1,2 @@
+[components.grubby]
+spec = { type = "upstream", upstream-commit = "482a2825c47c4fd28a18beb279a3e826461bf878" }
diff --git a/locks/grubby.lock b/locks/grubby.lock
index bd649b7a44c..d210adcd67d 100644
--- a/locks/grubby.lock
+++ b/locks/grubby.lock
@@ -1,6 +1,6 @@
 # Managed by azldev component update. Do not edit manually.
 version = 1
 import-commit = '6095bc576b3aa216400f1cc133ade107d4830ea7'
-upstream-commit = '6095bc576b3aa216400f1cc133ade107d4830ea7'
-input-fingerprint = 'sha256:b671086c622372cdbe19f56c5b93a8cf2e9c9011cda4ef5ca095be17b87fd3d1'
-resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
+upstream-commit = '482a2825c47c4fd28a18beb279a3e826461bf878'
+input-fingerprint = 'sha256:0629234843fdfaecf2b8ae3d60085bfa30d628f16998201e2ec1dbf0958d3fdf'
+resolution-input-hash = 'sha256:593fa932ecee0e1182baf5d9cc43eeec1f8cdc1bb17670a50e8daf18d7d3f95c'
diff --git a/specs/g/grubby/grubby.spec b/specs/g/grubby/grubby.spec
index 87c0a32628a..f593d83f6a3 100644
--- a/specs/g/grubby/grubby.spec
+++ b/specs/g/grubby/grubby.spec
@@ -6,7 +6,7 @@
 
 Name: grubby
 Version: 8.40
-Release: 86%{?dist}
+Release: 88%{?dist}
 Summary: Command line tool for updating bootloader configs
 License: GPL-2.0-or-later
 Source1: grubby-bls
@@ -15,6 +15,7 @@ Source3: COPYING
 Source5: 95-kernel-hooks.install
 Source6: 10-devicetree.install
 Source7: grubby.8
+Source8: kernel.sysconfig
 
 BuildRequires: gcc
 BuildRequires: glib2-devel
@@ -62,6 +63,9 @@ install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE6}
 mkdir -p %{buildroot}%{_mandir}/man8
 install -m 0644 %{SOURCE7} %{buildroot}%{_mandir}/man8/
 
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+install -m 0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/kernel
+
 %post
 if [ "$1" = 2 ]; then
     arch=$(uname -m)
@@ -75,8 +79,12 @@ fi
 %attr(0755,root,root) %{_prefix}/lib/kernel/install.d/10-devicetree.install
 %attr(0755,root,root) %{_prefix}/lib/kernel/install.d/95-kernel-hooks.install
 %{_mandir}/man8/grubby.8*
+%config(noreplace) %{_sysconfdir}/sysconfig/kernel
 
 %changelog
+* Wed Dec 10 2025 Simon de Vlieger <cmdr@supakeen.com> - 8.40-86
+- Own `/etc/sysconfig/kernel` which is used for `grubby` configuration
+
 * Wed Jul 30 2025 Leo Sandoval <lsandova@redhat.com> - 8.40-85
 - Update cfg when setting a default kernel
 
diff --git a/specs/g/grubby/kernel.sysconfig b/specs/g/grubby/kernel.sysconfig
new file mode 100644
index 00000000000..8da19709dc0
--- /dev/null
+++ b/specs/g/grubby/kernel.sysconfig
@@ -0,0 +1,6 @@
+# UPDATEDEFAULT specifies if kernel-install should make
+# new kernels the default
+UPDATEDEFAULT=yes
+
+# DEFAULTKERNEL specifies the default kernel package type
+DEFAULTKERNEL=kernel-core