diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md
index cf809314d..76a5779ba 100644
--- a/CONTRIBUTE.md
+++ b/CONTRIBUTE.md
@@ -37,6 +37,8 @@ Here is the expected format of a [`che-editors.yaml`](./che-editors.yaml) editor
       displayName: Jupyter Notebook
       description: Jupyter Notebook for Eclipse Che
       icon: /images/notebook.svg
+      tags:
+        - Tech-Preview
       attributes:
         publisher: ws-skeleton
         version: 5.7.0
@@ -77,6 +79,9 @@ Here are all the supported values, including optional ones:
       description: Run Editor Foo on top of Eclipse Che
       # Editor's icon. The icon should be located in /images folder.
       icon: /images/editor_icon.svg
+      # (OPTIONAL) Array of tags of the current editor. Tech-Preview means it's considered experimental and is not recommended for production environments. While it can include new features and improvements, it may still contain bugs or undergo significant changes before reaching a stable version. 
+      tags:
+        - Tech-Preview
       # (OPTIONAL) Additional attributes
       attributes:
         title: This is my editor
diff --git a/che-editors.yaml b/che-editors.yaml
index 22b918b1b..e875c9ed5 100644
--- a/che-editors.yaml
+++ b/che-editors.yaml
@@ -6,6 +6,8 @@ editors:
       displayName: Jupyter Notebook
       description: Jupyter Notebook for Eclipse Che
       icon: /images/notebook.svg
+      tags:
+        - Tech-Preview
       attributes:
         publisher: ws-skeleton
         version: 5.7.0
@@ -37,6 +39,8 @@ editors:
       displayName: Eclipse Dirigible
       description: Eclipse Dirigible for Eclipse Che
       icon: /images/dirigible.svg
+      tags:
+        - Tech-Preview
       attributes:
         publisher: dirigiblelabs
         version: 3.4.0
@@ -86,6 +90,8 @@ editors:
       displayName: Eclipse IDE with Broadway
       description: Eclipse IDE (in browser using Broadway) for Eclipse Che
       icon: /images/eclipse-ide.svg
+      tags:
+        - Tech-Preview
       attributes:
         publisher: ws-skeleton
         version: 4.9.0
@@ -115,6 +121,8 @@ editors:
       description: An open source distribution of Visual Studio Code (code-server)
         for Eclipse Che
       icon: /images/vscode.svg
+      tags:
+        - Tech-Preview
       attributes:
         publisher: cdr
         version: 3.6.2
@@ -150,6 +158,8 @@ editors:
       description: Microsoft Visual Studio Code - Open Source IDE for Eclipse Che
         - Insiders build
       icon: /images/vscode.svg
+      tags:
+        - Tech-Preview
       attributes:
         publisher: che-incubator
         version: insiders
@@ -325,6 +335,8 @@ editors:
       displayName: IntelliJ IDEA Community
       description: JetBrains IntelliJ IDEA Community IDE for Eclipse Che - next
       icon: /images/intellij-idea.svg
+      tags:
+        - Tech-Preview
       attributes:
         publisher: che-incubator
         version: next
@@ -431,6 +443,8 @@ editors:
       displayName: IntelliJ IDEA Community
       description: JetBrains IntelliJ IDEA Community IDE for Eclipse Che
       icon: /images/intellij-idea.svg
+      tags:
+        - Tech-Preview
       attributes:
         publisher: che-incubator
         version: latest
@@ -537,6 +551,8 @@ editors:
       displayName: JetBrains PyCharm Community
       description: JetBrains PyCharm Community IDE for Eclipse Che - next
       icon: /images/pycharm.svg
+      tags:
+        - Tech-Preview
       attributes:
         publisher: che-incubator
         version: next
@@ -643,6 +659,8 @@ editors:
       displayName: JetBrains PyCharm Community
       description: JetBrains PyCharm Community IDE for Eclipse Che
       icon: /images/pycharm.svg
+      tags:
+        - Tech-Preview
       attributes:
         publisher: che-incubator
         version: latest
@@ -749,6 +767,8 @@ editors:
       displayName: IntelliJ IDEA Ultimate (desktop)
       description: JetBrains IntelliJ IDEA Ultimate dev server for Eclipse Che - next
       icon: /images/intellij-idea.svg
+      tags:
+        - Tech-Preview
       attributes:
         publisher: che-incubator
         version: next
@@ -815,6 +835,8 @@ editors:
       displayName: IntelliJ IDEA Ultimate (desktop)
       description: JetBrains IntelliJ IDEA Ultimate dev server for Eclipse Che - latest
       icon: /images/intellij-idea.svg
+      tags:
+        - Tech-Preview
       attributes:
         publisher: che-incubator
         version: latest
diff --git a/tools/build/src/devfle-yaml/index-writer.ts b/tools/build/src/devfle-yaml/index-writer.ts
index 6818be9b7..8ce058969 100644
--- a/tools/build/src/devfle-yaml/index-writer.ts
+++ b/tools/build/src/devfle-yaml/index-writer.ts
@@ -57,6 +57,7 @@ export class IndexWriter {
         links: {
           devfile: `/v3/plugins/${id}/devfile.yaml`,
         },
+        tags: metadata.tags,
         name: name,
         publisher: publisher,
         type: this.CHE_EDITOR_TYPE,
diff --git a/tools/build/tests/devfile-yaml/index-writer.spec.ts b/tools/build/tests/devfile-yaml/index-writer.spec.ts
index 3bf91e93a..87eabdb96 100644
--- a/tools/build/tests/devfile-yaml/index-writer.spec.ts
+++ b/tools/build/tests/devfile-yaml/index-writer.spec.ts
@@ -31,8 +31,8 @@ describe('Test IndexWriter', () => {
           displayName: 'display-name',
           description: 'my-description',
           icon: '/images/idea.svg',
+          tags: ['my-tag', 'Tech-Preview'],
           attributes: {
-            tags: ['my-tag'],
             icon: 'my-icon',
             category: 'my-category',
             version: 'latest',
@@ -107,6 +107,8 @@ describe('Test IndexWriter', () => {
     expect(jsonOutput[1].type).toBe('Che Editor');
     expect(jsonOutput[1].version).toBe('latest');
     expect(jsonOutput[1].icon).toBe('/v3/images/idea.svg');
+    expect(jsonOutput[1].tags[0]).toBe('my-tag');
+    expect(jsonOutput[1].tags[1]).toBe('Tech-Preview');
 
     expect(jsonOutput[2].id).toBe('my-publisher/my-name/latest');
     expect(jsonOutput[2].description).toBe('my-description');