diff --git a/.github/actions/check_measurements_reproducibility/create_measurements.sh b/.github/actions/check_measurements_reproducibility/create_measurements.sh
index 5c323a730..8b5212058 100755
--- a/.github/actions/check_measurements_reproducibility/create_measurements.sh
+++ b/.github/actions/check_measurements_reproducibility/create_measurements.sh
@@ -14,16 +14,12 @@ for directory in "$1"/system/!(mkosi_wrapper.sh); do
       .list.[]
       | select(
         .attestationVariant == $attestation_variant
+        and (.csp | ascii_downcase) == $csp
       )
-      | select((.csp | ascii_downcase) == $csp)
       | .measurements
-      | walk(
-      if (
-        type=="object" and .warnOnly
-      )
-      then del(.) else . end
-      )
-      | del(..|nulls)
+      | to_entries
+      | map(select(.value.warnOnly | not))
+      | from_entries
       | del(.[] .warnOnly)
   ' \
     measurements.json > "$attestationVariant"_their-measurements.json