diff --git a/helpers/make-apt b/helpers/make-apt
index 5de73ac..4442978 100644
--- a/helpers/make-apt
+++ b/helpers/make-apt
@@ -17,6 +17,8 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
+#STAGE-1-DEBOOTSTRAP
+
 VERSION=4
 COMPONENT=main
 
diff --git a/helpers/make-base-files b/helpers/make-base-files
index 18f9d85..229143a 100644
--- a/helpers/make-base-files
+++ b/helpers/make-base-files
@@ -17,6 +17,8 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
+#STAGE-1-DEBOOTSTRAP
+
 VERSION=7
 . ./config
 
diff --git a/helpers/make-bash b/helpers/make-bash
index 28c80e0..d82ffd0 100644
--- a/helpers/make-bash
+++ b/helpers/make-bash
@@ -17,6 +17,8 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
+#STAGE-1-DEBOOTSTRAP
+
 VERSION=1
 
 . ./config
diff --git a/helpers/make-cdebconf b/helpers/make-cdebconf
index 423a287..f55aa7b 100644
--- a/helpers/make-cdebconf
+++ b/helpers/make-cdebconf
@@ -17,6 +17,8 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
+#STAGE-1-DEBOOTSTRAP
+
 VERSION=2
 NETINST=true
 
diff --git a/helpers/make-dpkg b/helpers/make-dpkg
index 789a4d4..8d3eadf 100644
--- a/helpers/make-dpkg
+++ b/helpers/make-dpkg
@@ -17,6 +17,8 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
+#STAGE-1-DEBOOTSTRAP
+
 VERSION=4
 COMPONENT=main
 
diff --git a/helpers/make-e2fsprogs b/helpers/make-e2fsprogs
index 5523cb8..835333e 100644
--- a/helpers/make-e2fsprogs
+++ b/helpers/make-e2fsprogs
@@ -23,6 +23,8 @@
 # such packages from Debian in order to build the required udeb packages.
 ##
 
+#STAGE-4-UDEBS || #STAGE-1-DEBOOTSTRAP
+
 VERSION=0
 NETINST=true
 . ./config
diff --git a/helpers/make-glibc b/helpers/make-glibc
index af6a383..c2bf538 100644
--- a/helpers/make-glibc
+++ b/helpers/make-glibc
@@ -17,6 +17,8 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
+#STAGE-4-UDEBS || #STAGE-1-DEBOOTSTRAP
+
 VERSION=1
 
 . ./config
diff --git a/helpers/make-gnupg2 b/helpers/make-gnupg2
index 5523cb8..835333e 100644
--- a/helpers/make-gnupg2
+++ b/helpers/make-gnupg2
@@ -23,6 +23,8 @@
 # such packages from Debian in order to build the required udeb packages.
 ##
 
+#STAGE-4-UDEBS || #STAGE-1-DEBOOTSTRAP
+
 VERSION=0
 NETINST=true
 . ./config
diff --git a/helpers/make-libcap2 b/helpers/make-libcap2
index 13a704b..7d14ad7 100644
--- a/helpers/make-libcap2
+++ b/helpers/make-libcap2
@@ -23,6 +23,8 @@
 # such packages from Debian in order to build the required udeb packages.
 ##
 
+#STAGE-4-UDEBS || #STAGE-1-DEBOOTSTRAP
+
 VERSION=1
 NETINST=true
 . ./config
diff --git a/helpers/make-libgcrypt20 b/helpers/make-libgcrypt20
index 5523cb8..835333e 100644
--- a/helpers/make-libgcrypt20
+++ b/helpers/make-libgcrypt20
@@ -23,6 +23,8 @@
 # such packages from Debian in order to build the required udeb packages.
 ##
 
+#STAGE-4-UDEBS || #STAGE-1-DEBOOTSTRAP
+
 VERSION=0
 NETINST=true
 . ./config
diff --git a/helpers/make-libgpg-error b/helpers/make-libgpg-error
index 5523cb8..835333e 100644
--- a/helpers/make-libgpg-error
+++ b/helpers/make-libgpg-error
@@ -23,6 +23,8 @@
 # such packages from Debian in order to build the required udeb packages.
 ##
 
+#STAGE-4-UDEBS || #STAGE-1-DEBOOTSTRAP
+
 VERSION=0
 NETINST=true
 . ./config
diff --git a/helpers/make-libmd b/helpers/make-libmd
index 49ec864..60f8636 100644
--- a/helpers/make-libmd
+++ b/helpers/make-libmd
@@ -23,6 +23,8 @@
 # or fetch such packages from Debian in order to build the required udeb packages.
 ##
 
+#STAGE-4-UDEBS || #STAGE-1-DEBOOTSTRAP
+
 VERSION=0
 NETINST=true
 . ./config
diff --git a/helpers/make-libselinux b/helpers/make-libselinux
index 13a704b..7d14ad7 100644
--- a/helpers/make-libselinux
+++ b/helpers/make-libselinux
@@ -23,6 +23,8 @@
 # such packages from Debian in order to build the required udeb packages.
 ##
 
+#STAGE-4-UDEBS || #STAGE-1-DEBOOTSTRAP
+
 VERSION=1
 NETINST=true
 . ./config
diff --git a/helpers/make-libxcrypt b/helpers/make-libxcrypt
index 5523cb8..835333e 100644
--- a/helpers/make-libxcrypt
+++ b/helpers/make-libxcrypt
@@ -23,6 +23,8 @@
 # such packages from Debian in order to build the required udeb packages.
 ##
 
+#STAGE-4-UDEBS || #STAGE-1-DEBOOTSTRAP
+
 VERSION=0
 NETINST=true
 . ./config
diff --git a/helpers/make-libzstd b/helpers/make-libzstd
index 33c1f2c..9582db2 100644
--- a/helpers/make-libzstd
+++ b/helpers/make-libzstd
@@ -24,6 +24,8 @@
 # or fetch such packages from Debian in order to build the required udeb packages.
 ##
 
+#STAGE-4-UDEBS || #STAGE-1-DEBOOTSTRAP
+
 VERSION=1
 NETINST=true
 . ./config
diff --git a/helpers/make-ncurses b/helpers/make-ncurses
index 7f5e5e4..9e349f0 100644
--- a/helpers/make-ncurses
+++ b/helpers/make-ncurses
@@ -23,6 +23,8 @@
 # such packages from Debian in order to build the required udeb packages.
 ##
 
+#STAGE-4-UDEBS || #STAGE-1-DEBOOTSTRAP
+
 VERSION=2
 NETINST=true
 . ./config
diff --git a/helpers/make-openssl b/helpers/make-openssl
index 5523cb8..835333e 100644
--- a/helpers/make-openssl
+++ b/helpers/make-openssl
@@ -23,6 +23,8 @@
 # such packages from Debian in order to build the required udeb packages.
 ##
 
+#STAGE-4-UDEBS || #STAGE-1-DEBOOTSTRAP
+
 VERSION=0
 NETINST=true
 . ./config
diff --git a/helpers/make-pcre2 b/helpers/make-pcre2
index 5523cb8..835333e 100644
--- a/helpers/make-pcre2
+++ b/helpers/make-pcre2
@@ -23,6 +23,8 @@
 # such packages from Debian in order to build the required udeb packages.
 ##
 
+#STAGE-4-UDEBS || #STAGE-1-DEBOOTSTRAP
+
 VERSION=0
 NETINST=true
 . ./config
diff --git a/helpers/make-systemd b/helpers/make-systemd
index d13d3ec..0a49347 100644
--- a/helpers/make-systemd
+++ b/helpers/make-systemd
@@ -23,6 +23,8 @@
 # or fetch such packages from Debian in order to build the required udeb packages.
 ##
 
+#STAGE-4-UDEBS || #STAGE-1-DEBOOTSTRAP
+
 VERSION=1
 NETINST=true
 . ./config
diff --git a/helpers/make-util-linux b/helpers/make-util-linux
index 49ec864..60f8636 100644
--- a/helpers/make-util-linux
+++ b/helpers/make-util-linux
@@ -23,6 +23,8 @@
 # or fetch such packages from Debian in order to build the required udeb packages.
 ##
 
+#STAGE-4-UDEBS || #STAGE-1-DEBOOTSTRAP
+
 VERSION=0
 NETINST=true
 . ./config
diff --git a/helpers/make-zlib b/helpers/make-zlib
index 5523cb8..835333e 100644
--- a/helpers/make-zlib
+++ b/helpers/make-zlib
@@ -23,6 +23,8 @@
 # such packages from Debian in order to build the required udeb packages.
 ##
 
+#STAGE-4-UDEBS || #STAGE-1-DEBOOTSTRAP
+
 VERSION=0
 NETINST=true
 . ./config