diff --git a/tests/integration/gha-run.sh b/tests/integration/gha-run.sh
index 46225bd17..c5cd573d6 100755
--- a/tests/integration/gha-run.sh
+++ b/tests/integration/gha-run.sh
@@ -9,8 +9,7 @@ set -o nounset
 set -o pipefail
 
 integration_dir="$(dirname "$(readlink -f "$0")")"
-repo_root_dir="$(cd "${integration_dir}/../../" && pwd)"
-tools_dir="${repo_root_dir}/tools"
+tools_dir="${integration_dir}/../../tools"
 
 function _print_cluster_name() {
     short_sha="$(git rev-parse --short=12 HEAD)"
diff --git a/tests/integration/kubernetes/setup.sh b/tests/integration/kubernetes/setup.sh
index 6984ad286..614f38827 100755
--- a/tests/integration/kubernetes/setup.sh
+++ b/tests/integration/kubernetes/setup.sh
@@ -8,7 +8,6 @@ set -o nounset
 set -o pipefail
 
 kubernetes_dir=$(dirname "$(readlink -f "$0")")
-repo_root_dir="$(cd "${kubernetes_dir}/../../../" && pwd)"
 
 set_runtime_class() {
     sed -i -e "s|runtimeClassName: kata|runtimeClassName: kata-${KATA_HYPERVISOR}|" ${kubernetes_dir}/runtimeclass_workloads/*.yaml
diff --git a/tools/packaging/guest-image/build_image.sh b/tools/packaging/guest-image/build_image.sh
index fad664651..230538d1c 100755
--- a/tools/packaging/guest-image/build_image.sh
+++ b/tools/packaging/guest-image/build_image.sh
@@ -22,44 +22,45 @@ readonly osbuilder_dir="$(cd "${repo_root_dir}/tools/osbuilder" && pwd)"
 export GOPATH=${GOPATH:-${HOME}/go}
 
 arch_target="$(uname -m)"
-final_artifact_name="kata-containers"
+final_image_name="kata-containers"
+final_initrd_name="kata-containers-initrd"
 image_initrd_extension=".img"
 
 build_initrd() {
 	info "Build initrd"
-	info "initrd os: $os_name"
-	info "initrd os version: $os_version"
+	info "initrd os: $initrd_distro"
+	info "initrd os version: $initrd_os_version"
 	sudo -E PATH="$PATH" make initrd \
-		DISTRO="$os_name" \
+		DISTRO="$initrd_distro" \
 		DEBUG="${DEBUG:-}" \
-		OS_VERSION="${os_version}" \
+		OS_VERSION="${initrd_os_version}" \
 		ROOTFS_BUILD_DEST="${builddir}/initrd-image" \
 		USE_DOCKER=1 \
 		AGENT_INIT="yes"
-	mv "kata-containers-initrd.img" "${install_dir}/${artifact_name}"
+	mv "kata-containers-initrd.img" "${install_dir}/${initrd_name}"
 	(
 		cd "${install_dir}"
-		ln -sf "${artifact_name}" "${final_artifact_name}${image_initrd_extension}"
+		ln -sf "${initrd_name}" "${final_initrd_name}${image_initrd_extension}"
 	)
 }
 
 build_image() {
 	info "Build image"
-	info "image os: $os_name"
-	info "image os version: $os_version"
+	info "image os: $img_distro"
+	info "image os version: $img_os_version"
 	sudo -E PATH="${PATH}" make image \
-		DISTRO="${os_name}" \
+		DISTRO="${img_distro}" \
 		DEBUG="${DEBUG:-}" \
 		USE_DOCKER="1" \
-		IMG_OS_VERSION="${os_version}" \
+		IMG_OS_VERSION="${img_os_version}" \
 		ROOTFS_BUILD_DEST="${builddir}/rootfs-image"
-	mv -f "kata-containers.img" "${install_dir}/${artifact_name}"
+	mv -f "kata-containers.img" "${install_dir}/${image_name}"
 	if [ -e "root_hash.txt" ]; then
 	    cp root_hash.txt "${install_dir}/"
 	fi
 	(
 		cd "${install_dir}"
-		ln -sf "${artifact_name}" "${final_artifact_name}${image_initrd_extension}"
+		ln -sf "${image_name}" "${final_image_name}${image_initrd_extension}"
 	)
 }
 
@@ -73,8 +74,6 @@ Usage:
 ${script_name} [options]
 
 Options:
- --osname=${os_name}
- --osversion=${os_version}
  --imagetype=${image_type}
  --prefix=${prefix}
  --destdir=${destdir}
@@ -95,20 +94,33 @@ main() {
 		case "$opt" in
 		-)
 			case "${OPTARG}" in
-			osname=*)
-				os_name=${OPTARG#*=}
-				;;
-			osversion=*)
-				os_version=${OPTARG#*=}
-				;;
 			imagetype=image)
 				image_type=image
+				#image information
+				img_distro=$(get_from_kata_deps "assets.image.architecture.${arch_target}.name")
+				img_os_version=$(get_from_kata_deps "assets.image.architecture.${arch_target}.version")
+				image_name="kata-${img_distro}-${img_os_version}.${image_type}"
 				;;
 			imagetype=initrd)
 				image_type=initrd
+				#initrd information
+				initrd_distro=$(get_from_kata_deps "assets.initrd.architecture.${arch_target}.name")
+				initrd_os_version=$(get_from_kata_deps "assets.initrd.architecture.${arch_target}.version")
+				initrd_name="kata-${initrd_distro}-${initrd_os_version}.${image_type}"
 				;;
 			image_initrd_suffix=*)
 				image_initrd_suffix=${OPTARG#*=}
+				if [ "${image_initrd_suffix}" == "sev" ]; then
+					initrd_distro=$(get_from_kata_deps "assets.initrd.architecture.${arch_target}.sev.name")
+					initrd_os_version=$(get_from_kata_deps "assets.initrd.architecture.${arch_target}.sev.version")
+					initrd_name="kata-${initrd_distro}-${initrd_os_version}-${image_initrd_suffix}.${image_type}"
+					final_initrd_name="${final_initrd_name}-${image_initrd_suffix}"
+				elif [ "${image_initrd_suffix}" == "tdx" ]; then
+					img_distro=$(get_from_kata_deps "assets.image.architecture.${arch_target}.name")
+					img_os_version=$(get_from_kata_deps "assets.image.architecture.${arch_target}.version")
+					image_name="kata-${img_distro}-${img_os_version}-${image_initrd_suffix}.${image_type}"
+					final_image_name="${final_image_name}-${image_initrd_suffix}"
+				fi
 				;;
 			prefix=*)
 				prefix=${OPTARG#*=}
@@ -137,16 +149,7 @@ main() {
 
 	echo "build ${image_type}"
 
-	if [ "${image_type}" = "initrd" ]; then
-		final_artifact_name+="-initrd"
-	fi
 
-	if [ -n "${image_initrd_suffix}" ]; then
-		artifact_name="kata-${os_name}-${os_version}-${image_initrd_suffix}.${image_type}"
-		final_artifact_name+="-${image_initrd_suffix}"
-	else
-		artifact_name="kata-${os_name}-${os_version}.${image_type}"
-	fi
 
 	install_dir="${destdir}/${prefix}/share/kata-containers/"
 	readonly install_dir
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 2342d4b02..61905c86c 100755
--- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
+++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
@@ -99,7 +99,6 @@ options:
 	rootfs-image
 	rootfs-image-tdx
 	rootfs-initrd
-	rootfs-initrd-mariner
 	rootfs-initrd-sev
 	shim-v2
 	tdvf
@@ -143,13 +142,8 @@ install_cached_tarball_component() {
 
 #Install guest image
 install_image() {
-	local variant="${1:-}"
-
-	image_type="image"
-	if [ -n "${variant}" ]; then
-		image_type+="-${variant}"
-	fi
-
+	local image_type="${1:-"image"}"
+	local initrd_suffix="${2:-""}"
 	local jenkins="${jenkins_url}/job/kata-containers-main-rootfs-${image_type}-$(uname -m)/${cached_artifacts_path}"
 	local component="rootfs-${image_type}"
 
@@ -164,39 +158,25 @@ install_image() {
 	install_cached_tarball_component \
 		"${component}" \
 		"${jenkins}" \
-		"${osbuilder_last_commit}-${guest_image_last_commit}-${agent_last_commit}-${libs_last_commit}-${gperf_version}-${libseccomp_version}-${rust_version}-${image_type}" \
+		"${osbuilder_last_commit}-${guest_image_last_commit}-${agent_last_commit}-${libs_last_commit}-${gperf_version}-${libseccomp_version}-${rust_version}-image" \
 		"" \
 		"${final_tarball_name}" \
 		"${final_tarball_path}" \
 		&& return 0
 
 	info "Create image"
-
-	if [ -n "${variant}" ]; then
-		os_name="$(get_from_kata_deps "assets.image.architecture.${ARCH}.${variant}.name")"
-		os_version="$(get_from_kata_deps "assets.image.architecture.${ARCH}.${variant}.version")"
-	else
-		os_name="$(get_from_kata_deps "assets.image.architecture.${ARCH}.name")"
-		os_version="$(get_from_kata_deps "assets.image.architecture.${ARCH}.version")"
-	fi
-	
-	"${rootfs_builder}" --osname="${os_name}" --osversion="${os_version}" --imagetype=image --prefix="${prefix}" --destdir="${destdir}" --image_initrd_suffix="${variant}"
+	"${rootfs_builder}" --imagetype=image --prefix="${prefix}" --destdir="${destdir}" --image_initrd_suffix="${initrd_suffix}"
 }
 
 #Install guest image for tdx
 install_image_tdx() {
-	install_image "tdx"
+	install_image "image-tdx" "tdx"
 }
 
 #Install guest initrd
 install_initrd() {
-	local variant="${1:-}"
-
-	initrd_type="initrd"
-	if [ -n "${variant}" ]; then
-		initrd_type+="-${variant}"
-	fi
-
+	local initrd_type="${1:-"initrd"}"
+	local initrd_suffix="${2:-""}"
 	local jenkins="${jenkins_url}/job/kata-containers-main-rootfs-${initrd_type}-$(uname -m)/${cached_artifacts_path}"
 	local component="rootfs-${initrd_type}"
 
@@ -218,26 +198,12 @@ install_initrd() {
 		&& return 0
 
 	info "Create initrd"
-
-	if [ -n "${variant}" ]; then
-		os_name="$(get_from_kata_deps "assets.initrd.architecture.${ARCH}.${variant}.name")"
-		os_version="$(get_from_kata_deps "assets.initrd.architecture.${ARCH}.${variant}.version")"
-	else
-		os_name="$(get_from_kata_deps "assets.initrd.architecture.${ARCH}.name")"
-		os_version="$(get_from_kata_deps "assets.initrd.architecture.${ARCH}.version")"
-	fi
-
-	"${rootfs_builder}" --osname="${os_name}" --osversion="${os_version}" --imagetype=initrd --prefix="${prefix}" --destdir="${destdir}" --image_initrd_suffix="${variant}"
-}
-
-#Install Mariner guest initrd
-install_initrd_mariner() {
-	install_initrd "cbl-mariner"
+	"${rootfs_builder}" --imagetype=initrd --prefix="${prefix}" --destdir="${destdir}" --image_initrd_suffix="${initrd_suffix}"
 }
 
 #Install guest initrd for sev
 install_initrd_sev() {
-	install_initrd "sev"
+	install_initrd "initrd-sev" "sev"
 }
 
 #Install kernel component helper
@@ -622,7 +588,6 @@ handle_build() {
 		install_firecracker
 		install_image
 		install_initrd
-		install_initrd_mariner
 		install_initrd_sev
 		install_kernel
 		install_kernel_dragonball_experimental
@@ -678,7 +643,7 @@ handle_build() {
 
 	rootfs-initrd) install_initrd ;;
 
-	rootfs-initrd-mariner) install_initrd_mariner ;;
+	rootfs-initrd-mariner) ;;
 
 	rootfs-initrd-sev) install_initrd_sev ;;
 	
@@ -724,7 +689,6 @@ main() {
 		qemu
 		rootfs-image
 		rootfs-initrd
-		rootfs-initrd-mariner
 		shim-v2
 		virtiofsd
 	)
diff --git a/versions.yaml b/versions.yaml
index 6695834ca..c26a68134 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -122,20 +122,17 @@ assets:
     url: "https://github.com/kata-containers/kata-containers/tools/osbuilder"
     architecture:
       aarch64:
-        name: &default-image-name "ubuntu"
-        version: &default-image-version "latest"
+        name: "ubuntu"
+        version: "latest"
       ppc64le:
-        name: *default-image-name
-        version: *default-image-version
+        name: "ubuntu"
+        version: "latest"
       s390x:
-        name: *default-image-name
-        version: *default-image-version
+        name: "ubuntu"
+        version: "latest"
       x86_64:
-        name: *default-image-name
-        version: *default-image-version
-        tdx:
-          name: *default-image-name
-          version: *default-image-version
+        name: &default-image-name "ubuntu"
+        version: "latest"
     meta:
       image-type: *default-image-name
 
@@ -159,9 +156,6 @@ assets:
       x86_64:
         name: *default-initrd-name
         version: *default-initrd-version
-        cbl-mariner:
-          name: "cbl-mariner"
-          version: "2.0"
         sev:
           name: *glibc-initrd-name
           version: *glibc-initrd-version