diff --git a/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.10.52.ebuild b/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.10.52.ebuild
index 70ab21a..1fe3769 100644
--- a/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.10.52.ebuild
+++ b/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.10.52.ebuild
@@ -29,10 +29,10 @@ SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
 		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0010-surface-sensors.patch
 		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0011-cameras.patch
 		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0012-ath10k-firmware-override.patch "
-S="${WORKDIR}/linux-${KV_FULL}-surface"
 
 src_prepare() {
 	mv "${WORKDIR}/linux-${KV_FULL}" "${WORKDIR}/linux-${KV_FULL}-surface"
+	S="${WORKDIR}/linux-${KV_FULL}-surface"
 	default
 	sed "s/EXTRAVERSION = -gentoo/EXTRAVERSION = -gentoo-surface/" -i "${WORKDIR}/linux-${KV_FULL}/Makefile"
 	EPATCH_SOURCE="${DISTDIR}" EPATCH_SUFFIX="patch" \
diff --git a/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.13.7.ebuild b/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.13.7.ebuild
index 22e9baa..27600e0 100644
--- a/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.13.7.ebuild
+++ b/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.13.7.ebuild
@@ -28,10 +28,10 @@ SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
 		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0009-cameras.patch
 		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0010-amd-gpio.patch
 		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0011-amd-s0ix.patch"
-S="${WORKDIR}/linux-${KV_FULL}-surface"
 
 src_prepare() {
 	mv "${WORKDIR}/linux-${KV_FULL}" "${WORKDIR}/linux-${KV_FULL}-surface"
+	S="${WORKDIR}/linux-${KV_FULL}-surface"
 	default
 	sed "s/EXTRAVERSION = -gentoo/EXTRAVERSION = -gentoo-surface/" -i "${WORKDIR}/linux-${KV_FULL}/Makefile"
 	EPATCH_SOURCE="${DISTDIR}" EPATCH_SUFFIX="patch" \