diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile
index f522fbc359..8b87e04274 100644
--- a/tools/packaging/kata-deploy/local-build/Makefile
+++ b/tools/packaging/kata-deploy/local-build/Makefile
@@ -121,9 +121,6 @@ cc-shim-v2-tarball:
 cc-virtiofsd-tarball:
 	${MAKE} $@-build
 
-cc-tdx-cloud-hypervisor-tarball:
-	${MAKE} $@-build
-
 cc-tdx-kernel-tarball:
 	${MAKE} $@-build
 
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 dc1ff041cc..c3b17f65b1 100755
--- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
+++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
@@ -130,7 +130,7 @@ install_cached_component() {
 	echo "Downloading tarball from: ${jenkins_build_url}/${component_tarball_name}"
 	curl -fL --progress-bar "${jenkins_build_url}/${component_tarball_name}" -o "${component_tarball_path}" || return cleanup_and_fail
 	curl -fsOL "${jenkins_build_url}/sha256sum-${component_tarball_name}" || return cleanup_and_fail
-	sha256sum -c "sha256sum-${component_tarball_name}" && return cleanup_and_fail
+	sha256sum -c "sha256sum-${component_tarball_name}" || return cleanup_and_fail
 	popd
 }
 
@@ -253,11 +253,6 @@ install_cc_virtiofsd() {
 	sudo install -D --owner root --group root --mode 0744 virtiofsd/virtiofsd "${destdir}/${cc_prefix}/libexec/virtiofsd"
 }
 
-# Install static CC cloud-hypervisor asset
-install_tdx_cc_clh() {
-	install_cc_clh
-}
-
 #Install CC kernel assert, with TEE support
 install_cc_tee_kernel() {
 	tee="${1}"
@@ -343,7 +338,7 @@ install_cc_tee_ovmf() {
 	install_cached_component \
 		"${component_name}" \
 		"${jenkins_url}/job/kata-containers-2.0-${component_name}-cc-$(uname -m)/${cached_artifacts_path}" \
-		"$(component_version)" \
+		"${component_version}" \
 		"$(get_ovmf_image_name)" \
 		"${final_tarball_name}" \
 		"${final_tarball_path}" \
@@ -503,8 +498,6 @@ handle_build() {
 
 	cc-virtiofsd) install_cc_virtiofsd ;;
 
-	cc-tdx-cloud-hypervisor) install_tdx_cc_clh ;;
-
 	cc-tdx-kernel) install_cc_tdx_kernel ;;
 
 	cc-sev-kernel) install_cc_sev_kernel ;;
diff --git a/tools/packaging/static-build/cache_components.sh b/tools/packaging/static-build/cache_components.sh
index 678ef4fd09..93b5fb22cb 100755
--- a/tools/packaging/static-build/cache_components.sh
+++ b/tools/packaging/static-build/cache_components.sh
@@ -20,18 +20,18 @@ cache_qemu_artifacts() {
 	local current_qemu_version=$(get_from_kata_deps "assets.hypervisor.qemu.version")
 	if [ -n "${TEE}" ]; then
 		qemu_tarball_name="kata-static-cc-${TEE}-qemu.tar.xz"
-		[ "${TEE}" == "tdx" ] && current_qemu_version=$(get_from_kata_deps "asserts.hypervisor.qemu.tdx.tag")
+		[ "${TEE}" == "tdx" ] && current_qemu_version=$(get_from_kata_deps "assets.hypervisor.qemu.tdx.tag")
 	fi
 	local qemu_script_dir="${repo_root_dir}/tools/packaging/static-build/qemu"
 	local qemu_sha=$(calc_qemu_files_sha256sum)
 	local current_qemu_image="$(get_qemu_image_name)"
+
 	create_cache_asset "${qemu_tarball_name}" "${current_qemu_version}-${qemu_sha}" "${current_qemu_image}"
 }
 
 cache_clh_artifacts() {
-	local clh_tarball_name="kata-static-cc-clh.tar.xz"
-	[ -n "${TEE}" ] && clh_tarball_name="kata-static-cc-tdx-clh.tar.xz"
-	local current_clh_version=$(get_from_kata_deps "assets.cloud-hypervisor.version")
+	local clh_tarball_name="kata-static-cc-cloud-hypervisor.tar.xz"
+	local current_clh_version=$(get_from_kata_deps "assets.hypervisor.cloud_hypervisor.version")
 	create_cache_asset "${clh_tarball_name}" "${current_clh_version}" ""
 }
 
@@ -40,7 +40,7 @@ cache_kernel_artifacts() {
 	local current_kernel_image="$(get_kernel_image_name)"
 	local current_kernel_version="$(get_from_kata_deps "assets.kernel.version")"
 	if [ -n "${TEE}" ]; then 
-		kernel_tarball_name="kata-stastic-cc-${TEE}-kernel.tar.xz"
+		kernel_tarball_name="kata-static-cc-${TEE}-kernel.tar.xz"
 		[ "${TEE}" == "tdx" ] && current_kernel_version="$(get_from_kata_deps "assets.kernel.${TEE}.tag")"
 		[ "${TEE}" == "sev" ] && current_kernel_version="$(get_from_kata_deps "assets.kernel.${TEE}.version")"
 	fi