diff --git a/devfile.yaml b/devfile.yaml
index 09564c52654..c5ca651d5d9 100644
--- a/devfile.yaml
+++ b/devfile.yaml
@@ -126,3 +126,25 @@ commands:
         git stash save --include-untracked
         git fetch upstream-code main
         ./rebase.sh
+
+  - id: build-cli
+    exec:
+      label: Build VS Code CLI from sources
+      component: dev
+      workingDir: ${PROJECTS_ROOT}/che-code/code/cli
+      commandLine: |
+        cargo build --release && \
+        cp /projects/che-code/code/cli/target/release/code /projects/code-cli && \
+        rm -rf /projects/che-code/code/cli/target
+      group:
+        kind: build
+
+  - id: open-tunnel
+    exec:
+      label: Create a tunnel to this workspace
+      component: dev
+      workingDir: ${PROJECTS_ROOT}
+      commandLine: |
+        ./code-cli --log debug tunnel --accept-server-license-terms --name ${DEVWORKSPACE_NAME}
+      group:
+        kind: run