diff --git a/helpers/make-0ad b/helpers/make-0ad
index 8993f5748581e8cd252e02d2a732d91d3e252aa9..1002e267184beb267a3e23ced18beb1f0c0816a9 100644
--- a/helpers/make-0ad
+++ b/helpers/make-0ad
@@ -21,6 +21,7 @@ VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/oibaf/graphics-drivers/ubuntu $UPSTREAM main'
 REPOKEY="957D2708A03A4626"
 BACKPORT=true
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-0ad-data b/helpers/make-0ad-data
index a6794798e5461666ae3c41aaf3076dba7918b969..a6ef1e510a99e36682ebca290453daf98dd8fdef 100644
--- a/helpers/make-0ad-data
+++ b/helpers/make-0ad-data
@@ -21,6 +21,7 @@ VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/oibaf/graphics-drivers/ubuntu $UPSTREAM main'
 REPOKEY="957D2708A03A4626"
 BACKPORT=true
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-aiohttp-socks b/helpers/make-aiohttp-socks
index 5ccf0d504d430cc4bfa8cbc8368d727dec83c5af..79d147d78e4df49387ff3419c99e427030f9c3d4 100644
--- a/helpers/make-aiohttp-socks
+++ b/helpers/make-aiohttp-socks
@@ -21,6 +21,7 @@ VERSION=2
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=648ACFD622F3D138
 DEPENDS=python-pytest-asyncio
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-aiorpcx b/helpers/make-aiorpcx
index f90677f7dce1c56d115defcf069ede1abcd6efcd..91e3e52074c4621dadec9decb65b056540917e13 100644
--- a/helpers/make-aiorpcx
+++ b/helpers/make-aiorpcx
@@ -18,8 +18,9 @@
 #
 
 VERSION=1
-EXTERNAL='deb-src http://ftp.debian.org/debian testing main'
+EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=648ACFD622F3D138
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-alembic b/helpers/make-alembic
index d3873c4fd2a2090e419de0d8c846007923fc6e87..a9a229e2cf90fb9eaea231156e78b3900822659a 100644
--- a/helpers/make-alembic
+++ b/helpers/make-alembic
@@ -21,6 +21,7 @@ VERSION=1
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=648ACFD622F3D138
 BACKPORTS=true
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-caja-extensions b/helpers/make-caja-extensions
index da885691b7095f49e292567d66cdb3e38aee5c55..2c16a07fb1b964c52883bb188f042b83e9f076c8 100644
--- a/helpers/make-caja-extensions
+++ b/helpers/make-caja-extensions
@@ -19,6 +19,7 @@
 #
 
 VERSION=0
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-carla b/helpers/make-carla
index e18578972a3063b50ab5d38cd0e4dadbc282cfda..e22fb398eb20d96266d526aabc17bebb461bab65 100644
--- a/helpers/make-carla
+++ b/helpers/make-carla
@@ -22,6 +22,7 @@ VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/ubuntustudio-ppa/backports/ubuntu $UPSTREAM main '
 REPOKEY=F596CF7036BBAA6D
 BACKPORTS=true
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-catch2 b/helpers/make-catch2
index acd913d156d1fab79f887b036924bc227f7ae3dc..ef808deb95353faf2ac05815ed473d5689c734f5 100644
--- a/helpers/make-catch2
+++ b/helpers/make-catch2
@@ -21,6 +21,7 @@ VERSION=1
 
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu hirsute main universe'
 REPOKEY=871920D1991BC93C
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-celluloid b/helpers/make-celluloid
index 4546ce793c18456bed756d0a86f7c2476608cab3..fbdc0a9124b843cf57457eeff4e109e2fa5c8ee0 100644
--- a/helpers/make-celluloid
+++ b/helpers/make-celluloid
@@ -21,6 +21,7 @@
 VERSION=2
 EXTERNAL='deb-src https://ppa.launchpadcontent.net/xuzhen666/gnome-mpv/ubuntu $UPSTREAM main'
 REPOKEY=6CAE7FA0B44EEF4EBD4E955F77D026E2EEAD66BD
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-debhelper b/helpers/make-debhelper
index d437c57b8972a7bc1c26d9bc4e76007ca1031685..1b88ab25b2ede5420a298eb00f287a87401e61dd 100644
--- a/helpers/make-debhelper
+++ b/helpers/make-debhelper
@@ -23,6 +23,7 @@ VERSION=2
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu jammy main universe'
 REPOKEY="871920D1991BC93C"
 BACKPORT=true
+BUILD_UNTIL=10.0
 
 
 . ./config
diff --git a/helpers/make-dvdstyler b/helpers/make-dvdstyler
index c5e3cf74447e687b6a6d1fb2e2efcddf02f8c2e4..0f2c2b787c9faab4a965c40ec05bfbc6ac99d8d8 100644
--- a/helpers/make-dvdstyler
+++ b/helpers/make-dvdstyler
@@ -24,6 +24,7 @@ EXTERNAL='deb-src http://ppa.launchpad.net/ubuntuhandbook1/dvdstyler/ubuntu $UPS
 REPOKEY=A0062203196CA4482DDB859E4C1CBE14852541CB
 BACKPORTS=true
 DEPENDS=cdrkit,libbonobo,gnome-vfs,libgnome,libbonoboui,libgnome-keyring,libgnomeui,orbit2
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-electrum b/helpers/make-electrum
index 867ae7296a906704315b0ce72f4c3fac4c0fddbf..fc1ae67e9df508e0069b6cb989825afa83425da0 100644
--- a/helpers/make-electrum
+++ b/helpers/make-electrum
@@ -18,12 +18,12 @@
 #
 
 VERSION=1
-EXTERNAL='deb-src http://ftp.debian.org/debian testing main'
+EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=648ACFD622F3D138
 DEPENDS=aiorpcx,aiohttp-socks,protobuf
 
 . ./config
 
-changelog "Backported from debian testing"
+changelog "Backported from debian stable"
 
 compile
diff --git a/helpers/make-eom b/helpers/make-eom
index 2632db703f78b1f265eada8bcf302b5a62416ec0..d7e7952320a2a170978b6673d061a7d66b9f4eae 100644
--- a/helpers/make-eom
+++ b/helpers/make-eom
@@ -19,6 +19,7 @@
 #
 
 VERSION=0
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-epiphany-browser b/helpers/make-epiphany-browser
index 2432f01e77e76036f8034f97f2a6fe40074c94c2..c26b4cbc54335c95834bb2a926aa5131a92d940a 100644
--- a/helpers/make-epiphany-browser
+++ b/helpers/make-epiphany-browser
@@ -24,7 +24,7 @@ VERSION=1
 cat << EOF > debian/branding.conf.in
 [User Agent]
 Vendor=Trisquel GNU/Linux
-VendorSub=Toutatis $REVISION
+VendorSub=$CODENAME $REVISION
 VendorComment=@PACKAGEVERSION@
 EOF
 
diff --git a/helpers/make-epoptes b/helpers/make-epoptes
index 73479f4f863d6e7268b75bbcd46ad429e992448a..9c727607344c407639ef540dbd1e233b7edf036b 100644
--- a/helpers/make-epoptes
+++ b/helpers/make-epoptes
@@ -18,7 +18,7 @@
 #
 
 VERSION=1
-EXTERNAL='deb-src http://ppa.launchpad.net/ltsp/ppa/ubuntu focal main'
+EXTERNAL='deb-src http://ppa.launchpad.net/ltsp/ppa/ubuntu $UPSTREAM main'
 REPOKEY=B64988E8F9B7EF68
 
 . ./config
diff --git a/helpers/make-evolution-data-server b/helpers/make-evolution-data-server
index da7e791967a379568fa2dd4966ca2071bf18ae88..221c77a0563021d52863a1859c37f7f46f211a25 100644
--- a/helpers/make-evolution-data-server
+++ b/helpers/make-evolution-data-server
@@ -16,6 +16,7 @@
 #    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 VERSION=1
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-gcompris-qt b/helpers/make-gcompris-qt
index 92b95af16466b97992e6fa5a3cf0120b2454862b..97457cc1ce4ec80e0548167ad6d8406a7f4d2c27 100644
--- a/helpers/make-gcompris-qt
+++ b/helpers/make-gcompris-qt
@@ -21,6 +21,7 @@ VERSION=1
 EXTERNAL='deb-src http://ftp.debian.org/debian oldstable-backports main'
 REPOKEY=648ACFD622F3D138
 BACKPORT=true
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-gnome-vfs b/helpers/make-gnome-vfs
index 5bf2a9f92a808908aab8a96b83238a3764929f63..2158636466893db93e2002ece39919777572107b 100644
--- a/helpers/make-gnome-vfs
+++ b/helpers/make-gnome-vfs
@@ -22,10 +22,11 @@ VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/ubuntuhandbook1/dvdstyler/ubuntu $UPSTREAM main'
 REPOKEY=A0062203196CA4482DDB859E4C1CBE14852541CB
 BACKPORTS=true
+BUILD_UNTIL=10.0
 
 . ./config
 
-changelog "Backported from ppa"
+changelog "Backported from ppa as part of dvdstyler dependency"
 
 compile
 
diff --git a/helpers/make-handbrake b/helpers/make-handbrake
index e72d95b6a6652261b477b3d81533bc20e6dabdcb..ca57b3f396065f55799228405c25853699d0afd2 100644
--- a/helpers/make-handbrake
+++ b/helpers/make-handbrake
@@ -18,9 +18,10 @@
 #
 
 VERSION=2
-EXTERNAL="deb-src http://ppa.launchpad.net/stebbins/handbrake-releases/ubuntu focal main"
+EXTERNAL="deb-src http://ppa.launchpad.net/stebbins/handbrake-releases/ubuntu $UPSTREAM main"
 REPOKEY="8771ADB0816950D8"
 BACKPORT=true
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-ibus-typing-booster b/helpers/make-ibus-typing-booster
index 4d7c4dda2ef47bc810c3015cf51d394c4104db78..da5abbf4b30842f959ddab26ef9b55d59ac619b0 100644
--- a/helpers/make-ibus-typing-booster
+++ b/helpers/make-ibus-typing-booster
@@ -20,6 +20,7 @@
 VERSION=1
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu $UPSTREAM-backports main universe'
 BACKPORTS=true
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-kdeconnect b/helpers/make-kdeconnect
index ae181b61bd9bd2c5be309d7e7f5c507028083648..0e7031969f9009444f85dc96440be4bb98b81c51 100644
--- a/helpers/make-kdeconnect
+++ b/helpers/make-kdeconnect
@@ -19,6 +19,7 @@
 #
 
 VERSION=1
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-kiwix b/helpers/make-kiwix
index 8c053a6ae747aaa5cba151d11e4a819c79f7338c..f0f1bf1e11144dab84cfa1291058aac6ee2280f9 100644
--- a/helpers/make-kiwix
+++ b/helpers/make-kiwix
@@ -21,6 +21,7 @@ VERSION=1
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=04EE7237B7D453EC
 BACKPORT=true
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-libbaseencode b/helpers/make-libbaseencode
index 8c460aea1e053f668b8c599ad3c9f8397d7cd06e..4edcbbe6afe60f5f303b5966adc7524b43320e48 100644
--- a/helpers/make-libbaseencode
+++ b/helpers/make-libbaseencode
@@ -21,6 +21,7 @@ VERSION=1
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY="648ACFD622F3D138"
 BACKPORT=true
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-libbonobo b/helpers/make-libbonobo
index c3e53ea69ade3cda277212cc0debc1ecd2edc1ef..8dbbb6f5aa993bd5a900a83242bcaed30dc8c08d 100644
--- a/helpers/make-libbonobo
+++ b/helpers/make-libbonobo
@@ -23,10 +23,11 @@ EXTERNAL='deb-src http://ppa.launchpad.net/ubuntuhandbook1/dvdstyler/ubuntu $UPS
 REPOKEY=A0062203196CA4482DDB859E4C1CBE14852541CB
 BACKPORTS=true
 DEPENDS=orbit2
+BUILD_UNTIL=10.0
 
 . ./config
 
-changelog "Backported from ppa"
+changelog "Backported from ppa as part of dvdstyler dependency"
 
 compile
 
diff --git a/helpers/make-libbonoboui b/helpers/make-libbonoboui
index 1418e90bdd60ae8c73d29ebe82566b523f95de7e..81176909749f262230b77d6078d355f534803a1d 100644
--- a/helpers/make-libbonoboui
+++ b/helpers/make-libbonoboui
@@ -23,10 +23,11 @@ EXTERNAL='deb-src http://ppa.launchpad.net/ubuntuhandbook1/dvdstyler/ubuntu $UPS
 REPOKEY=A0062203196CA4482DDB859E4C1CBE14852541CB
 BACKPORTS=true
 DEPENDS=libbonobo,libgnome,orbit2
+BUILD_UNTIL=10.0
 
 . ./config
 
-changelog "Backported from ppa"
+changelog "Backported from ppa as part of dvdstyler dependency"
 
 compile
 
diff --git a/helpers/make-libcotp b/helpers/make-libcotp
index 8c460aea1e053f668b8c599ad3c9f8397d7cd06e..4edcbbe6afe60f5f303b5966adc7524b43320e48 100644
--- a/helpers/make-libcotp
+++ b/helpers/make-libcotp
@@ -21,6 +21,7 @@ VERSION=1
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY="648ACFD622F3D138"
 BACKPORT=true
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-libgnome b/helpers/make-libgnome
index d3155f3b7e3460b38591518e32b7a213f9dab89e..32bf9112910cdba152204277cfced9a386eabf6e 100644
--- a/helpers/make-libgnome
+++ b/helpers/make-libgnome
@@ -23,10 +23,11 @@ EXTERNAL='deb-src http://ppa.launchpad.net/ubuntuhandbook1/dvdstyler/ubuntu $UPS
 REPOKEY=A0062203196CA4482DDB859E4C1CBE14852541CB
 BACKPORTS=true
 DEPENDS=gnome-vfs,libbonobo,orbit2
+BUILD_UNTIL=10.0
 
 . ./config
 
-changelog "Backported from ppa"
+changelog "Backported from ppa as part of dvdstyler dependency"
 
 compile
 
diff --git a/helpers/make-libgnome-keyring b/helpers/make-libgnome-keyring
index b4d06acc72bdb19a6bddbfd617792161ba9ab748..4c8b38f3246f21297fab45a2e79e4b23e82da15e 100644
--- a/helpers/make-libgnome-keyring
+++ b/helpers/make-libgnome-keyring
@@ -22,10 +22,10 @@ VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/ubuntuhandbook1/dvdstyler/ubuntu $UPSTREAM main'
 REPOKEY=A0062203196CA4482DDB859E4C1CBE14852541CB
 BACKPORTS=true
-#DEPENDS=
+BUILD_UNTIL=10.0
 
 . ./config
 
-changelog "Backported from ppa"
+changelog "Backported from ppa as part of dvdstyler dependency"
 
 compile
diff --git a/helpers/make-libgnomeui b/helpers/make-libgnomeui
index dcc9848b59ce367dbf3d9098f5d786416c9be74d..2425f5a952001cc51b6c0f48df6f6e8164769893 100644
--- a/helpers/make-libgnomeui
+++ b/helpers/make-libgnomeui
@@ -23,10 +23,11 @@ EXTERNAL='deb-src http://ppa.launchpad.net/ubuntuhandbook1/dvdstyler/ubuntu $UPS
 REPOKEY=A0062203196CA4482DDB859E4C1CBE14852541CB
 BACKPORTS=true
 DEPENDS=libbonoboui,libbonobo,libgnome,gnome-vfs,libgnome-keyring
+BUILD_UNTIL=10.0
 
 . ./config
 
-changelog "Backported from ppa"
+changelog "Backported from ppa as part of dvdstyler dependency"
 
 compile
 
diff --git a/helpers/make-libkainjow-mustache b/helpers/make-libkainjow-mustache
index 4571d765fbf282581c899c9a736cc0bd3e55d96f..5e2e6836ee775f65a5ed871e7ad733db72a93899 100644
--- a/helpers/make-libkainjow-mustache
+++ b/helpers/make-libkainjow-mustache
@@ -21,6 +21,7 @@ VERSION=1
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=04EE7237B7D453EC
 BACKPORT=true
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-libkiwix b/helpers/make-libkiwix
index 694ca7571ebcd521ccd90f2967bc4163521a4b0b..59af88c4606293aa6b4aca71ee02a39cb7914010 100644
--- a/helpers/make-libkiwix
+++ b/helpers/make-libkiwix
@@ -21,6 +21,7 @@ VERSION=2
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=04EE7237B7D453EC
 BACKPORT=true
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-libphonenumber b/helpers/make-libphonenumber
index c669b249816bd8a6d720740da0df4b700d8a2dda..16fb3c0e56f5daaec31dd9465804b0eb7e3d3817 100644
--- a/helpers/make-libphonenumber
+++ b/helpers/make-libphonenumber
@@ -20,6 +20,7 @@
 VERSION=1
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=648ACFD622F3D138
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-libreoffice b/helpers/make-libreoffice
index 1cab7fca6d6425efce7638ae5fcd32d8182f7333..e4dc761ba7e39f08a8a2ce840cb9d11af2e134e2 100644
--- a/helpers/make-libreoffice
+++ b/helpers/make-libreoffice
@@ -20,6 +20,7 @@
 VERSION=4
 EXTERNAL='deb-src https://ppa.launchpadcontent.net/libreoffice/libreoffice-still/ubuntu $UPSTREAM main'
 REPOKEY="83FBA1751378B444"
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-libtgowt b/helpers/make-libtgowt
index 2eea78792b7b082ce5810d9bc9364729c8f18ad1..123ee74a54be675bb554c7342bf9dc34ad51458f 100644
--- a/helpers/make-libtgowt
+++ b/helpers/make-libtgowt
@@ -21,6 +21,7 @@ VERSION=2
 EXTERNAL='deb-src http://ftp.debian.org/debian oldstable-backports-sloppy main'
 REPOKEY=648ACFD622F3D138
 BACKPORT=true
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-libtgvoip b/helpers/make-libtgvoip
index 295da7d1ba4f561c8d4349d92a9debd247269f4e..5309bd85b517e714195a804d1f1b845534f2c633 100644
--- a/helpers/make-libtgvoip
+++ b/helpers/make-libtgvoip
@@ -21,6 +21,7 @@ VERSION=2
 EXTERNAL='deb-src http://ftp.debian.org/debian oldstable-backports main'
 REPOKEY=648ACFD622F3D138
 BACKPORT=true
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-ltsp b/helpers/make-ltsp
index 527299bc23bb8619ccc5d5d0527a5b19d99de4a4..8beccb65016b3484cd4e7ab2dd285f6032473d05 100644
--- a/helpers/make-ltsp
+++ b/helpers/make-ltsp
@@ -21,7 +21,7 @@
 #
 
 VERSION=1
-EXTERNAL='deb-src http://ppa.launchpad.net/ltsp/ppa/ubuntu focal main'
+EXTERNAL='deb-src http://ppa.launchpad.net/ltsp/ppa/ubuntu $UPSTREAM main'
 REPOKEY=B64988E8F9B7EF68
 
 . ./config
diff --git a/helpers/make-mate-control-center b/helpers/make-mate-control-center
index 2cccc8244a0f2cc3f97541a1a0b0615d271d6b5f..83d134b756ddd7ec86b20262ec37ebd6ccb6525d 100644
--- a/helpers/make-mate-control-center
+++ b/helpers/make-mate-control-center
@@ -19,6 +19,7 @@
 #
 
 VERSION=0
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-mate-desktop b/helpers/make-mate-desktop
index 63ee731f8252378bc9e78f4d8fb956fd175fb4a4..6e83715e418d5722b86e5ec168528fb4f0afa765 100644
--- a/helpers/make-mate-desktop
+++ b/helpers/make-mate-desktop
@@ -19,6 +19,7 @@
 #
 
 VERSION=0
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-mate-screensaver b/helpers/make-mate-screensaver
index f1ef380c9ed288f3e922ea8779a1c6bdbc952193..4e1b54df2eec867bc1b3da0af182e15a0539a9a0 100644
--- a/helpers/make-mate-screensaver
+++ b/helpers/make-mate-screensaver
@@ -19,6 +19,7 @@
 #
 
 VERSION=0
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-mate-system-monitor b/helpers/make-mate-system-monitor
index 498573817da91ebc576d0dff993092aeb6297836..387bdb3798f6295de8aacb6bb4675074bd64aab2 100644
--- a/helpers/make-mate-system-monitor
+++ b/helpers/make-mate-system-monitor
@@ -19,6 +19,7 @@
 #
 
 VERSION=0
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-mate-utils b/helpers/make-mate-utils
index 247ac2bf77ae114cf38802534cef9e00ceaf9faa..f6aee8b6e9981212daecb576d8ad3077d8955958 100644
--- a/helpers/make-mate-utils
+++ b/helpers/make-mate-utils
@@ -19,6 +19,7 @@
 #
 
 VERSION=0
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-mozo b/helpers/make-mozo
index a6657a5c2537ba571147e1a5570a945fde52bac8..0e719e477428968d9ef9940832e34dc425f6d043 100644
--- a/helpers/make-mozo
+++ b/helpers/make-mozo
@@ -19,6 +19,7 @@
 #
 
 VERSION=0
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-mumble b/helpers/make-mumble
index 0b9e2905e3e142157efc6d3f94c043163a754549..ba7aeba9417ce638161ea5016afc5578a1404147 100644
--- a/helpers/make-mumble
+++ b/helpers/make-mumble
@@ -21,6 +21,7 @@ VERSION=3
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu jammy main universe'
 REPOKEY="871920D1991BC93C"
 BACKPORT=true
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-nextcloud-desktop b/helpers/make-nextcloud-desktop
index 90697f09f39628f3ac24308ea9ecaf1785f50e13..f592cd2d1b23274c032c0b7ff6467238a46af7ab 100644
--- a/helpers/make-nextcloud-desktop
+++ b/helpers/make-nextcloud-desktop
@@ -18,9 +18,10 @@
 #
 
 VERSION=2
-EXTERNAL='deb-src http://ppa.launchpad.net/nextcloud-devs/client/ubuntu focal main'
+EXTERNAL='deb-src http://ppa.launchpad.net/nextcloud-devs/client/ubuntu $UPSTREAM main'
 REPOKEY="60EE47FBAD3DD469"
 BACKPORT=true
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-opendht b/helpers/make-opendht
index fdf822f6cce98aff29df7c00f516a275ed6cb4a5..4ed9e179fa782c65bcaf20a9fde5bd69891a0cac 100644
--- a/helpers/make-opendht
+++ b/helpers/make-opendht
@@ -22,6 +22,7 @@ VERSION=1
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu hirsute main universe'
 REPOKEY=871920D1991BC93C
 DEPENDS=restinio
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-orbit2 b/helpers/make-orbit2
index 276a3c1c72b8d3cee627f5bae6f324ac3837e630..cea12c699d8b52e101f81bfbb97e847c80d84c02 100644
--- a/helpers/make-orbit2
+++ b/helpers/make-orbit2
@@ -22,10 +22,11 @@ VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/ubuntuhandbook1/dvdstyler/ubuntu $UPSTREAM main'
 REPOKEY=A0062203196CA4482DDB859E4C1CBE14852541CB
 BACKPORTS=true
+BUILD_UNTIL=10.0
 
 . ./config
 
-changelog "Backported from ppa"
+changelog "Backported from ppa as part of dvdstyler dependency"
 
 compile
 
diff --git a/helpers/make-otpclient b/helpers/make-otpclient
index 9970510575b37893051a413d6fb9295aa39812b7..22611bf253ee5d6613e34408a141e49181e05e1d 100644
--- a/helpers/make-otpclient
+++ b/helpers/make-otpclient
@@ -21,6 +21,7 @@ VERSION=1
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY="648ACFD622F3D138"
 BACKPORT=true
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-pagure b/helpers/make-pagure
index c8274ff9280296edbeb297d3ff50a9ad0f05dabe..b7e0687ecf7c275e86f4d8adcb3b86e00b8837c2 100644
--- a/helpers/make-pagure
+++ b/helpers/make-pagure
@@ -18,10 +18,11 @@
 #
 
 VERSION=1
-EXTERNAL='deb-src http://ftp.debian.org/debian testing main'
+EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=648ACFD622F3D138
 BACKPORTS=true
 DEPENDS=alembic,python-email-validator
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-pcmanfm b/helpers/make-pcmanfm
index 02ca96657c76c8212098c2cdd2a2cc14ab986637..41106f91c7f65a326f233aff92f64634e56c9c33 100644
--- a/helpers/make-pcmanfm
+++ b/helpers/make-pcmanfm
@@ -18,6 +18,7 @@
 #
 
 VERSION=1
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-protobuf b/helpers/make-protobuf
index f3ebc6f7f09bcdb03f548cf208aa0ee131befb23..60e5960d5c3456fce3dcf8387a81e5d37625eadd 100644
--- a/helpers/make-protobuf
+++ b/helpers/make-protobuf
@@ -20,6 +20,7 @@
 VERSION=1
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=648ACFD622F3D138
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-pspp b/helpers/make-pspp
index 8553f206ae45484e5b7712a700788689f5f3f833..5f0d7844423b44038228e68b8a5077771d8293e7 100644
--- a/helpers/make-pspp
+++ b/helpers/make-pspp
@@ -21,13 +21,13 @@
 VERSION=0
 EXTERNAL='deb-src http://ftp.us.debian.org/debian oldstable main'
 REPOKEY=648ACFD622F3D138
+BUILD_UNTIL=10.0
 
 . ./config
 
 #This helper is for nabia only
 sed -i '/texlive-generic/d' debian/control
 
-
 changelog "Backported from oldstable due to lack of packaging upstream."
 
 compile
diff --git a/helpers/make-python-email-validator b/helpers/make-python-email-validator
index 987d92b9cbaabd3e01ee11b06f67e8f395ab85e5..3e128f153722a14531e82ec2a608b507431fb7a3 100644
--- a/helpers/make-python-email-validator
+++ b/helpers/make-python-email-validator
@@ -18,9 +18,10 @@
 #
 
 VERSION=1
-EXTERNAL='deb-src http://ftp.debian.org/debian testing main'
+EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=648ACFD622F3D138
 BACKPORTS=true
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-python-gwebsockets b/helpers/make-python-gwebsockets
index 713ca132acd56339df90a8d1e1a5c2d0084ec76e..00154fd37c3f99e407a753f65bfc220264b4b683 100644
--- a/helpers/make-python-gwebsockets
+++ b/helpers/make-python-gwebsockets
@@ -20,6 +20,7 @@
 VERSION=2
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu jammy main universe'
 REPOKEY="871920D1991BC93C"
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-restinio b/helpers/make-restinio
index 186fd8bdaa3064df05d58b0035efa95426cb1d36..09d355752c843fa3d781e367fd667d44a1f29241 100644
--- a/helpers/make-restinio
+++ b/helpers/make-restinio
@@ -22,6 +22,7 @@ VERSION=1
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu hirsute main universe'
 REPOKEY=871920D1991BC93C
 DEPENDS=catch2
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-ring b/helpers/make-ring
index c1a346ada70c5022bbbd52dd085ea7e7e980c8be..1ebbf9b6d0a46f107743f1e0c33803858db7e2e6 100644
--- a/helpers/make-ring
+++ b/helpers/make-ring
@@ -22,6 +22,7 @@ VERSION=1
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu hirsute main universe'
 REPOKEY=871920D1991BC93C
 DEPENDS=opendht
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-sane-airscan b/helpers/make-sane-airscan
index 5e981c596eb253dbfab3090b58fac3710b8fc865..27bd77c0f8300b7db2f3e678deaee08556d125c3 100644
--- a/helpers/make-sane-airscan
+++ b/helpers/make-sane-airscan
@@ -20,6 +20,7 @@
 VERSION=2
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu jammy main universe'
 REPOKEY="871920D1991BC93C"
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-sugar b/helpers/make-sugar
index f7a90cb968953253b7fa28edb1369ee430d566ae..29be3baf4bfaab0143619d1f2f046510e0e60e8b 100644
--- a/helpers/make-sugar
+++ b/helpers/make-sugar
@@ -20,6 +20,7 @@
 VERSION=2
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe'
 REPOKEY="871920D1991BC93C"
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-sugar-artwork b/helpers/make-sugar-artwork
index ed9afce03de701f01b5a1e5cf757adca8484186c..a6cfa28ae391e0ad9baf76549894b19e481f14bb 100644
--- a/helpers/make-sugar-artwork
+++ b/helpers/make-sugar-artwork
@@ -20,6 +20,7 @@
 VERSION=2
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe'
 REPOKEY="871920D1991BC93C"
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-sugar-datastore b/helpers/make-sugar-datastore
index 657ee1e3e4551fd4d6ca7ba047935bfba06051bf..b9aefe1084ba232002f71dcaba89ed42afd621cf 100644
--- a/helpers/make-sugar-datastore
+++ b/helpers/make-sugar-datastore
@@ -20,6 +20,7 @@
 VERSION=1
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe'
 REPOKEY="871920D1991BC93C"
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-sugar-toolkit-gtk3 b/helpers/make-sugar-toolkit-gtk3
index 238764b7835a4f21cb8043f0358496a919c82c8d..d4bd4fcba112a949f394c6edbe64e1e2abea9957 100644
--- a/helpers/make-sugar-toolkit-gtk3
+++ b/helpers/make-sugar-toolkit-gtk3
@@ -20,6 +20,7 @@
 VERSION=1
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe'
 REPOKEY="871920D1991BC93C"
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-telegram-desktop b/helpers/make-telegram-desktop
index 0fa663bb938b2e954826d355eb3a4ddd078a422a..2824f2eef81595fdfc9229e023b2ab6e8da94867 100644
--- a/helpers/make-telegram-desktop
+++ b/helpers/make-telegram-desktop
@@ -21,6 +21,7 @@ VERSION=2
 EXTERNAL='deb-src http://ftp.debian.org/debian oldstable-backports-sloppy main'
 REPOKEY=648ACFD622F3D138
 BACKPORT=true
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-ubuntu-mate-artwork b/helpers/make-ubuntu-mate-artwork
index 5ca96e24fdfbc83849568530e8c18d4134067d76..81fbabc08bd79f5b4faa7567b6f336a25c1bb7cf 100644
--- a/helpers/make-ubuntu-mate-artwork
+++ b/helpers/make-ubuntu-mate-artwork
@@ -18,6 +18,7 @@
 #
 
 VERSION=1
+BUILD_UNTIL=10.0
 
 . ./config
 
diff --git a/helpers/make-umbrello b/helpers/make-umbrello
index 054d6bdc24ba3da50420a9e8adc09f20d3b2c9e1..3f377c8200deec14829a457dcab129dfb24ecb59 100644
--- a/helpers/make-umbrello
+++ b/helpers/make-umbrello
@@ -19,7 +19,7 @@
 #
 
 VERSION=0
-EXTERNAL='deb-src http://archive.neon.kde.org/user focal main'
+EXTERNAL='deb-src http://archive.neon.kde.org/user $UPSTREAM main'
 REPOKEY="E6D4736255751E5D"
 BACKPORT=true
 
diff --git a/helpers/make-zimlib b/helpers/make-zimlib
index f65bee1ef64221ab1c7d591f0c9e2c851409b387..35a66767da94b6eb094a39bc7cfa13724d65358e 100644
--- a/helpers/make-zimlib
+++ b/helpers/make-zimlib
@@ -21,6 +21,7 @@ VERSION=2
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=04EE7237B7D453EC
 BACKPORT=true
+BUILD_UNTIL=10.0
 
 . ./config