diff --git a/helpers/DATA/debian-installer/007-remove_graphical_options_from_netinstall.patch b/helpers/DATA/debian-installer/patch_changes/007-remove_graphical_options_from_netinstall.patch
similarity index 100%
rename from helpers/DATA/debian-installer/007-remove_graphical_options_from_netinstall.patch
rename to helpers/DATA/debian-installer/patch_changes/007-remove_graphical_options_from_netinstall.patch
diff --git a/helpers/DATA/debian-installer/patch_changes/008-re-enable_dpkg_force-overwrite.patch b/helpers/DATA/debian-installer/patch_changes/008-re-enable_dpkg_force-overwrite.patch
new file mode 100644
index 0000000..872c735
--- /dev/null
+++ b/helpers/DATA/debian-installer/patch_changes/008-re-enable_dpkg_force-overwrite.patch
@@ -0,0 +1,16 @@
+We'll remove the force-overwrite flag once we conclude the riscv rework on the kernel and new arch implementation.
+-- ark74 - Mon, 07 Jul 2025 23:27:26 -0600
+
+diff --git a/build/config/common b/build/config/common
+index 6e58ca8f..5953b26f 100644
+--- a/build/config/common
++++ b/build/config/common
+@@ -41,7 +41,7 @@ PRESEED =
+ # Options to pass to dpkg when it is unpacking the udebs to create the
+ # image. None should be needed, but --force-overwrite might need to be
+ # enabled from time to time if udebs have conflicting files.
+-DPKG_UNPACK_OPTIONS =
++DPKG_UNPACK_OPTIONS = --force-overwrite
+ 
+ # The codename of the Trisquel release that should be installed by default.
+ TRISQUEL_RELEASE = ecne
diff --git a/helpers/make-debian-installer b/helpers/make-debian-installer
index 2c6fcb2..7cb10c7 100644
--- a/helpers/make-debian-installer
+++ b/helpers/make-debian-installer
@@ -184,7 +184,7 @@ echo "Remove unused modules from d-i pkg-list"
 grep -rl acpi-modules- build/pkg-lists/ |xargs -r sed -i '/acpi-modules-/d'
 grep -rl cdrom-core-modules- build/pkg-lists/ |xargs -r sed -i '/cdrom-core-modules-/d'
 grep -rl cdebconf-gtk-entropy build/config/ | xargs -r sed -i 's/cdebconf-gtk-entropy//'
-patch_p1 $DATA/007-remove_graphical_options_from_netinstall.patch
+apply_patch_changes
 
 # replace references to the OS as 'Linux' with 'GNU/Linux'
 match_rxs=( # ASSERT: aligns with '$replace_rxs'