diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 43bf335e..66a7a2d0 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -2,16 +2,19 @@
     // See https://go.microsoft.com/fwlink/?LinkId=733558
     // for the documentation about the tasks.json format
     "version": "2.0.0",
-    "cwd": "${workspaceRoot}/_builds/x86_64_domo-debug/buidlroot/build",
-    "env": {
-        "test": "toto"
-    },
     "tasks": [
         {
             "label": "X86_64 - cmake - domod",
             "type": "shell",
-            "command": "cmake -DSRC_DIR=${workspaceRoot} -DCMAKE_BUILD_TYPE=Debug -DworkspaceRoot=${workspaceRoot} -DCMAKE_TOOLCHAIN_FILE=${workspaceRoot}/bsp/cmake-modules/toolchain-buildroot.cmake ${workspaceRoot}/src/prog/domod/builders/cmake",
+            "command": "mkdir -p ${BUILD_DIR}/domo && cd ${BUILD_DIR}/domo && cmake -DSRC_DIR=${workspaceRoot} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=${workspaceRoot}/bsp/cmake-modules/toolchain-buildroot.cmake ${workspaceRoot}/src/prog/domod/builders/cmake",
             "group": "build",
+            "options": {
+
+                "cwd": "${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/build/",
+                "env": {
+                    "BUILD_DIR": "${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/build/"
+                }
+            },            
             "presentation": {
                 "echo": true,
                 "reveal": "always"
@@ -19,6 +22,9 @@
         },
         {
             "label": "X86_64 - make - domod",
+            "options": {
+                "cwd": "${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/build/domo",
+            },
             "type": "shell",
             "command": "make",
             "group": "build",
diff --git a/bsp/cmake-modules/toolchain-buildroot.cmake b/bsp/cmake-modules/toolchain-buildroot.cmake
index ae57a299..fe414c8a 100644
--- a/bsp/cmake-modules/toolchain-buildroot.cmake
+++ b/bsp/cmake-modules/toolchain-buildroot.cmake
@@ -7,8 +7,8 @@ SET(CMAKE_SYSTEM_VERSION 1)
 
 # specify the cross compiler
 
-SET(CMAKE_C_COMPILER ${workspaceRoot}/_builds/x86_64_domo-debug/cross/usr/bin/x86_64-linux-gcc)
-SET(CMAKE_CXX_COMPILER ${workspaceRoot}/_builds/x86_64_domo-debug/cross/usr/bin/x86_64-linux-g++)
+SET(CMAKE_C_COMPILER ${SRC_DIR}/_builds/x86_64_domo-debug/cross/usr/bin/x86_64-linux-gcc)
+SET(CMAKE_CXX_COMPILER ${SRC_DIR}/_builds/x86_64_domo-debug/cross/usr/bin/x86_64-linux-g++)
 
 # search for programs in the build host directories
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)