diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 7e398e0a3da89c826ad8a389e075580046ef6ec3..bc0c110f22bd80f21518fc833ebf2740f1373509 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -21,7 +21,22 @@
         {
             "label": "Build app evk",
             "type": "shell",
-            "command": "./scripts/docker_run.sh west build -b stm32f4_disco debug-app/app --build-dir .build-debug-app-evk",
+            "command": "./scripts/docker_run.sh west build -b esp32_devkitc_wroom debug-app/app --build-dir .build-debug-app-evk",
+            "problemMatcher": [
+                "$gcc"
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "presentation": {
+                "clear": true
+            }
+        },
+        {
+            "label": "Flash EVK",
+            "type": "shell",
+            "command": "sudo chmod a+rw /dev/ttyUSB0 && ./scripts/docker_run.sh west flash --build-dir .build-debug-app-evk",
             "problemMatcher": [
                 "$gcc"
             ],
@@ -33,21 +48,6 @@
                 "clear": true
             }
         },
-        // {
-        //     "label": "Flash app only",
-        //     "type": "shell",
-        //     "command": "./scripts/docker_run.sh west flash --build-dir .build-mtp-lpmcu-lpc55s28-app-only",
-        //     "problemMatcher": [
-        //         "$gcc"
-        //     ],
-        //     "group": {
-        //         "kind": "build",
-        //         "isDefault": true
-        //     },
-        //     "presentation": {
-        //         "clear": true
-        //     }
-        // },
         // {
         //     "label": "Run Posix",
         //     "type": "shell",
diff --git a/debug-app/west.yml b/debug-app/west.yml
index afe498e06127d20b52025da7ed66bda6740a169b..a8500b6e1761ba0e4fdad3e09d62f88effd78dfb 100644
--- a/debug-app/west.yml
+++ b/debug-app/west.yml
@@ -6,10 +6,11 @@ manifest:
   projects:
     - name: zephyr
       remote: zephyrproject-rtos
-      revision: c0e6629
+      revision: v3.6.0
       import:
         name-allowlist:
           - cmsis      
           - mbedtls
-          - hal_stm32
+          - hal_espressif
+          - tinycrypt
     
\ No newline at end of file