diff --git a/repos/github/microsoft/buildxl/analyze.settings.json b/repos/github/microsoft/buildxl/analyze.settings.json
index 558cee3..1dd64f3 100644
--- a/repos/github/microsoft/buildxl/analyze.settings.json
+++ b/repos/github/microsoft/buildxl/analyze.settings.json
@@ -1,4 +1,9 @@
 {
-    "addArguments": [ "--compilerArgumentFile", "{CodexDebugDir}/csargs" ],
+    "addArguments": [ 
+        "--compilerArgumentFile", 
+        "{CodexDebugDir}/csargs",
+        "-e", 
+        "{CodexDebugDir}/cdxdsc"
+    ],
     "repoRoot": "B:/"
 }
\ No newline at end of file
diff --git a/repos/github/microsoft/buildxl/build.cmd b/repos/github/microsoft/buildxl/build.cmd
index c41840b..0f51e5b 100644
--- a/repos/github/microsoft/buildxl/build.cmd
+++ b/repos/github/microsoft/buildxl/build.cmd
@@ -1,3 +1,5 @@
+@echo on
+
 set BUILDXL_LOG_DIR=%CodexDebugDir%/bxllogs
 
 mkdir "%ProgramFiles%/Microsoft Visual Studio/2022/Preview/VC/Tools/MSVC/14.39.33519"
@@ -16,6 +18,9 @@ powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "%~dp0/writeconfi
 set CSARGS_OUTPUT_DIR=%CodexDebugDir%\csargs
 echo CSARGS_OUTPUT_DIR=%CSARGS_OUTPUT_DIR%
 
+set CDXDSC_OUTPUT_DIR=%CodexDebugDir%\cdxdsc
+echo CDXDSC_OUTPUT_DIR=%CDXDSC_OUTPUT_DIR%
+
 echo ----- Running BuildXL build -----
 
 call %SrcDir%\bxl.cmd -DoNotUseDefaultCacheConfigFilePath "/f:(requiredfor(tag='telemetry:csc')or(tag='telemetry:csc'))" /q:Debug /incrementalScheduling- ^
@@ -33,4 +38,6 @@ subst B: %SrcDir%
 
 echo ----- Running Codex script analyzer -----
 
-REM call %SrcDir%\bxlanalyzer.cmd /mode:Codex /xl:%BUILDXL_LOG_DIR% /o:%CSARGS_OUTPUT_DIR%
\ No newline at end of file
+call %SrcDir%\bxl.cmd -DeployDev
+
+call %SrcDir%\Out\Selfhost\Dev\bxlScriptAnalyzer.exe /a:Codex /c:%SrcDir%\config.dsc /o:%CDXDSC_OUTPUT_DIR%
\ No newline at end of file