diff --git a/build_library/sysext_mangle_flatcar-incus b/build_library/sysext_mangle_flatcar-incus
index c5e3f71c0a1..cc6fe41fed6 100755
--- a/build_library/sysext_mangle_flatcar-incus
+++ b/build_library/sysext_mangle_flatcar-incus
@@ -5,7 +5,7 @@ rootfs="${1}"
 
 pushd "${rootfs}"
 
-rm -rf ./usr/{lib/debug,lib64/pkgconfig,include}/
+rm -rf ./usr/{lib/debug,lib64/pkgconfig,include,lib64/cmake}/
 
 pushd ./usr/lib/systemd/system
 mkdir -p "multi-user.target.d"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/manglefs.sh b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/manglefs.sh
new file mode 100755
index 00000000000..f8e01ea09db
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/manglefs.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -euo pipefail
+
+rootfs="${1}"
+
+rm -rf "${rootfs}/usr/lib/debug"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/manglefs.sh b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/manglefs.sh
index b4db342cbe6..100bd007949 100755
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/manglefs.sh
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/manglefs.sh
@@ -4,6 +4,8 @@ set -euo pipefail
 
 rootfs=${1}
 
+rm -rf "${rootfs}/usr/lib/debug"
+
 # Remove test stuff from python - it's quite large.
 for p in "${rootfs}"/usr/lib/python*; do
     if [[ ! -d ${p} ]]; then