diff --git a/helpers/make-0ad b/helpers/make-0ad
index 8993f57..1002e26 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 a679479..a6ef1e5 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 5ccf0d5..79d147d 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 f90677f..91e3e52 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 d3873c4..a9a229e 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 da88569..2c16a07 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 e185789..e22fb39 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 acd913d..ef808de 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 4546ce7..fbdc0a9 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 d437c57..1b88ab2 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 c5e3cf7..0f2c2b7 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 867ae72..fc1ae67 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 2632db7..d7e7952 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 2432f01..c26b4cb 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 73479f4..9c72760 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 da7e791..221c77a 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 92b95af..97457cc 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 5bf2a9f..2158636 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 e72d95b..ca57b3f 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 4d7c4dd..da5abbf 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 ae181b6..0e70319 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 8c053a6..f0f1bf1 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 8c460ae..4edcbbe 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 c3e53ea..8dbbb6f 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 1418e90..8117690 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 8c460ae..4edcbbe 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 d3155f3..32bf911 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 b4d06ac..4c8b38f 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 dcc9848..2425f5a 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 4571d76..5e2e683 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 694ca75..59af88c 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 c669b24..16fb3c0 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 1cab7fc..e4dc761 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 2eea787..123ee74 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 295da7d..5309bd8 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 527299b..8beccb6 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 2cccc82..83d134b 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 63ee731..6e83715 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 f1ef380..4e1b54d 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 4985738..387bdb3 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 247ac2b..f6aee8b 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 a6657a5..0e719e4 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 0b9e290..ba7aeba 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 90697f0..f592cd2 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 fdf822f..4ed9e17 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 276a3c1..cea12c6 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 9970510..22611bf 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 c8274ff..b7e0687 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 02ca966..41106f9 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 f3ebc6f..60e5960 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 8553f20..5f0d784 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 987d92b..3e128f1 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 713ca13..00154fd 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 186fd8b..09d3557 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 c1a346a..1ebbf9b 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 5e981c5..27bd77c 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 f7a90cb..29be3ba 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 ed9afce..a6cfa28 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 657ee1e..b9aefe1 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 238764b..d4bd4fc 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 0fa663b..2824f2e 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 5ca96e2..81fbabc 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 054d6bd..3f377c8 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 f65bee1..35a6676 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