diff --git a/helpers/make-apt-mirror b/helpers/make-apt-mirror
index 91fa63a..5962b05 100644
--- a/helpers/make-apt-mirror
+++ b/helpers/make-apt-mirror
@@ -18,10 +18,13 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=4
+VERSION=5
 
 . ./config
 
+# Set version number due to source origin change
+export FULLVERSION="$(sed 's|ubuntu0.22.04.1||' <<< $FULLVERSION)"
+
 cp $DATA/Trisquel-mirror.list debian/
 
 
@@ -51,6 +54,7 @@ index e9c85e9..b6c1c97 100755
 EOF
 
 changelog "Added config and update manpage for Trisquel."
+head -n1 debian/changelog | grep -q ubuntu && echo "error: update upstream version" && exit
 
 package
 
diff --git a/helpers/make-mate-user-admin b/helpers/make-mate-user-admin
index d990f66..f2858c7 100644
--- a/helpers/make-mate-user-admin
+++ b/helpers/make-mate-user-admin
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#    Copyright (C) 2023 Luis Guzmán <ark@switnet.org>
+#    Copyright (C) 2024 Luis Guzmán <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -17,14 +17,18 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=1
+VERSION=2
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu noble main universe'
 
 . ./config
 
+# Set version number due to source origin change
+export FULLVERSION="$(sed 's|build3||' <<< $FULLVERSION)"
+
 # Add cracklib-runtime dependency to debian/control
 patch --no-backup-if-mismatch -p1 < $DATA/add-cracklib-runtime-as-dependency.patch
 
 changelog "Imported into Trisquel Aramo | Added cracklib-runtime dependency."
+head -n1 debian/changelog | grep -q build && echo "error: update upstream version" && exit
 
 package
diff --git a/helpers/make-openssh b/helpers/make-openssh
index c676070..052d025 100644
--- a/helpers/make-openssh
+++ b/helpers/make-openssh
@@ -17,14 +17,14 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=5
+VERSION=6
 NETINST=true
 
 . ./config
 
 #FIXME:T12
 # Set version number due to source origin change
-export FULLVERSION="$(sed 's|ubuntu0.6||' <<< $FULLVERSION)"
+export FULLVERSION="$(sed 's|ubuntu0.7||' <<< $FULLVERSION)"
 
 sed 's:Ubuntu:Trisquel\ GNU/Linux:g' -i debian/rules
 sed "s|^SSH_EXTRAVERSION.*|SSH_EXTRAVERSION := Trisquel_GNU/Linux_$REVISION-$VERSION|" -i debian/rules
diff --git a/helpers/make-pkg-kde-tools b/helpers/make-pkg-kde-tools
index b361a7c..7581840 100644
--- a/helpers/make-pkg-kde-tools
+++ b/helpers/make-pkg-kde-tools
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#    Copyright (C) 2023 Luis Guzman <ark@switnet.org>
+#    Copyright (C) 2024 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=2
+VERSION=3
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu noble universe'
 BACKPORT=true
 BUILD_UNTIL=11.0
@@ -25,7 +25,7 @@ BUILD_UNTIL=11.0
 . ./config
 
 # Fix version number due to early release.
-export FULLVERSION="$(sed 's|ubuntu1||' <<< $FULLVERSION)"
+export FULLVERSION="$(sed 's|ubuntu4||' <<< $FULLVERSION)"
 
 
 changelog "Backported from noble as dependency of libsrtp2 for openssl 3.0 support. || Route backport to upstream ubuntu."