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 b50905a..ec822ef 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
@@ -31,20 +31,9 @@ SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
 		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0012-ath10k-firmware-override.patch "
 
 src_prepare() {
-	cd "${WORKDIR}/linux-${KV_FULL}"
-	sed "s/EXTRAVERSION = -gentoo/EXTRAVERSION = -gentoo-surface/" -i "${WORKDIR}/linux-${KV_FULL}/Makefile" 
-	eapply "${DISTDIR}/0001-surface3-oemb.patch"
-	eapply "${DISTDIR}/0002-wifi.patch"
-	eapply "${DISTDIR}/0003-ipts.patch"
-	eapply "${DISTDIR}/0004-surface-gpe.patch"
-	eapply "${DISTDIR}/0005-surface-sam-over-hid.patch"
-	eapply "${DISTDIR}/0006-surface-sam.patch"
-	eapply "${DISTDIR}/0007-surface-hotplug.patch"
-	eapply "${DISTDIR}/0008-surface-typecover.patch"
-	eapply "${DISTDIR}/0009-surface-go-touchscreen.patch"
-	eapply "${DISTDIR}/0010-surface-sensors.patch"
-	eapply "${DISTDIR}/0011-cameras.patch"
-	eapply "${DISTDIR}/0012-ath10k-firmware-override.patch"
+	sed "s/EXTRAVERSION = -gentoo/EXTRAVERSION = -gentoo-surface/" -i "${WORKDIR}/linux-${KV_FULL}/Makefile"
+	EPATCH_SOURCE="${DISTDIR}/files/" EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" epatch
 	mv "${WORKDIR}/linux-${KV_FULL}" "${WORKDIR}/linux-${KV_FULL}-surface"
 	}
 
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 0dff904..2f958b9 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
@@ -31,17 +31,8 @@ SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
 
 src_prepare() {
 	sed "s/EXTRAVERSION = -gentoo/EXTRAVERSION = -gentoo-surface/" -i "${WORKDIR}/linux-${KV_FULL}/Makefile"
-	eapply "${DISTDIR}/0001-surface3-oemb.patch"
-	eapply "${DISTDIR}/0002-mwifiex.patch"
-	eapply "${DISTDIR}/0003-ath10k.patch"
-	eapply "${DISTDIR}/0004-ipts.patch"
-	eapply "${DISTDIR}/0005-surface-sam-over-hid.patch"
-	eapply "${DISTDIR}/0006-surface-sam.patch"
-	eapply "${DISTDIR}/0007-surface-hotplug.patch"
-	eapply "${DISTDIR}/0008-surface-typecover.patch"
-	eapply "${DISTDIR}/0009-cameras.patch"
-	eapply "${DISTDIR}/0010-amd-gpio.patch"
-	eapply "${DISTDIR}/0011-amd-s0ix.patch"
+	EPATCH_SOURCE="${DISTDIR}/files/" EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" epatch
 	mv "${WORKDIR}/linux-${KV_FULL}" "${WORKDIR}/linux-${KV_FULL}-surface"
 	}