diff --git a/grubby-bls b/grubby-bls
index 07df5c8..7abcd68 100755
--- a/grubby-bls
+++ b/grubby-bls
@@ -85,7 +85,7 @@ get_bls_values() {
     count=0
     local -a files
     local IFS=$'\n'
-    files=($(for bls in ${blsdir}/*.conf ; do
+    files=($(for bls in ${blsdir}/${MACHINE_ID}*.conf ; do
         if ! [[ -e "${bls}" ]] ; then
             continue
         fi
diff --git a/grubby.spec b/grubby.spec
index 878b99d..430231e 100644
--- a/grubby.spec
+++ b/grubby.spec
@@ -1,6 +1,6 @@
 Name: grubby
 Version: 8.40
-Release: 49%{?dist}
+Release: 50%{?dist}
 Summary: Command line tool for updating BootLoaderSpec files
 License: GPLv2+
 URL: https://github.com/rhinstaller/grubby
@@ -169,6 +169,10 @@ current boot environment.
 %{_mandir}/man8/*.8*
 
 %changelog
+* Fri Jul 03 2026 Marta Lewandowska <mlewando@redhat.com> - 8.40-50
+- Have grubby only manipulate and display relevant entries
+- Resolves: #RHEL-132931
+
 * Wed Jan 10 2024 Marta Lewandowska <mlewando@redhat.com> - 8.40-49
 - Do not overwrite all vars that start with GRUB_CMDLINE_LINUX
 - Resolves: #RHEL-12853