diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 791232a3f74fec..443210b15c3c05 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -78,7 +78,7 @@ jobs:
                       .environment/gn_out/.ninja_log
                       .environment/pigweed-venv/*.log
             - name: Setup Build
-              run: scripts/build/gn_gen.sh --args="chip_config_memory_debug_checks=true chip_config_memory_debug_dmalloc=true"
+              run: scripts/build/gn_gen.sh --args="chip_config_memory_debug_checks=true chip_config_memory_debug_dmalloc=false"
             - name: Run Build
               timeout-minutes: 20
               run: scripts/run_in_build_env.sh "ninja -C ./out"
diff --git a/scripts/tests/gn_tests.sh b/scripts/tests/gn_tests.sh
index 13eae351bfb55a..165ae47bd2ff8e 100755
--- a/scripts/tests/gn_tests.sh
+++ b/scripts/tests/gn_tests.sh
@@ -25,11 +25,20 @@ CHIP_ROOT="$(dirname "$0")/../.."
 source "$CHIP_ROOT/scripts/activate.sh"
 
 dmalloc=$(gn --root="$CHIP_ROOT" args "$CHIP_ROOT/out/$BUILD_TYPE" --short --list=chip_config_memory_debug_dmalloc)
-if [ "x$dmalloc" == "xchip_config_memory_debug_dmalloc = true" ]; then
-    eval "$(dmalloc -b -l DMALLOC_LOG -i 1 high)"
-    export G_SLICE
-    G_SLICE=always-malloc # required for dmalloc compatibility
-fi
+
+case "$dmalloc" in
+    "chip_config_memory_debug_dmalloc = true")
+        eval "$(dmalloc -b -i 1 high)"
+        export G_SLICE
+        G_SLICE=always-malloc # required for dmalloc compatibility
+        ;;
+    "chip_config_memory_debug_dmalloc = false") ;;
+
+    *)
+        echo >&2 "Invalid output: \"$dmalloc\""
+        exit 1
+        ;;
+esac
 
 env
 
diff --git a/src/app/chip_data_model.gni b/src/app/chip_data_model.gni
index 6e336f94929eb2..a7627cb678ebff 100644
--- a/src/app/chip_data_model.gni
+++ b/src/app/chip_data_model.gni
@@ -47,7 +47,6 @@ template("chip_data_model") {
     # Assume that IDL name is the same as the zap file name, but instead of
     # '.zap' use '.matter' as extension. This is currently the case in the
     # sample apps, but may change in the future
-    print("AUTO-DETECTING input matter IDL file.")
     _idl = string_replace(invoker.zap_file, ".zap", ".matter")
   }