diff --git a/tools/packaging/guest-image/build_image.sh b/tools/packaging/guest-image/build_image.sh
index 78e8a44de8..27ec99e0b7 100755
--- a/tools/packaging/guest-image/build_image.sh
+++ b/tools/packaging/guest-image/build_image.sh
@@ -26,13 +26,17 @@ build_initrd() {
 	info "Build initrd"
 	info "initrd os: $initrd_distro"
 	info "initrd os version: $initrd_os_version"
-	sudo -E PATH="$PATH" make initrd \
-		DISTRO="$initrd_distro" \
-		DEBUG="${DEBUG:-}" \
-		OS_VERSION="${initrd_os_version}" \
-		ROOTFS_BUILD_DEST="${builddir}/initrd-image" \
-		USE_DOCKER=1 \
-		AGENT_INIT="yes"
+	local rootfs_build_dest="${builddir}/initrd-image"
+	export DISTRO="$initrd_distro"
+	export OS_VERSION="${initrd_os_version}"
+	export USE_DOCKER=1
+	export AGENT_INIT="yes"
+	# ROOTFS_BUILD_DEST is a Make variable
+	sudo -E PATH="$PATH" make rootfs ROOTFS_BUILD_DEST="${rootfs_build_dest}"
+	if [ -n "${INCLUDE_ROOTFS:-}" ]; then
+		sudo cp -RL --preserve=mode "${INCLUDE_ROOTFS}/." "${rootfs_build_dest}/${initrd_distro}_rootfs/"
+	fi
+	sudo -E PATH="$PATH" make initrd ROOTFS_BUILD_DEST="${rootfs_build_dest}"
 	mv "kata-containers-initrd.img" "${install_dir}/${initrd_name}"
 	(
 		cd "${install_dir}"
@@ -44,6 +48,9 @@ build_image() {
 	info "Build image"
 	info "image os: $img_distro"
 	info "image os version: $img_os_version"
+	# CCv0 on image is currently unsupported, do not pass
+	unset SKOPEO_UMOCI
+	unset AA_KBC
 	sudo -E PATH="${PATH}" make image \
 		DISTRO="${img_distro}" \
 		DEBUG="${DEBUG:-}" \
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 589760615c..c026d4c199 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
@@ -37,7 +37,11 @@ docker build -q -t build-kata-deploy \
 docker run ${TTY_OPT} \
 	-v /var/run/docker.sock:/var/run/docker.sock \
 	--user ${uid}:${gid} \
-	--env USER=${USER} -v "${kata_dir}:${kata_dir}" \
+	--env USER=${USER} \
+	--env SKOPEO_UMOCI="${SKOPEO_UMOCI:-}" \
+	--env AA_KBC="${AA_KBC:-}" \
+	--env INCLUDE_ROOTFS="${INCLUDE_ROOTFS:-}" \
+	-v "${kata_dir}:${kata_dir}" \
 	--rm \
 	-w ${script_dir} \
 	build-kata-deploy "${kata_deploy_create}" $@