diff --git a/docs/how-to/how-to-build-and-test-ccv0.md b/docs/how-to/how-to-build-and-test-ccv0.md
index fc06b4b14f..e6718e1e92 100644
--- a/docs/how-to/how-to-build-and-test-ccv0.md
+++ b/docs/how-to/how-to-build-and-test-ccv0.md
@@ -407,6 +407,7 @@ steps:
   configured and created using the VM as a single node cluster and with `AA_KBC` set to `offline_fs_kbc`. 
   ```bash
   $ export KUBERNETES="yes"
+  $ export SKOPEO="yes"
   $ export AA_KBC=offline_fs_kbc
   $ ~/ccv0.sh build_and_install_all
   ```
diff --git a/tools/osbuilder/rootfs-builder/rootfs.sh b/tools/osbuilder/rootfs-builder/rootfs.sh
index fa2dfad496..157988cdf7 100755
--- a/tools/osbuilder/rootfs-builder/rootfs.sh
+++ b/tools/osbuilder/rootfs-builder/rootfs.sh
@@ -668,7 +668,7 @@ EOF
 		attestation_agent_branch="$(get_package_version_from_kata_yaml externals.attestation-agent.branch)"
 		info "Install attestation-agent with KBC ${AA_KBC}"
 		git clone "${attestation_agent_url}" --branch "${attestation_agent_branch}"
-		pushd attestation-agent
+		pushd attestation-agent/app
 		source "${HOME}/.cargo/env"
 		target="${ARCH}-unknown-linux-${LIBC}"
 		if [ "${AA_KBC}" == "eaa_kbc" ] && [ "${ARCH}" == "x86_64" ]; then