diff --git a/shim-15.4-lp152.4.17.1.x86_64.rpm b/shim-15.4-lp152.4.17.1.x86_64.rpm
deleted file mode 100644
index aea6869..0000000
--- a/shim-15.4-lp152.4.17.1.x86_64.rpm
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:13776ed2b68698091297f5e0e7156b401b1f7a9940785a1871335266fb524a30
-size 456552
diff --git a/shim-15.8-lp155.8.2.x86_64.rpm b/shim-15.8-lp155.8.2.x86_64.rpm
new file mode 100644
index 0000000..6c3770e
--- /dev/null
+++ b/shim-15.8-lp155.8.2.x86_64.rpm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2dde0a04e9468988abe978355ba50a3f14e10e110fdbcf80f52c94e922501cb0
+size 503544
diff --git a/shim-install b/shim-install
index 70ade6b..708d026 100644
--- a/shim-install
+++ b/shim-install
@@ -60,7 +60,6 @@ fi
 if [ x"${GRUB_DISTRIBUTOR}" = x ] && [ -f "${sysconfdir}/os-release" ] ; then
     . "${sysconfdir}/os-release"
     GRUB_DISTRIBUTOR="${NAME} ${VERSION}"
-    OS_ID="${ID}"
 fi
 
 bootloader_id="$(echo "$GRUB_DISTRIBUTOR" | tr 'A-Z' 'a-z' | cut -d' ' -f1)"
@@ -79,11 +78,6 @@ case "$bootloader_id" in
     *) ca_string="";;
 esac
 
-case "$OS_ID" in
-    "opensuse-leap")
-        ca_string='SUSE Linux Enterprise Secure Boot CA1';;
-esac
-
 is_azure () {
     local bios_vendor;
     local product_name;
@@ -431,8 +425,19 @@ if [ x$GRUB_ENABLE_CRYPTODISK = xy ]; then
   done
 fi
 
+hints="`"${grub_probe}" --target=hints_string "${grub_cfg_dirname}" 2> /dev/null`"
+
+if [ "x$hints" != x ]; then
+  echo "if [ x\$feature_platform_search_hint = xy ]; then"
+  echo "  search --no-floppy --fs-uuid --set=root ${hints} ${cfg_fs_uuid}"
+  echo "else"
+  echo "  search --no-floppy --fs-uuid --set=root ${cfg_fs_uuid}"
+  echo "fi"
+else
+  echo "search --no-floppy --fs-uuid --set=root ${cfg_fs_uuid}"
+fi
+
 cat <<EOF
-search --fs-uuid --set=root ${cfg_fs_uuid}
 set prefix=(\${root})`${grub_mkrelpath} ${grub_cfg_dirname}`
 source "\${prefix}/${grub_cfg_basename}"
 EOF
diff --git a/shim-leap.changes b/shim-leap.changes
index bc8af01..a73095b 100644
--- a/shim-leap.changes
+++ b/shim-leap.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Jul 23 03:27:56 UTC 2024 - Dennis Tseng <dennis.tseng@suse.com>
+
+- Update to shim to 15.8-shim-15.8-lp155.8.2.x86_64.rpm from 
+  openSUSE secure-boot 15.5
+  + Version: 15.8, "Jan 23 2024"
+  + Align the outside shim-install with the one in RPM file.
+    This is because all important fixes in outside shim-install are
+    also fixed in shim-install of RPM file. For consistency purposes,
+    the outside shim-install is updated in this version.
+  + Include the bug fixes for bsc#1215099,bsc#1215098,bsc#1215100,bsc#1215101,
+    bsc#1215102, and bsc#1215103.
+
 -------------------------------------------------------------------
 Thu Mar 14 05:58:13 UTC 2024 - Gary Ching-Pang Lin <glin@suse.com>
 
diff --git a/shim-leap.spec b/shim-leap.spec
index db94119..ddf3e65 100644
--- a/shim-leap.spec
+++ b/shim-leap.spec
@@ -25,12 +25,12 @@
 %endif
 
 Name:           shim-leap
-Version:        15.4
+Version:        15.8
 Release:        0
 Summary:        UEFI shim loader
 License:        BSD-2-Clause
 Group:          System/Boot
-Source:         shim-15.4-lp152.4.17.1.x86_64.rpm
+Source:         shim-15.8-lp155.8.2.x86_64.rpm
 Source1:        README
 Source2:        shim-install
 BuildRequires:  fde-tpm-helper-rpm-macros