diff --git a/samples/theia-latest-contributions.yaml b/samples/code-latest.yaml
similarity index 51%
rename from samples/theia-latest-contributions.yaml
rename to samples/code-latest.yaml
index 979014555..60749954b 100644
--- a/samples/theia-latest-contributions.yaml
+++ b/samples/code-latest.yaml
@@ -1,7 +1,7 @@
 kind: DevWorkspace
 apiVersion: workspace.devfile.io/v1alpha2
 metadata:
-  name: theia-latest-contributions
+  name: code-latest
 spec:
   started: true
   template:
@@ -10,19 +10,22 @@ spec:
         git:
           remotes:
             origin: "https://github.com/che-samples/web-nodejs-sample.git"
+    components:
+      - name: dev
+        container:
+          image: quay.io/devfile/universal-developer-image:latest
     commands:
       - id: say-hello
         exec:
-          component: theia-ide
+          component: dev
           commandLine: echo "Hello from $(pwd)"
-          workingDir: ${PROJECTS_ROOT}/project/app
-
+          workingDir: ${PROJECT_SOURCE}/app
   contributions:
-    - name: theia
-      uri: https://che-plugin-registry-main.surge.sh/v3/plugins/eclipse/che-theia/latest/devfile.yaml
+    - name: che-code
+      uri: https://eclipse-che.github.io/che-plugin-registry/main/v3/plugins/che-incubator/che-code/latest/devfile.yaml
       components:
-        - name: theia-ide
+        - name: che-code-runtime-description
           container:
             env:
-              - name: THEIA_HOST
+              - name: CODE_HOST
                 value: 0.0.0.0
diff --git a/samples/container-overrides.yaml b/samples/container-overrides.yaml
index 3d5654c1e..4b72a8019 100644
--- a/samples/container-overrides.yaml
+++ b/samples/container-overrides.yaml
@@ -4,7 +4,6 @@ metadata:
   name: web-terminal-container-overrides
 spec:
   started: true
-
   template:
     attributes:
       controller.devfile.io/storage-type: ephemeral
diff --git a/samples/ephemeral-storage.yaml b/samples/ephemeral-storage.yaml
index 285f0e684..9821a9346 100644
--- a/samples/ephemeral-storage.yaml
+++ b/samples/ephemeral-storage.yaml
@@ -1,7 +1,7 @@
 kind: DevWorkspace
 apiVersion: workspace.devfile.io/v1alpha2
 metadata:
-  name: theia-latest-ephemeral
+  name: code-latest-ephemeral
 spec:
   started: true
   template:
@@ -12,19 +12,18 @@ spec:
         git:
           remotes:
             origin: "https://github.com/che-samples/web-nodejs-sample.git"
-    components:
-      - name: theia
-        plugin:
-          uri: https://che-plugin-registry-main.surge.sh/v3/plugins/eclipse/che-theia/latest/devfile.yaml
-          components:
-            - name: theia-ide
-              container:
-                env:
-                  - name: THEIA_HOST
-                    value: 0.0.0.0
     commands:
       - id: say-hello
         exec:
-          component: theia-ide
+          component: che-code-runtime-description
           commandLine: echo "Hello from $(pwd)"
-          workingDir: ${PROJECTS_ROOT}/project/app
+          workingDir: ${PROJECT_SOURCE}/app
+  contributions:
+    - name: che-code
+      uri: https://eclipse-che.github.io/che-plugin-registry/main/v3/plugins/che-incubator/che-code/latest/devfile.yaml
+      components:
+        - name: che-code-runtime-description
+          container:
+            env:
+              - name: CODE_HOST
+                value: 0.0.0.0
diff --git a/samples/git-clone-sample.yaml b/samples/git-clone-sample.yaml
index 54f6892de..46af77b17 100644
--- a/samples/git-clone-sample.yaml
+++ b/samples/git-clone-sample.yaml
@@ -18,19 +18,18 @@ spec:
           remotes:
             origin: "https://github.com/devfile/devworkspace-operator.git"
             amisevsk: "https://github.com/amisevsk/devworkspace-operator.git"
-    components:
-      - name: theia
-        plugin:
-          uri: https://che-plugin-registry-main.surge.sh/v3/plugins/eclipse/che-theia/latest/devfile.yaml
-          components:
-            - name: theia-ide
-              container:
-                env:
-                  - name: THEIA_HOST
-                    value: 0.0.0.0
     commands:
       - id: say-hello
         exec:
-          component: theia-ide
+          component: che-code-runtime-description
           commandLine: echo "Hello from $(pwd)"
-          workingDir: ${PROJECTS_ROOT}/project/app
+          workingDir: ${PROJECT_SOURCE}/app
+  contributions:
+    - name: che-code
+      uri: https://eclipse-che.github.io/che-plugin-registry/main/v3/plugins/che-incubator/che-code/latest/devfile.yaml
+      components:
+        - name: che-code-runtime-description
+          container:
+            env:
+              - name: CODE_HOST
+                value: 0.0.0.0
diff --git a/samples/per-workspace-storage.yaml b/samples/per-workspace-storage.yaml
index f659416c5..aa6845dce 100644
--- a/samples/per-workspace-storage.yaml
+++ b/samples/per-workspace-storage.yaml
@@ -1,7 +1,7 @@
 kind: DevWorkspace
 apiVersion: workspace.devfile.io/v1alpha2
 metadata:
-  name: theia-latest-per-workspace
+  name: code-latest-per-workspace
 spec:
   started: true
   template:
@@ -12,19 +12,18 @@ spec:
         git:
           remotes:
             origin: "https://github.com/che-samples/web-nodejs-sample.git"
-    components:
-      - name: theia
-        plugin:
-          uri: https://che-plugin-registry-main.surge.sh/v3/plugins/eclipse/che-theia/latest/devfile.yaml
-          components:
-            - name: theia-ide
-              container:
-                env:
-                  - name: THEIA_HOST
-                    value: 0.0.0.0
     commands:
       - id: say-hello
         exec:
-          component: theia-ide
+          component: che-code-runtime-description
           commandLine: echo "Hello from $(pwd)"
-          workingDir: ${PROJECTS_ROOT}/project/app
+          workingDir: ${PROJECT_SOURCE}/app
+  contributions:
+    - name: che-code
+      uri: https://eclipse-che.github.io/che-plugin-registry/main/v3/plugins/che-incubator/che-code/latest/devfile.yaml
+      components:
+        - name: che-code-runtime-description
+          container:
+            env:
+              - name: CODE_HOST
+                value: 0.0.0.0
diff --git a/samples/pod-overrides.yaml b/samples/pod-overrides.yaml
index 63c2a59a9..9d0f3ed9a 100644
--- a/samples/pod-overrides.yaml
+++ b/samples/pod-overrides.yaml
@@ -1,7 +1,7 @@
 kind: DevWorkspace
 apiVersion: workspace.devfile.io/v1alpha2
 metadata:
-  name: theia-latest-pod-overrides
+  name: code-latest-pod-overrides
 spec:
   started: true
   template:
@@ -20,19 +20,18 @@ spec:
         git:
           remotes:
             origin: "https://github.com/che-samples/web-nodejs-sample.git"
-    components:
-      - name: theia
-        plugin:
-          uri: https://che-plugin-registry-main.surge.sh/v3/plugins/eclipse/che-theia/latest/devfile.yaml
-          components:
-            - name: theia-ide
-              container:
-                env:
-                  - name: THEIA_HOST
-                    value: 0.0.0.0
     commands:
       - id: say-hello
         exec:
-          component: theia-ide
+          component: che-code-runtime-description
           commandLine: echo "Hello from $(pwd)"
-          workingDir: ${PROJECTS_ROOT}/project/app
+          workingDir: ${PROJECT_SOURCE}/app
+  contributions:
+    - name: che-code
+      uri: https://eclipse-che.github.io/che-plugin-registry/main/v3/plugins/che-incubator/che-code/latest/devfile.yaml
+      components:
+        - name: che-code-runtime-description
+          container:
+            env:
+              - name: CODE_HOST
+                value: 0.0.0.0
diff --git a/samples/theia-latest.yaml b/samples/theia-latest.yaml
index b5b503652..58ddab137 100644
--- a/samples/theia-latest.yaml
+++ b/samples/theia-latest.yaml
@@ -11,18 +11,21 @@ spec:
           remotes:
             origin: "https://github.com/che-samples/web-nodejs-sample.git"
     components:
-      - name: theia
-        plugin:
-          uri: https://che-plugin-registry-main.surge.sh/v3/plugins/eclipse/che-theia/latest/devfile.yaml
-          components:
-            - name: theia-ide
-              container:
-                env:
-                  - name: THEIA_HOST
-                    value: 0.0.0.0
+      - name: dev
+        container:
+          image: quay.io/devfile/universal-developer-image:latest
     commands:
       - id: say-hello
         exec:
-          component: theia-ide
+          component: dev
           commandLine: echo "Hello from $(pwd)"
-          workingDir: ${PROJECTS_ROOT}/project/app
+          workingDir: ${PROJECT_SOURCE}/app
+  contributions:
+    - name: theia
+      uri: https://eclipse-che.github.io/che-plugin-registry/main/v3/plugins/eclipse/che-theia/latest/devfile.yaml
+      components:
+        - name: theia-ide
+          container:
+            env:
+              - name: THEIA_HOST
+                value: 0.0.0.0