diff --git a/ci-automation/sdk_bootstrap.sh b/ci-automation/sdk_bootstrap.sh
index f629e0253e..efa99a9f89 100644
--- a/ci-automation/sdk_bootstrap.sh
+++ b/ci-automation/sdk_bootstrap.sh
@@ -213,7 +213,7 @@ function _sdk_bootstrap_impl() {
     fi
     mkdir -p "${logdir}/config-logs"
     # TODO: Add more interesting files (meson logs, cmake logs)
-    local -a interesting_files=( config.log ) find_flags=()
+    local -a interesting_files=( config.log CMakeConfigureLog.yaml meson-log.txt ) find_flags=()
     for f in "${interesting_files[@]}"; do
         if [[ ${#find_flags[@]} -ne 0 ]]; then
             find_flags+=( '-o' )
diff --git a/ci-automation/sdk_container.sh b/ci-automation/sdk_container.sh
index 088826a3a7..d6ff60c353 100644
--- a/ci-automation/sdk_container.sh
+++ b/ci-automation/sdk_container.sh
@@ -65,11 +65,11 @@ function _sdk_container_build_impl() {
     copy_from_buildcache "sdk/${ARCH}/${vernum}/${sdk_tarball}" "./__build__"
 
 
-    # This will update the SDK_VERSION in versionfile
     logdir=__build__/sdk-container-logs-to-upload
     mkdir -p "${logdir}"
     local failed=''
     local logs_tarball="sdk-container-logs-${ARCH}-$(date --utc '+%F-%H%M-%S').tar.xz"
+    # This will update the SDK_VERSION in versionfile
     ./build_sdk_container_image -l "${PWD}/${logdir}" -x ./ci-cleanup.sh ./__build__/"${sdk_tarball}" || failed=x
 
     if [[ -z ${failed} ]]; then