diff --git a/helpers/DATA/choose-mirror/Makefile_mirrors-masterlist.patch b/helpers/DATA/choose-mirror/Makefile_mirrors-masterlist.patch
new file mode 100644
index 0000000..920acc3
--- /dev/null
+++ b/helpers/DATA/choose-mirror/Makefile_mirrors-masterlist.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile b/Makefile
+index f8bf521f..61d51be1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -34,8 +34,8 @@ LIBS=-ldebconfclient -ldebian-installer
+ STRIP=strip
+ 
+ # Derivative distributions may want to change these.
+-MIRRORLISTURL=https://mirror-master.debian.org/status/Mirrors.masterlist
+-MASTERLIST=Mirrors.masterlist
++MIRRORLISTURL=https://gitlab.trisquel.org/trisquel/trisquel-packages/-/raw/master/extra/mirrors/Mirrors.masterlist
++MASTERLIST=Mirrors.masterlist.trisquel
+ 
+ ifdef DEBUG
+ CFLAGS:=$(CFLAGS) -DDODEBUG
diff --git a/helpers/DATA/choose-mirror/rev_choose-mirror-bin.templates-in.patch b/helpers/DATA/choose-mirror/choose-mirror-bin.templates-in.patch
similarity index 51%
rename from helpers/DATA/choose-mirror/rev_choose-mirror-bin.templates-in.patch
rename to helpers/DATA/choose-mirror/choose-mirror-bin.templates-in.patch
index 8976574..fd77a84 100644
--- a/helpers/DATA/choose-mirror/rev_choose-mirror-bin.templates-in.patch
+++ b/helpers/DATA/choose-mirror/choose-mirror-bin.templates-in.patch
@@ -1,22 +1,22 @@
 diff -ru choose-mirror-2.78ubuntu7+10.0trisquel3/debian/choose-mirror-bin.templates-in choose-mirror-2.111/debian/choose-mirror-bin.templates-in
 --- choose-mirror-2.78ubuntu7+10.0trisquel3/debian/choose-mirror-bin.templates-in	2021-02-26 15:22:56.000000000 -0600
 +++ choose-mirror-2.111/debian/choose-mirror-bin.templates-in	2021-02-08 06:52:03.000000000 -0600
-@@ -12,10 +12,14 @@
+@@ -12,14 +12,10 @@
  Type: select
  Choices-C: ${CHOICES-C}
  Choices: ${CHOICES}
--Default: _CODENAME_
--Description: Trisquel version to install:
-- In Trisquel, this question is never asked, and is only for preseeding.
-- Caveat emptor.
-+# :sl2:
-+_Description: Debian version to install:
-+ Debian comes in several flavors. Stable is well-tested and rarely changes.
-+ Unstable is untested and frequently changing. Testing is a middle ground,
-+ that receives many of the new versions from unstable if they are not too
-+ buggy.
-+ .
-+ Only flavors available on the selected mirror are listed.
++Default: _CODENAME_
++Description: Trisquel version to install:
++ In Trisquel, this question is never asked, and is only for preseeding.
++ Caveat emptor.
+-# :sl2:
+-_Description: Debian version to install:
+- Debian comes in several flavors. Stable is well-tested and rarely changes.
+- Unstable is untested and frequently changing. Testing is a middle ground,
+- that receives many of the new versions from unstable if they are not too
+- buggy.
+- .
+- Only flavors available on the selected mirror are listed.
  
  Template: mirror/codename
  Type: string
diff --git a/helpers/DATA/choose-mirror/rev_Makefile.patch b/helpers/DATA/choose-mirror/rev_Makefile.patch
deleted file mode 100644
index 0f38b63..0000000
--- a/helpers/DATA/choose-mirror/rev_Makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru choose-mirror-2.78ubuntu7+10.0trisquel3/Makefile choose-mirror-2.111/Makefile
---- choose-mirror-2.78ubuntu7+10.0trisquel3/Makefile	2021-02-26 15:22:56.000000000 -0600
-+++ choose-mirror-2.111/Makefile	2021-06-04 12:09:55.000000000 -0500
-@@ -33,8 +33,8 @@
- STRIP=strip
- 
- # Derivative distributions may want to change these.
--#MIRRORLISTURL=https://gitlab.trisquel.org/trisquel/trisquel-packages/-/raw/master/extra/mirrors/Mirrors.masterlist
--MASTERLIST=Mirrors.masterlist.trisquel
-+MIRRORLISTURL=https://salsa.debian.org/mirror-team/masterlist/raw/master/Mirrors.masterlist
-+MASTERLIST=Mirrors.masterlist
- 
- ifdef DEBUG
- CFLAGS:=$(CFLAGS) -DDODEBUG
diff --git a/helpers/make-choose-mirror b/helpers/make-choose-mirror
index cde9778..cb1ada2 100644
--- a/helpers/make-choose-mirror
+++ b/helpers/make-choose-mirror
@@ -18,15 +18,15 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=7
-EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main'
+VERSION=8
+EXTERNAL='deb-src http://ftp.debian.org/debian bookworm main'
 REPOKEY=0E98404D386FA1D9
 NETINST=true
 . ./config
 
 Mirrors_masterlist_git="trisquel-packages/-/raw/master/extra/mirrors/Mirrors.masterlist"
-patch_Rp1 $DATA/rev_Makefile.patch
-patch_Rp1 $DATA/rev_choose-mirror-bin.templates-in.patch
+patch_p1 $DATA/Makefile_mirrors-masterlist.patch
+patch_p1 $DATA/choose-mirror-bin.templates-in.patch
 
 sed -i '/oldstable/d;
         /testing/d;