diff --git a/config/sources/families/include/uefi_common.inc b/config/sources/families/include/uefi_common.inc
index 600972ab57..1848211eae 100644
--- a/config/sources/families/include/uefi_common.inc
+++ b/config/sources/families/include/uefi_common.inc
@@ -10,42 +10,41 @@ declare -g SERIALCON="tty1"                          # Cant reasonably expect UE
 declare -g SKIP_BOOTSPLASH="yes"                     # No splash.
 declare -g UEFI_GRUB_TIMEOUT=${UEFI_GRUB_TIMEOUT:-3} # Default 3-seconds timeout for GRUB menu.
 declare -g BOARD_FIRMWARE_INSTALL="-full"            # Install full firmware for UEFI boards
+declare -g DISTRO_GENERIC_KERNEL=no
+
 case "${BRANCH}" in
 
 	ddk)
 		# This will force `unset KERNELSOURCE` later; no kernel will be built.
 		# Instead, the distro's default linux-generic kernel will be installed.
+		# rpardini: For some regrettable reason, most of this logic is in the grub extension.
 		declare -g DISTRO_GENERIC_KERNEL=yes
 		;;
 
 	legacy)
-
-		declare -g DISTRO_GENERIC_KERNEL=no
-		declare -g LINUXCONFIG="linux-uefi-${LINUXFAMILY}-${BRANCH}"
-		declare -g KERNEL_MAJOR_MINOR="5.15"                      # Major and minor versions of this kernel. For mainline caching.
-		declare -g KERNELBRANCH="branch:linux-5.15.y"             # Branch or tag to build from. It should match MAJOR_MINOR
-		declare -g KERNELPATCHDIR="uefi-${LINUXFAMILY}-${BRANCH}" # Might be empty.
+		declare -g KERNEL_MAJOR_MINOR="5.15"          # Major and minor versions of this kernel. For mainline caching.
+		declare -g KERNELBRANCH="branch:linux-5.15.y" # Branch or tag to build from. It should match MAJOR_MINOR
 		;;
 
 	current)
 
-		declare -g DISTRO_GENERIC_KERNEL=no
-		declare -g LINUXCONFIG="linux-uefi-${LINUXFAMILY}-${BRANCH}"
-		declare -g KERNEL_MAJOR_MINOR="6.1"                       # Major and minor versions of this kernel. For mainline caching.
-		declare -g KERNELBRANCH="branch:linux-6.1.y"              # Branch or tag to build from. It should match MAJOR_MINOR
-		declare -g KERNELPATCHDIR="uefi-${LINUXFAMILY}-${BRANCH}" # Might be empty.
+		declare -g KERNEL_MAJOR_MINOR="6.1"          # Major and minor versions of this kernel. For mainline caching.
+		declare -g KERNELBRANCH="branch:linux-6.1.y" # Branch or tag to build from. It should match MAJOR_MINOR
 		;;
 
 	edge)
-
-		declare -g DISTRO_GENERIC_KERNEL=no
-		declare -g LINUXCONFIG="linux-uefi-${LINUXFAMILY}-${BRANCH}"
 		declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
 		declare -g KERNELBRANCH='branch:linux-6.6.y'
-		declare -g KERNELPATCHDIR="uefi-${LINUXFAMILY}-${BRANCH}" # Might be empty.
 		;;
 esac
 
+# Common for all branches
+declare -g LINUXCONFIG="linux-uefi-${LINUXFAMILY}-${BRANCH}"
+declare -g KERNELPATCHDIR="archive/uefi-${LINUXFAMILY}-${KERNEL_MAJOR_MINOR}" # Might be empty; NO SYMLINKS! Attention: KERNEL_MAJOR_MINOR is used, not BRANCH! No symlinks!
+
+
+# Booting EFI stuff via GRUB. There are specific boards (qemu-uboot-x86 and qemu-uboot-arm64) that enable QEMU_UBOOT_BOOTCONFIG.
+# This does not affect "normal" generic UEFI boards
 if [[ "${QEMU_UBOOT_BOOTCONFIG}" != "" ]]; then
 	# Allowance for using the UEFI kernels, but not an UEFI bootloader, instead, use qemu with uboot.
 	# Used in the qemu-uboot-x86 and qemu-uboot-arm64 "boards".
diff --git a/patch/kernel/uefi-arm64-current b/patch/kernel/uefi-arm64-current
deleted file mode 120000
index fecc0b919d..0000000000
--- a/patch/kernel/uefi-arm64-current
+++ /dev/null
@@ -1 +0,0 @@
-archive/uefi-arm64-6.1
\ No newline at end of file
diff --git a/patch/kernel/uefi-arm64-edge b/patch/kernel/uefi-arm64-edge
deleted file mode 120000
index a1f73fc364..0000000000
--- a/patch/kernel/uefi-arm64-edge
+++ /dev/null
@@ -1 +0,0 @@
-archive/uefi-arm64-6.6
\ No newline at end of file