diff --git a/config/grub/config/grub.cfg b/config/grub/config/grub.cfg
index 66642711..5b67d113 100644
--- a/config/grub/config/grub.cfg
+++ b/config/grub/config/grub.cfg
@@ -81,8 +81,8 @@ function try_user_config {
 }
 function search_grub {
 	echo -n "Attempting to load grub.cfg from '${1}' devices"
-	for i in 0 1 2 3 4 5 6 7 8 9 10 11; do
-		for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
+	for i in 0 1 2 3 4 5 6 7 8; do
+		for part in 1 2 3 4 5 6 7 8 9 10 11 12; do
 			if [ "${1}" != "nvme" ]; then
 				try_user_config "(${1}${i},${part})"
 			else
@@ -117,8 +117,8 @@ function try_isolinux_config {
 }
 function search_isolinux {
 	echo "\nAttempting to parse iso/sys/extlinux config from '${1}' devices"
-	for i in 0 1 2 3 4 5 6 7 8 9 10 11; do
-		for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
+	for i in 0 1 2 3 4 5 6 7 8; do
+		for part in 1 2 3 4 5 6 7 8 9 10 11 12; do
 			if [ "${1}" != "nvme" ]; then
 				try_isolinux_config "(${1}${i},${part})"
 			else
@@ -167,8 +167,8 @@ menuentry 'Load Operating System (incl. fully encrypted disks)  [o]' --hotkey='o
 
 	unset bootdev
 	for grub_disk in ${grub_scan_disk}; do
-		for i in 0 1 2 3 4 5 6 7 8 9 10 11; do
-			for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
+		for i in 0 1 2 3 4 5 6 7 8; do
+			for part in 1 2 3 4 5 6 7 8 9 10 11 12; do
 				if [ "${grub_disk}" = "ahci" ]; then
 					bootdev="${bootdev} (ahci${i},${part})"
 				elif [ "${grub_disk}" = "ata" ]; then