diff --git a/tools/osbuilder/rootfs-builder/rootfs.sh b/tools/osbuilder/rootfs-builder/rootfs.sh
index e229cd97d1..0a79c21bfa 100755
--- a/tools/osbuilder/rootfs-builder/rootfs.sh
+++ b/tools/osbuilder/rootfs-builder/rootfs.sh
@@ -58,6 +58,7 @@ USE_PODMAN=${USE_PODMAN:-""}
 EXTRA_PKGS=${EXTRA_PKGS:-""}
 REPO_URL=${REPO_URL:-""}
 REPO_URL_X86_64=${REPO_URL_X86_64:-""}
+REPO_COMPONENTS=${REPO_COMPONENTS:-""}
 
 KBUILD_SIGN_PIN=${KBUILD_SIGN_PIN:-""}
 NVIDIA_GPU_STACK=${NVIDIA_GPU_STACK:-""}
@@ -569,6 +570,7 @@ build_rootfs_distro()
 			--env EXTRA_PKGS="${EXTRA_PKGS}" \
 			--env REPO_URL="${REPO_URL}" \
 			--env REPO_URL_X86_64="${REPO_URL_X86_64}" \
+			--env REPO_COMPONENTS="${REPO_COMPONENTS}" \
 			--env OSBUILDER_VERSION="${OSBUILDER_VERSION}" \
 			--env OS_VERSION="${OS_VERSION}" \
 			--env VARIANT="${VARIANT}" \
diff --git a/tools/osbuilder/rootfs-builder/ubuntu/config.sh b/tools/osbuilder/rootfs-builder/ubuntu/config.sh
index 36efc6a270..e8e2621513 100644
--- a/tools/osbuilder/rootfs-builder/ubuntu/config.sh
+++ b/tools/osbuilder/rootfs-builder/ubuntu/config.sh
@@ -12,6 +12,7 @@ PACKAGES="chrony iptables dbus"
 [ "$AGENT_INIT" = no ] && PACKAGES+=" init"
 [ "$MEASURED_ROOTFS" = yes ] && PACKAGES+=" cryptsetup-bin e2fsprogs"
 [ "$SECCOMP" = yes ] && PACKAGES+=" libseccomp2"
+REPO_COMPONENTS=${REPO_COMPONENTS:-main}
 
 case "$ARCH" in
 	aarch64) DEB_ARCH=arm64;;
diff --git a/tools/osbuilder/rootfs-builder/ubuntu/rootfs_lib.sh b/tools/osbuilder/rootfs-builder/ubuntu/rootfs_lib.sh
index 8d9745384f..e0d7a041d6 100644
--- a/tools/osbuilder/rootfs-builder/ubuntu/rootfs_lib.sh
+++ b/tools/osbuilder/rootfs-builder/ubuntu/rootfs_lib.sh
@@ -16,6 +16,7 @@ build_rootfs() {
 		EXTRA_PKGS=$(echo "$EXTRA_PKGS" | tr ' ' ',')
 	fi
 	if ! mmdebstrap --mode auto --arch "$DEB_ARCH" --variant required \
+			--components="$REPO_COMPONENTS" \
 			--include "$PACKAGES,$EXTRA_PKGS" "$OS_VERSION" "$rootfs_dir" "$REPO_URL"; then
 		echo "ERROR: mmdebstrap failed, cannot proceed" && exit 1
 	else
diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh
index 724629ebaa..16f9819554 100755
--- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh
+++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh
@@ -109,6 +109,7 @@ GUEST_HOOKS_TARBALL_NAME="${GUEST_HOOKS_TARBALL_NAME:-}"
 EXTRA_PKGS="${EXTRA_PKGS:-}"
 REPO_URL="${REPO_URL:-}"
 REPO_URL_X86_64="${REPO_URL_X86_64:-}"
+REPO_COMPONENTS="${REPO_COMPONENTS:-}"
 AGENT_POLICY="${AGENT_POLICY:-yes}"
 RUNTIME_CHOICE="${RUNTIME_CHOICE:-both}"
 
@@ -147,6 +148,7 @@ docker run \
 	--env EXTRA_PKGS="${EXTRA_PKGS}" \
 	--env REPO_URL="${REPO_URL}" \
 	--env REPO_URL_X86_64="${REPO_URL_X86_64}" \
+	--env REPO_COMPONENTS="${REPO_COMPONENTS}" \
 	--env AGENT_POLICY="${AGENT_POLICY}" \
 	--env RUNTIME_CHOICE="${RUNTIME_CHOICE}" \
 	--env AA_KBC="${AA_KBC:-}" \
diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
index d42d553209..c30baf6476 100755
--- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
+++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
@@ -53,6 +53,7 @@ GUEST_HOOKS_TARBALL_NAME="${GUEST_HOOKS_TARBALL_NAME:-}"
 EXTRA_PKGS="${EXTRA_PKGS:-}"
 REPO_URL="${REPO_URL:-}"
 REPO_URL_X86_64="${REPO_URL_X86_64:-}"
+REPO_COMPONENTS="${REPO_COMPONENTS:-}"
 AGENT_POLICY="${AGENT_POLICY:-yes}"
 TARGET_BRANCH="${TARGET_BRANCH:-main}"
 PUSH_TO_REGISTRY="${PUSH_TO_REGISTRY:-}"
@@ -415,6 +416,10 @@ install_image() {
 		export REPO_URL_X86_64
 	fi
 
+	if [[ -n "${REPO_COMPONENTS}" ]]; then
+		export REPO_COMPONENTS
+	fi
+
 	"${rootfs_builder}" --osname="${os_name}" --osversion="${os_version}" --imagetype=image --prefix="${prefix}" --destdir="${destdir}" --image_initrd_suffix="${variant}"
 }
 
@@ -513,6 +518,10 @@ install_initrd() {
 		export REPO_URL_X86_64
 	fi
 
+	if [[ -n "${REPO_COMPONENTS}" ]]; then
+		export REPO_COMPONENTS
+	fi
+
 	"${rootfs_builder}" --osname="${os_name}" --osversion="${os_version}" --imagetype=initrd --prefix="${prefix}" --destdir="${destdir}" --image_initrd_suffix="${variant}"
 }