diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock
index f902cd0418..ae945b729d 100644
--- a/src/agent/Cargo.lock
+++ b/src/agent/Cargo.lock
@@ -1849,7 +1849,7 @@ dependencies = [
 [[package]]
 name = "image-rs"
 version = "0.1.0"
-source = "git+https://github.com/confidential-containers/image-rs?tag=v0.6.0#62288ee4cd275c3c9d02c7f650d2cad8d8920b04"
+source = "git+https://github.com/confidential-containers/guest-components?rev=af35c064#af35c0649bab2d000b5c350bc5e60db67ef9e1a5"
 dependencies = [
  "anyhow",
  "async-compression",
@@ -2716,7 +2716,7 @@ dependencies = [
 [[package]]
 name = "ocicrypt-rs"
 version = "0.1.0"
-source = "git+https://github.com/confidential-containers/ocicrypt-rs.git?tag=v0.6.0#c8d248d2a56ba4fd48263f8c442e1f9598b4c8f5"
+source = "git+https://github.com/confidential-containers/guest-components?rev=af35c064#af35c0649bab2d000b5c350bc5e60db67ef9e1a5"
 dependencies = [
  "aes 0.8.2",
  "anyhow",
diff --git a/src/agent/Cargo.toml b/src/agent/Cargo.toml
index 967ab4b11b..430c3170a5 100644
--- a/src/agent/Cargo.toml
+++ b/src/agent/Cargo.toml
@@ -71,7 +71,7 @@ clap = { version = "3.0.1", features = ["derive"] }
 openssl = { version = "0.10.38", features = ["vendored"] }
 
 # Image pull/decrypt
-image-rs = { git = "https://github.com/confidential-containers/image-rs", tag = "v0.6.0", default-features = false, features = ["kata-cc-native-tls"] }
+image-rs = { git = "https://github.com/confidential-containers/guest-components", rev = "af35c064", default-features = false, features = ["kata-cc-native-tls"] }
 
 [patch.crates-io]
 oci-distribution = { git = "https://github.com/krustlet/oci-distribution.git", rev = "f44124c" }
diff --git a/tools/osbuilder/rootfs-builder/rootfs.sh b/tools/osbuilder/rootfs-builder/rootfs.sh
index 82af8ec664..2573b190b5 100755
--- a/tools/osbuilder/rootfs-builder/rootfs.sh
+++ b/tools/osbuilder/rootfs-builder/rootfs.sh
@@ -671,9 +671,9 @@ EOF
 		attestation_agent_version="$(get_package_version_from_kata_yaml externals.attestation-agent.version)"
 		info "Install attestation-agent with KBC ${AA_KBC}"
 		#git clone "${attestation_agent_url}" --branch "${attestation_agent_tag}" --single-branch
-		git clone --depth=1 "${attestation_agent_url}" attestation-agent
+		git clone --depth=1 "${attestation_agent_url}" guest-components
 
-		pushd attestation-agent
+		pushd guest-components/attestation-agent
 		git fetch --depth=1 origin "${attestation_agent_version}"
 		git checkout FETCH_HEAD
 		( [ "${AA_KBC}" == "eaa_kbc" ] || [ "${AA_KBC}" == "cc_kbc_tdx" ] ) && [ "${ARCH}" == "x86_64" ] && LIBC="gnu"
diff --git a/versions.yaml b/versions.yaml
index 1c2ddc790e..ce9c75d042 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -193,8 +193,8 @@ externals:
 
   attestation-agent:
     description: "Provide attested key unwrapping for image decryption"
-    url: "https://github.com/confidential-containers/attestation-agent"
-    version: "v0.6.0"
+    url: "https://github.com/confidential-containers/guest-components/"
+    version: "af35c0649bab2d000b5c350bc5e60db67ef9e1a5"
 
   cni-plugins:
     description: "CNI network plugins"