diff --git a/build_library/build_image_util.sh b/build_library/build_image_util.sh
index 54b027558d..9981548711 100755
--- a/build_library/build_image_util.sh
+++ b/build_library/build_image_util.sh
@@ -31,6 +31,7 @@ set_build_symlinks() {
 cleanup_mounts() {
   info "Cleaning up mounts"
   "${BUILD_LIBRARY_DIR}/disk_util" umount "$1" || true
+  rmdir "${1}" || true
 }
 
 delete_prompt() {
@@ -763,5 +764,6 @@ EOF
     pushd "${BUILD_DIR}" >/dev/null
     zip --quiet -r -9 "${BUILD_DIR}/${pcr_policy}" pcrs
     popd >/dev/null
+    rm -rf "${BUILD_DIR}/pcrs"
   fi
 }
diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index 9017e466bf..945f6170ec 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -512,6 +512,8 @@ install_oem_aci() {
         "${aci_path}" \
         "${VM_TMP_ROOT}/usr/share/oem/flatcar-oem-${oem_aci}.aci" ||
     die "Could not install ${oem_aci} OEM ACI"
+    # Remove aci_dir if building ACI and installing it succeeded
+    rm -rf "${aci_dir}"
 }
 
 # Any other tweaks required?