diff --git a/scripts/build/builders/gn.py b/scripts/build/builders/gn.py
index 75f6bb02c4231e..c350d31422f0de 100644
--- a/scripts/build/builders/gn.py
+++ b/scripts/build/builders/gn.py
@@ -35,7 +35,11 @@ def GnBuildArgs(self):
 
         If used, returns a list of arguments.
         """
-        return None
+        extra_args = []
+        if "/lock-app" in self.root:
+            extra_args.append("chip_enable_icd_server=true")
+            
+        return extra_args if extra_args else None
 
     def GnBuildEnv(self):
         """Extra environment variables needed for the GN build to run.