diff --git a/helpers/DATA/base-installer/archs/amd64.sh b/helpers/DATA/base-installer/archs/amd64.sh
index be52108..7a416d7 100644
--- a/helpers/DATA/base-installer/archs/amd64.sh
+++ b/helpers/DATA/base-installer/archs/amd64.sh
@@ -3,7 +3,7 @@ arch_get_kernel_flavour () {
 }
 
 arch_check_usable_kernel () {
-	if echo "$1" | grep -q -e "signed" -e "edge" -e "hwe-16.04"; then return 1; fi
+	if echo "$1" | grep -q -e "signed" -e "edge" -e "hwe-@REVISION@"; then return 1; fi
 	if echo "$1" | grep -Eq -- "-(server|generic|virtual|xen|preempt|rt)(-.*)?$"; then return 0; fi
 
 	return 1
@@ -14,24 +14,24 @@ arch_get_kernel () {
 	echo "linux-generic"
 	echo "linux-image-generic"
 
-	echo "linux-generic-hwe-20.04"
-	echo "linux-image-generic-hwe-20.04"
+	echo "linux-generic-hwe-@REVISION@"
+	echo "linux-image-generic-hwe-@REVISION@"
 
         echo "linux-lowlatency"
         echo "linux-image-lowlatency"
 
-        echo "linux-lowlatency-hwe-20.04"
-        echo "linux-image-lowlatency-hwe-20.04"
+        echo "linux-lowlatency-hwe-@REVISION@"
+        echo "linux-image-lowlatency-hwe-@REVISION@"
 
-        echo "linux-oem-20.04"
-        echo "linux-image-oem-20.04"
+        echo "linux-oem-@REVISION@"
+        echo "linux-image-oem-@REVISION@"
 
         echo "linux-virtual"
         echo "linux-image-virtual"
 
         echo "linux-image-extra-virtual"
-	echo "linux-virtual-hwe-20.04"
+	echo "linux-virtual-hwe-@REVISION@"
 
-	echo "linux-image-virtual-hwe-20.04"
-	echo "linux-image-extra-virtual-hwe-20.04"
+	echo "linux-image-virtual-hwe-@REVISION@"
+	echo "linux-image-extra-virtual-hwe-@REVISION@"
 }
diff --git a/helpers/DATA/base-installer/kernel_update_list.patch b/helpers/DATA/base-installer/patch_changes/000-kernel_update_list.patch
similarity index 89%
rename from helpers/DATA/base-installer/kernel_update_list.patch
rename to helpers/DATA/base-installer/patch_changes/000-kernel_update_list.patch
index 76d4175..309ee77 100644
--- a/helpers/DATA/base-installer/kernel_update_list.patch
+++ b/helpers/DATA/base-installer/patch_changes/000-kernel_update_list.patch
@@ -1,5 +1,5 @@
---- source/library.sh	2022-07-14 15:09:08.482389439 -0500
-+++ source/library.sh_upd	2022-07-14 15:19:40.056073944 -0500
+--- a/library.sh	2022-07-14 15:09:08.482389439 -0500
++++ b/library.sh	2022-07-14 15:19:40.056073944 -0500
 @@ -345,9 +345,15 @@
  
  kernel_update_list () {
diff --git a/helpers/DATA/base-installer/patch_changes/001-set_generic_kernel_flavour_as_upstream.patch b/helpers/DATA/base-installer/patch_changes/001-set_generic_kernel_flavour_as_upstream.patch
new file mode 100644
index 0000000..a4cceb9
--- /dev/null
+++ b/helpers/DATA/base-installer/patch_changes/001-set_generic_kernel_flavour_as_upstream.patch
@@ -0,0 +1,108 @@
+diff --git a/kernel/arm64.sh b/kernel/arm64.sh
+index a5a5ec4a..9d5e07b4 100644
+--- a/kernel/arm64.sh
++++ b/kernel/arm64.sh
+@@ -1,5 +1,8 @@
++# Adjusted for Trisquel: use 'generic' flavour on all supported architectures,
++# matching Ubuntu's kernel packaging.
++
+ arch_get_kernel_flavour () {
+-	echo "arm64"
++	echo "generic"
+ 	return 0
+ }
+ 
+@@ -15,5 +18,5 @@ arch_check_usable_kernel () {
+ }
+ 
+ arch_get_kernel () {
+-	echo "linux-image-arm64"
++	echo "linux-image-generic"
+ }
+diff --git a/kernel/armhf.sh b/kernel/armhf.sh
+index 389a416d..b998770e 100644
+--- a/kernel/armhf.sh
++++ b/kernel/armhf.sh
+@@ -1,3 +1,6 @@
++# Adjusted for Trisquel: use 'generic' flavour on all supported architectures,
++# matching Ubuntu's kernel packaging.
++
+ arch_has_lpae () {
+ 	if grep -q '^Features.*\blpae\b' "$CPUINFO"; then
+ 		echo y
+@@ -8,16 +11,13 @@ arch_has_lpae () {
+ 
+ arch_get_kernel_flavour () {
+ 	case "$SUBARCH" in
+-	    omap|mx5|vexpress)
+-		echo "$SUBARCH armmp"
+-		return 0 ;;
+ 	    generic|efi)
+ 		case `arch_has_lpae` in
+ 		    y)
+-			echo "armmp-lpae armmp"
++			echo "generic-lpae generic"
+ 			;;
+ 		    n)
+-			echo "armmp"
++			echo "generic"
+ 			;;
+ 		esac
+ 		return 0 ;;
+diff --git a/kernel/ppc64el.sh b/kernel/ppc64el.sh
+index f21bdab2..2a5a0c5a 100644
+--- a/kernel/ppc64el.sh
++++ b/kernel/ppc64el.sh
+@@ -1,5 +1,8 @@
++# Adjusted for Trisquel: use 'generic' flavour on all supported architectures,
++# matching Ubuntu's kernel packaging.
++
+ arch_get_kernel_flavour () {
+-	echo powerpc64le
++	echo generic
+ 	return 0
+ }
+ 
+@@ -8,5 +11,5 @@ arch_check_usable_kernel () {
+ }
+ 
+ arch_get_kernel () {
+-	echo "linux-image-powerpc64le"
++	echo "linux-image-generic"
+ }
+diff --git a/kernel/riscv64.sh b/kernel/riscv64.sh
+index 9fa410e0..982555ef 100644
+--- a/kernel/riscv64.sh
++++ b/kernel/riscv64.sh
+@@ -4,10 +4,13 @@
+ 
+ # The riscv64 architecture has only a single unified multiplatform kernel
+ # (which uses "riscv64" as its flavour name). Therefore we don't need to
+-# differentiate between multiple flavours here.
++# differentiate between multiple flavours here. (Debian)
++
++## Adjusted for Trisquel: use 'generic' flavour on all supported architectures,
++## matching Ubuntu's kernel packaging.
+ 
+ arch_get_kernel_flavour () {
+-	echo riscv64
++	echo generic
+ }
+ 
+ arch_check_usable_kernel () {
+@@ -17,7 +20,7 @@ arch_check_usable_kernel () {
+ 		# Don't show debug packages in the kernel selection list.
+ 		return 1
+ 		;;
+-	    *-riscv64 | *-riscv64-*)
++	    *-generic | *-generic-*)
+ 		return 0
+ 		;;
+ 	    *)
+@@ -28,5 +31,5 @@ arch_check_usable_kernel () {
+ 
+ arch_get_kernel () {
+ 	# parameters: $1=flavour
+-	echo "linux-image-riscv64"
++	echo "linux-image-generic"
+ }
diff --git a/helpers/DATA/base-installer/patch_changes/002-patch_flavor_tests_arm64.patch b/helpers/DATA/base-installer/patch_changes/002-patch_flavor_tests_arm64.patch
new file mode 100644
index 0000000..212a0c1
--- /dev/null
+++ b/helpers/DATA/base-installer/patch_changes/002-patch_flavor_tests_arm64.patch
@@ -0,0 +1,66 @@
+diff --git a/kernel/tests/arm64/foundation.test b/kernel/tests/arm64/foundation.test
+index 30027845..882eb192 100644
+--- a/kernel/tests/arm64/foundation.test
++++ b/kernel/tests/arm64/foundation.test
+@@ -1,12 +1,12 @@
+ subarch generic
+ cpuinfo foundation.cpuinfo
+-flavour arm64
++flavour generic
+ majors 3.10
+ machine aarch64
+ kernel-3.10 \
+-  linux-image-arm64
++  linux-image-generic
+ usable \
+-  linux-image-arm64 \
+-  linux-image-3.14-1-arm64
++  linux-image-generic \
++  linux-image-3.14-1-generic
+ unusable \
+-  linux-image-3.14-1-arm64-dbg
++  linux-image-3.14-1-generic-dbg
+diff --git a/kernel/tests/arm64/mustang.test b/kernel/tests/arm64/mustang.test
+index 80ab19f7..e58c06aa 100644
+--- a/kernel/tests/arm64/mustang.test
++++ b/kernel/tests/arm64/mustang.test
+@@ -1,12 +1,12 @@
+ subarch generic
+ cpuinfo mustang.cpuinfo
+-flavour arm64
++flavour generic
+ majors 3.10
+ machine aarch64
+ kernel-3.10 \
+-  linux-image-arm64
++  linux-image-generic
+ usable \
+-  linux-image-arm64 \
+-  linux-image-3.14-1-arm64
++  linux-image-generic \
++  linux-image-3.14-1-generic
+ unusable \
+-  linux-image-3.14-1-arm64-dbg
++  linux-image-3.14-1-generic-dbg
+diff --git a/kernel/tests/arm64/qemu-virt.test b/kernel/tests/arm64/qemu-virt.test
+index 87c39c47..2d880f5c 100644
+--- a/kernel/tests/arm64/qemu-virt.test
++++ b/kernel/tests/arm64/qemu-virt.test
+@@ -1,12 +1,12 @@
+ subarch generic
+ cpuinfo qemu-virt.cpuinfo
+-flavour arm64
++flavour generic
+ majors 3.10
+ machine aarch64
+ kernel-3.10 \
+-  linux-image-arm64
++  linux-image-generic
+ usable \
+-  linux-image-arm64 \
+-  linux-image-3.14-1-arm64
++  linux-image-generic \
++  linux-image-3.14-1-generic
+ unusable \
+-  linux-image-3.14-1-arm64-dbg
++  linux-image-3.14-1-generic-dbg
diff --git a/helpers/DATA/base-installer/patch_changes/003-patch_flavor_tests_armhf.patch b/helpers/DATA/base-installer/patch_changes/003-patch_flavor_tests_armhf.patch
new file mode 100644
index 0000000..a3090b9
--- /dev/null
+++ b/helpers/DATA/base-installer/patch_changes/003-patch_flavor_tests_armhf.patch
@@ -0,0 +1,143 @@
+diff --git a/kernel/tests/armhf/efikamx.test b/kernel/tests/armhf/efikamx.test
+deleted file mode 100644
+index 3fa4eeef..00000000
+--- a/kernel/tests/armhf/efikamx.test
++++ /dev/null
+@@ -1,19 +0,0 @@
+-subarch mx5
+-cpuinfo efikamx.cpuinfo
+-majors 5.7
+-flavour mx5 armmp
+-kernel-5.7 linux-image-mx5 linux-image-armmp
+-usable \
+-  linux-image-mx5 \
+-  linux-image-5.7.0-1-mx5 \
+-  linux-image-armmp \
+-  linux-image-5.7.0-1-armmp
+-unusable \
+-  linux-image-armmp-lpae \
+-  linux-image-netwinder \
+-  linux-image-orion5x \
+-  linux-image-rpc \
+-  linux-image-s3c2410 \
+-  linux-image-kirkwood \
+-  linux-image-vexpress \
+-  linux-image-5.7.0-1-armmp-dbg
+diff --git a/kernel/tests/armhf/highbank.test b/kernel/tests/armhf/highbank.test
+index 1f68d466..37a42821 100644
+--- a/kernel/tests/armhf/highbank.test
++++ b/kernel/tests/armhf/highbank.test
+@@ -1,14 +1,14 @@
+ subarch generic
+ cpuinfo highbank.cpuinfo
+ majors 5.7
+-flavour armmp
++flavour generic
+ kernel-5.7 \
+-  linux-image-armmp
++  linux-image-generic
+ usable \
+-  linux-image-armmp \
+-  linux-image-5.7.0-1-armmp
++  linux-image-generic \
++  linux-image-5.7.0-1-generic
+ unusable \
+-  linux-image-armmp-lpae \
++  linux-image-generic-lpae \
+   linux-image-netwinder \
+   linux-image-orion5x \
+   linux-image-rpc \
+@@ -16,4 +16,4 @@ unusable \
+   linux-image-kirkwood \
+   linux-image-mx5 \
+   linux-image-vexpress \
+-  linux-image-5.7.0-1-armmp-dbg
++  linux-image-5.7.0-1-generic-dbg
+diff --git a/kernel/tests/armhf/midway-no-lpae.test b/kernel/tests/armhf/midway-no-lpae.test
+index 04db5356..056ff08f 100644
+--- a/kernel/tests/armhf/midway-no-lpae.test
++++ b/kernel/tests/armhf/midway-no-lpae.test
+@@ -1,14 +1,14 @@
+ subarch generic
+ cpuinfo midway-no-lpae.cpuinfo
+ majors 5.7
+-flavour armmp
++flavour generic
+ kernel-5.7 \
+-  linux-image-armmp
++  linux-image-generic
+ usable \
+-  linux-image-armmp \
+-  linux-image-5.7.0-1-armmp
++  linux-image-generic \
++  linux-image-5.7.0-1-generic
+ unusable \
+-  linux-image-armmp-lpae \
++  linux-image-generic-lpae \
+   linux-image-netwinder \
+   linux-image-orion5x \
+   linux-image-rpc \
+@@ -16,4 +16,4 @@ unusable \
+   linux-image-kirkwood \
+   linux-image-mx5 \
+   linux-image-vexpress \
+-  linux-image-5.7.0-1-armmp-dbg
++  linux-image-5.7.0-1-generic-dbg
+diff --git a/kernel/tests/armhf/midway.test b/kernel/tests/armhf/midway.test
+index 6a789a1b..a5213a4a 100644
+--- a/kernel/tests/armhf/midway.test
++++ b/kernel/tests/armhf/midway.test
+@@ -1,15 +1,15 @@
+ subarch generic
+ cpuinfo midway.cpuinfo
+ majors 5.7
+-flavour armmp-lpae armmp
++flavour generic-lpae generic
+ kernel-5.7 \
+-  linux-image-armmp-lpae \
+-  linux-image-armmp
++  linux-image-generic-lpae \
++  linux-image-generic
+ usable \
+-  linux-image-armmp \
+-  linux-image-5.7.0-1-armmp \
+-  linux-image-armmp-lpae \
+-  linux-image-5.7.0-1-armmp-lpae
++  linux-image-generic \
++  linux-image-5.7.0-1-generic \
++  linux-image-generic-lpae \
++  linux-image-5.7.0-1-generic-lpae
+ unusable \
+   linux-image-netwinder \
+   linux-image-orion5x \
+@@ -18,4 +18,4 @@ unusable \
+   linux-image-kirkwood \
+   linux-image-mx5 \
+   linux-image-vexpress \
+-  linux-image-5.7.0-1-armmp-dbg
++  linux-image-5.7.0-1-generic-dbg
+diff --git a/kernel/tests/armhf/vexpress.test b/kernel/tests/armhf/vexpress.test
+deleted file mode 100644
+index 19d38dd4..00000000
+--- a/kernel/tests/armhf/vexpress.test
++++ /dev/null
+@@ -1,19 +0,0 @@
+-subarch vexpress
+-cpuinfo vexpress.cpuinfo
+-majors 5.7
+-flavour vexpress armmp
+-kernel-5.7 linux-image-vexpress linux-image-armmp
+-usable \
+-  linux-image-vexpress \
+-  linux-image-3.2.0-4-vexpress \
+-  linux-image-armmp \
+-  linux-image-5.7.0-1-armmp
+-unusable \
+-  linux-image-armmp-lpae \
+-  linux-image-netwinder \
+-  linux-image-orion5x \
+-  linux-image-rpc \
+-  linux-image-s3c2410 \
+-  linux-image-kirkwood \
+-  linux-image-mx5 \
+-  linux-image-5.7.0-1-armmp-dbg
diff --git a/helpers/DATA/base-installer/patch_changes/004-patch_flavor_tests_ppc64el.patch b/helpers/DATA/base-installer/patch_changes/004-patch_flavor_tests_ppc64el.patch
new file mode 100644
index 0000000..b66c5bb
--- /dev/null
+++ b/helpers/DATA/base-installer/patch_changes/004-patch_flavor_tests_ppc64el.patch
@@ -0,0 +1,36 @@
+diff --git a/kernel/tests/ppc64el/postal.test b/kernel/tests/ppc64el/postal.test
+index 9878d14f..33f7c0e3 100644
+--- a/kernel/tests/ppc64el/postal.test
++++ b/kernel/tests/ppc64el/postal.test
+@@ -1,9 +1,9 @@
+ subarch chrp_ibm
+ cpuinfo postal.cpuinfo
+ majors 5.7
+-flavour powerpc64le
++flavour generic
+ kernel-5.7 \
+-  linux-image-powerpc64le
++  linux-image-generic
+ usable \
+-  linux-image-powerpc64le \
+-  linux-image-3.14-1-powerpc64le
++  linux-image-generic \
++  linux-image-3.14-1-generic
+diff --git a/kernel/tests/ppc64el/powernv.test b/kernel/tests/ppc64el/powernv.test
+index 3e7d2250..77b5505a 100644
+--- a/kernel/tests/ppc64el/powernv.test
++++ b/kernel/tests/ppc64el/powernv.test
+@@ -1,9 +1,9 @@
+ subarch chrp_ibm
+ cpuinfo powernv.cpuinfo
+ majors 5.7
+-flavour powerpc64le
++flavour generic
+ kernel-5.7 \
+-  linux-image-powerpc64le
++  linux-image-generic
+ usable \
+-  linux-image-powerpc64le \
+-  linux-image-3.14-1-powerpc64le
++  linux-image-generic \
++  linux-image-3.14-1-generic
diff --git a/helpers/make-base-installer b/helpers/make-base-installer
index 7d45305..6b8542b 100644
--- a/helpers/make-base-installer
+++ b/helpers/make-base-installer
@@ -1,5 +1,6 @@
 #!/bin/sh
 #
+#    Copyright (C) 2025  Luis Guzmán <ark@switnet.org>
 #    Copyright (C) 2009-2020  Rubén Rodríguez <ruben@gnu.org>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -17,23 +18,23 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=3
-EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main'
+VERSION=0.10
+EXTERNAL='deb-src http://ftp.debian.org/debian trixie main'
 REPOKEY=0E98404D386FA1D9
 NETINST=true
 
+#THIS IS AN TESTING RELEASE REMOVE THIS LABEL WHEN COMPLETE
+
 . ./config
 
 cp $DATA/archs/* kernel/
-
-#sed s/KERNEL_PRIO=medium/KERNEL_PRIO=high/g library.sh -i #already high
+apply_patch_changes
+sed -i "s|@REVISION@|$REVISION|" kernel/amd64.sh
 
 #sed 's/main,restricted/main/; s/ubuntu/trisquel/' -i library.sh ./debian/bootstrap-base.postinst
 sed 's/archive.gpg/trisquel-archive-keyring.gpg/' -i ./debian/bootstrap-base.postinst
 sed 's/debian-archive-keyring/trisquel-archive-keyring/' -i ./debian/control
 
-#Fix kernel detection
-patch --no-backup-if-mismatch -p1 < $DATA/kernel_update_list.patch
 cat << EOF > kernel/tests/amd64/cittagazze.test
 cpuinfo cittagazze.cpuinfo
 majors 2.6
@@ -41,20 +42,20 @@ flavour amd64
 kernel-2.6 \
   linux-generic \
   linux-image-generic \
-  linux-generic-hwe-20.04 \
-  linux-image-generic-hwe-20.04 \
+  linux-generic-hwe-$REVISION \
+  linux-image-generic-hwe-$REVISION \
   linux-lowlatency \
   linux-image-lowlatency \
-  linux-lowlatency-hwe-20.04 \
-  linux-image-lowlatency-hwe-20.04 \
-  linux-oem-20.04 \
-  linux-image-oem-20.04 \
+  linux-lowlatency-hwe-$REVISION \
+  linux-image-lowlatency-hwe-$REVISION \
+  linux-oem-$REVISION \
+  linux-image-oem-$REVISION \
   linux-virtual \
   linux-image-virtual \
   linux-image-extra-virtual \
-  linux-virtual-hwe-20.04 \
-  linux-image-virtual-hwe-20.04 \
-  linux-image-extra-virtual-hwe-20.04
+  linux-virtual-hwe-$REVISION \
+  linux-image-virtual-hwe-$REVISION \
+  linux-image-extra-virtual-hwe-$REVISION
 usable \
   linux-generic \
   linux-server \
@@ -91,8 +92,8 @@ unusable \
 env KERNEL_FLAVOUR generic
 EOF
 
-#Temporary disable i386
+# Disable i386
 sed -i "/ARCHES =/s|i386 ||" kernel/Makefile
 
-changelog "Rebranded and adapted for Trisquel"
+changelog "Rebranded and adapted for Trisquel - TESTING (remove when complete)"
 package