diff --git a/devfiles/latest/che-idea/latest.yaml b/devfiles/latest/che-idea/latest.yaml
index 0b7057cb..f2395724 100644
--- a/devfiles/latest/che-idea/latest.yaml
+++ b/devfiles/latest/che-idea/latest.yaml
@@ -1,7 +1,61 @@
+schemaVersion: 2.1.0
 metadata:
-  name: che-idea
+  name: IntelliJ IDEA Community Edition
+commands:
+  - id: init-container-command
+    apply:
+      component: che-idea-injector
+events:
+  preStart:
+    - init-container-command
 components:
-  - type: cheEditor
-    reference: 'https://raw.githubusercontent.com/che-incubator/jetbrains-editor-images/meta/che-idea/latest.meta.yaml'
-    alias: che-idea
-apiVersion: 1.0.0
+  - name: che-idea-runtime-description
+    container:
+      image: 'quay.io/devfile/universal-developer-image:ubi8-eda6672'
+      command:
+        - /projector/entrypoint-volume.sh
+      env:
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+        - name: PROJECTOR_CONFIG_DIR
+          value: /home/user/.jetbrains
+      volumeMounts:
+        - name: projector-volume
+          path: /projector
+      memoryLimit: 2048Mi
+      memoryRequest: 256Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
+      endpoints:
+        - name: intellij
+          attributes:
+            type: main
+            cookiesAuthEnabled: true
+            discoverable: false
+            urlRewriteSupported: true
+          targetPort: 8887
+          exposure: public
+          path: '/?backgroundColor=434343&wss'
+          secure: false
+          protocol: http
+    attributes:
+      app.kubernetes.io/component: che-idea-injector
+      app.kubernetes.io/part-of: che-idea.eclipse.org
+  - name: projector-volume
+    volume: {}
+  - name: che-idea-injector
+    container:
+      image: 'quay.io/che-incubator/che-idea:latest'
+      command: ["/projector/entrypoint-init-container.sh"]
+      env:
+        - name: PROJECTOR_VOLUME_MOUNT
+          value: /projector-volume
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+      volumeMounts:
+        - name: projector-volume
+          path: /projector-volume
+      memoryLimit: 128Mi
+      memoryRequest: 32Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
diff --git a/devfiles/latest/che-pycharm/latest.yaml b/devfiles/latest/che-pycharm/latest.yaml
index 5589f6a8..8578836e 100644
--- a/devfiles/latest/che-pycharm/latest.yaml
+++ b/devfiles/latest/che-pycharm/latest.yaml
@@ -1,7 +1,61 @@
+schemaVersion: 2.1.0
 metadata:
-  name: che-pycharm
+  name: PyCharm Community Edition
+commands:
+  - id: init-container-command
+    apply:
+      component: che-pycharm-injector
+events:
+  preStart:
+    - init-container-command
 components:
-  - type: cheEditor
-    reference: 'https://raw.githubusercontent.com/che-incubator/jetbrains-editor-images/meta/che-pycharm/latest.meta.yaml'
-    alias: che-pycharm
-apiVersion: 1.0.0
+  - name: che-pycharm-runtime-description
+    container:
+      image: 'quay.io/devfile/universal-developer-image:ubi8-eda6672'
+      command:
+        - /projector/entrypoint-volume.sh
+      env:
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+        - name: PROJECTOR_CONFIG_DIR
+          value: /home/user/.jetbrains
+      volumeMounts:
+        - name: projector-volume
+          path: /projector
+      memoryLimit: 2048Mi
+      memoryRequest: 256Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
+      endpoints:
+        - name: intellij
+          attributes:
+            type: main
+            cookiesAuthEnabled: true
+            discoverable: false
+            urlRewriteSupported: true
+          targetPort: 8887
+          exposure: public
+          path: '/?backgroundColor=434343&wss'
+          secure: false
+          protocol: http
+    attributes:
+      app.kubernetes.io/component: che-pycharm-injector
+      app.kubernetes.io/part-of: che-pycharm.eclipse.org
+  - name: projector-volume
+    volume: {}
+  - name: che-pycharm-injector
+    container:
+      image: 'quay.io/che-incubator/che-pycharm:latest'
+      command: ["/projector/entrypoint-init-container.sh"]
+      env:
+        - name: PROJECTOR_VOLUME_MOUNT
+          value: /projector-volume
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+      volumeMounts:
+        - name: projector-volume
+          path: /projector-volume
+      memoryLimit: 128Mi
+      memoryRequest: 32Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
diff --git a/devfiles/next/che-idea/2020.3.1-next.yaml b/devfiles/next/che-idea/2020.3.1-next.yaml
index c998ebca..53260551 100644
--- a/devfiles/next/che-idea/2020.3.1-next.yaml
+++ b/devfiles/next/che-idea/2020.3.1-next.yaml
@@ -1,7 +1,61 @@
+schemaVersion: 2.1.0
 metadata:
-  name: che-idea
+  name: IntelliJ IDEA Community Edition
+commands:
+  - id: init-container-command
+    apply:
+      component: che-idea-injector
+events:
+  preStart:
+    - init-container-command
 components:
-  - type: cheEditor
-    reference: 'https://raw.githubusercontent.com/che-incubator/jetbrains-editor-images/meta/che-idea/next/2020.3.1.meta.yaml'
-    alias: che-idea
-apiVersion: 1.0.0
+  - name: che-idea-runtime-description
+    container:
+      image: 'quay.io/devfile/universal-developer-image:ubi8-eda6672'
+      command:
+        - /projector/entrypoint-volume.sh
+      env:
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+        - name: PROJECTOR_CONFIG_DIR
+          value: /home/user/.jetbrains
+      volumeMounts:
+        - name: projector-volume
+          path: /projector
+      memoryLimit: 2048Mi
+      memoryRequest: 256Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
+      endpoints:
+        - name: intellij
+          attributes:
+            type: main
+            cookiesAuthEnabled: true
+            discoverable: false
+            urlRewriteSupported: true
+          targetPort: 8887
+          exposure: public
+          path: '/?backgroundColor=434343&wss'
+          secure: false
+          protocol: http
+    attributes:
+      app.kubernetes.io/component: che-idea-injector
+      app.kubernetes.io/part-of: che-idea.eclipse.org
+  - name: projector-volume
+    volume: {}
+  - name: che-idea-injector
+    container:
+      image: 'quay.io/che-incubator/che-idea:2020.3.1-next'
+      command: ["/projector/entrypoint-init-container.sh"]
+      env:
+        - name: PROJECTOR_VOLUME_MOUNT
+          value: /projector-volume
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+      volumeMounts:
+        - name: projector-volume
+          path: /projector-volume
+      memoryLimit: 128Mi
+      memoryRequest: 32Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
diff --git a/devfiles/next/che-idea/2020.3.2-next.yaml b/devfiles/next/che-idea/2020.3.2-next.yaml
index fd0d5995..49ab28cd 100644
--- a/devfiles/next/che-idea/2020.3.2-next.yaml
+++ b/devfiles/next/che-idea/2020.3.2-next.yaml
@@ -1,7 +1,61 @@
+schemaVersion: 2.1.0
 metadata:
-  name: che-idea
+  name: IntelliJ IDEA Community Edition
+commands:
+  - id: init-container-command
+    apply:
+      component: che-idea-injector
+events:
+  preStart:
+    - init-container-command
 components:
-  - type: cheEditor
-    reference: 'https://raw.githubusercontent.com/che-incubator/jetbrains-editor-images/meta/che-idea/next/2020.3.2.meta.yaml'
-    alias: che-idea
-apiVersion: 1.0.0
+  - name: che-idea-runtime-description
+    container:
+      image: 'quay.io/devfile/universal-developer-image:ubi8-eda6672'
+      command:
+        - /projector/entrypoint-volume.sh
+      env:
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+        - name: PROJECTOR_CONFIG_DIR
+          value: /home/user/.jetbrains
+      volumeMounts:
+        - name: projector-volume
+          path: /projector
+      memoryLimit: 2048Mi
+      memoryRequest: 256Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
+      endpoints:
+        - name: intellij
+          attributes:
+            type: main
+            cookiesAuthEnabled: true
+            discoverable: false
+            urlRewriteSupported: true
+          targetPort: 8887
+          exposure: public
+          path: '/?backgroundColor=434343&wss'
+          secure: false
+          protocol: http
+    attributes:
+      app.kubernetes.io/component: che-idea-injector
+      app.kubernetes.io/part-of: che-idea.eclipse.org
+  - name: projector-volume
+    volume: {}
+  - name: che-idea-injector
+    container:
+      image: 'quay.io/che-incubator/che-idea:2020.3.2-next'
+      command: ["/projector/entrypoint-init-container.sh"]
+      env:
+        - name: PROJECTOR_VOLUME_MOUNT
+          value: /projector-volume
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+      volumeMounts:
+        - name: projector-volume
+          path: /projector-volume
+      memoryLimit: 128Mi
+      memoryRequest: 32Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
diff --git a/devfiles/next/che-idea/2020.3.3-next.yaml b/devfiles/next/che-idea/2020.3.3-next.yaml
index 915c4a41..9bf827b2 100644
--- a/devfiles/next/che-idea/2020.3.3-next.yaml
+++ b/devfiles/next/che-idea/2020.3.3-next.yaml
@@ -1,7 +1,61 @@
+schemaVersion: 2.1.0
 metadata:
-  name: che-idea
+  name: IntelliJ IDEA Community Edition
+commands:
+  - id: init-container-command
+    apply:
+      component: che-idea-injector
+events:
+  preStart:
+    - init-container-command
 components:
-  - type: cheEditor
-    reference: 'https://raw.githubusercontent.com/che-incubator/jetbrains-editor-images/meta/che-idea/next/2020.3.3.meta.yaml'
-    alias: che-idea
-apiVersion: 1.0.0
+  - name: che-idea-runtime-description
+    container:
+      image: 'quay.io/devfile/universal-developer-image:ubi8-eda6672'
+      command:
+        - /projector/entrypoint-volume.sh
+      env:
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+        - name: PROJECTOR_CONFIG_DIR
+          value: /home/user/.jetbrains
+      volumeMounts:
+        - name: projector-volume
+          path: /projector
+      memoryLimit: 2048Mi
+      memoryRequest: 256Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
+      endpoints:
+        - name: intellij
+          attributes:
+            type: main
+            cookiesAuthEnabled: true
+            discoverable: false
+            urlRewriteSupported: true
+          targetPort: 8887
+          exposure: public
+          path: '/?backgroundColor=434343&wss'
+          secure: false
+          protocol: http
+    attributes:
+      app.kubernetes.io/component: che-idea-injector
+      app.kubernetes.io/part-of: che-idea.eclipse.org
+  - name: projector-volume
+    volume: {}
+  - name: che-idea-injector
+    container:
+      image: 'quay.io/che-incubator/che-idea:2020.3.3-next'
+      command: ["/projector/entrypoint-init-container.sh"]
+      env:
+        - name: PROJECTOR_VOLUME_MOUNT
+          value: /projector-volume
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+      volumeMounts:
+        - name: projector-volume
+          path: /projector-volume
+      memoryLimit: 128Mi
+      memoryRequest: 32Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
diff --git a/devfiles/next/che-idea/2020.3.4-next.yaml b/devfiles/next/che-idea/2020.3.4-next.yaml
index 24d8e74c..0a82be33 100644
--- a/devfiles/next/che-idea/2020.3.4-next.yaml
+++ b/devfiles/next/che-idea/2020.3.4-next.yaml
@@ -1,7 +1,61 @@
+schemaVersion: 2.1.0
 metadata:
-  name: che-idea
+  name: IntelliJ IDEA Community Edition
+commands:
+  - id: init-container-command
+    apply:
+      component: che-idea-injector
+events:
+  preStart:
+    - init-container-command
 components:
-  - type: cheEditor
-    reference: 'https://raw.githubusercontent.com/che-incubator/jetbrains-editor-images/meta/che-idea/next/2020.3.4.meta.yaml'
-    alias: che-idea
-apiVersion: 1.0.0
+  - name: che-idea-runtime-description
+    container:
+      image: 'quay.io/devfile/universal-developer-image:ubi8-eda6672'
+      command:
+        - /projector/entrypoint-volume.sh
+      env:
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+        - name: PROJECTOR_CONFIG_DIR
+          value: /home/user/.jetbrains
+      volumeMounts:
+        - name: projector-volume
+          path: /projector
+      memoryLimit: 2048Mi
+      memoryRequest: 256Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
+      endpoints:
+        - name: intellij
+          attributes:
+            type: main
+            cookiesAuthEnabled: true
+            discoverable: false
+            urlRewriteSupported: true
+          targetPort: 8887
+          exposure: public
+          path: '/?backgroundColor=434343&wss'
+          secure: false
+          protocol: http
+    attributes:
+      app.kubernetes.io/component: che-idea-injector
+      app.kubernetes.io/part-of: che-idea.eclipse.org
+  - name: projector-volume
+    volume: {}
+  - name: che-idea-injector
+    container:
+      image: 'quay.io/che-incubator/che-idea:2020.3.4-next'
+      command: ["/projector/entrypoint-init-container.sh"]
+      env:
+        - name: PROJECTOR_VOLUME_MOUNT
+          value: /projector-volume
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+      volumeMounts:
+        - name: projector-volume
+          path: /projector-volume
+      memoryLimit: 128Mi
+      memoryRequest: 32Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
diff --git a/devfiles/next/che-pycharm/2020.3-next.yaml b/devfiles/next/che-pycharm/2020.3-next.yaml
index 1d154cfc..3d22ad68 100644
--- a/devfiles/next/che-pycharm/2020.3-next.yaml
+++ b/devfiles/next/che-pycharm/2020.3-next.yaml
@@ -1,7 +1,61 @@
+schemaVersion: 2.1.0
 metadata:
-  name: che-pycharm
+  name: PyCharm Community Edition
+commands:
+  - id: init-container-command
+    apply:
+      component: che-pycharm-injector
+events:
+  preStart:
+    - init-container-command
 components:
-  - type: cheEditor
-    reference: 'https://raw.githubusercontent.com/che-incubator/jetbrains-editor-images/meta/che-pycharm/next/2020.3.meta.yaml'
-    alias: che-pycharm
-apiVersion: 1.0.0
+  - name: che-pycharm-runtime-description
+    container:
+      image: 'quay.io/devfile/universal-developer-image:ubi8-eda6672'
+      command:
+        - /projector/entrypoint-volume.sh
+      env:
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+        - name: PROJECTOR_CONFIG_DIR
+          value: /home/user/.jetbrains
+      volumeMounts:
+        - name: projector-volume
+          path: /projector
+      memoryLimit: 2048Mi
+      memoryRequest: 256Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
+      endpoints:
+        - name: intellij
+          attributes:
+            type: main
+            cookiesAuthEnabled: true
+            discoverable: false
+            urlRewriteSupported: true
+          targetPort: 8887
+          exposure: public
+          path: '/?backgroundColor=434343&wss'
+          secure: false
+          protocol: http
+    attributes:
+      app.kubernetes.io/component: che-pycharm-injector
+      app.kubernetes.io/part-of: che-pycharm.eclipse.org
+  - name: projector-volume
+    volume: {}
+  - name: che-pycharm-injector
+    container:
+      image: 'quay.io/che-incubator/che-pycharm:2020.3-next'
+      command: ["/projector/entrypoint-init-container.sh"]
+      env:
+        - name: PROJECTOR_VOLUME_MOUNT
+          value: /projector-volume
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+      volumeMounts:
+        - name: projector-volume
+          path: /projector-volume
+      memoryLimit: 128Mi
+      memoryRequest: 32Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
diff --git a/devfiles/next/che-pycharm/2020.3.1-next.yaml b/devfiles/next/che-pycharm/2020.3.1-next.yaml
index 22acc741..4dad5553 100644
--- a/devfiles/next/che-pycharm/2020.3.1-next.yaml
+++ b/devfiles/next/che-pycharm/2020.3.1-next.yaml
@@ -1,7 +1,61 @@
+schemaVersion: 2.1.0
 metadata:
-  name: che-pycharm
+  name: PyCharm Community Edition
+commands:
+  - id: init-container-command
+    apply:
+      component: che-pycharm-injector
+events:
+  preStart:
+    - init-container-command
 components:
-  - type: cheEditor
-    reference: 'https://raw.githubusercontent.com/che-incubator/jetbrains-editor-images/meta/che-pycharm/next/2020.3.1.meta.yaml'
-    alias: che-pycharm
-apiVersion: 1.0.0
+  - name: che-pycharm-runtime-description
+    container:
+      image: 'quay.io/devfile/universal-developer-image:ubi8-eda6672'
+      command:
+        - /projector/entrypoint-volume.sh
+      env:
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+        - name: PROJECTOR_CONFIG_DIR
+          value: /home/user/.jetbrains
+      volumeMounts:
+        - name: projector-volume
+          path: /projector
+      memoryLimit: 2048Mi
+      memoryRequest: 256Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
+      endpoints:
+        - name: intellij
+          attributes:
+            type: main
+            cookiesAuthEnabled: true
+            discoverable: false
+            urlRewriteSupported: true
+          targetPort: 8887
+          exposure: public
+          path: '/?backgroundColor=434343&wss'
+          secure: false
+          protocol: http
+    attributes:
+      app.kubernetes.io/component: che-pycharm-injector
+      app.kubernetes.io/part-of: che-pycharm.eclipse.org
+  - name: projector-volume
+    volume: {}
+  - name: che-pycharm-injector
+    container:
+      image: 'quay.io/che-incubator/che-pycharm:2020.3.1-next'
+      command: ["/projector/entrypoint-init-container.sh"]
+      env:
+        - name: PROJECTOR_VOLUME_MOUNT
+          value: /projector-volume
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+      volumeMounts:
+        - name: projector-volume
+          path: /projector-volume
+      memoryLimit: 128Mi
+      memoryRequest: 32Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
diff --git a/devfiles/next/che-pycharm/2020.3.2-next.yaml b/devfiles/next/che-pycharm/2020.3.2-next.yaml
index e5af74a0..402735e2 100644
--- a/devfiles/next/che-pycharm/2020.3.2-next.yaml
+++ b/devfiles/next/che-pycharm/2020.3.2-next.yaml
@@ -1,7 +1,61 @@
+schemaVersion: 2.1.0
 metadata:
-  name: che-pycharm
+  name: PyCharm Community Edition
+commands:
+  - id: init-container-command
+    apply:
+      component: che-pycharm-injector
+events:
+  preStart:
+    - init-container-command
 components:
-  - type: cheEditor
-    reference: 'https://raw.githubusercontent.com/che-incubator/jetbrains-editor-images/meta/che-pycharm/next/2020.3.2.meta.yaml'
-    alias: che-pycharm
-apiVersion: 1.0.0
+  - name: che-pycharm-runtime-description
+    container:
+      image: 'quay.io/devfile/universal-developer-image:ubi8-eda6672'
+      command:
+        - /projector/entrypoint-volume.sh
+      env:
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+        - name: PROJECTOR_CONFIG_DIR
+          value: /home/user/.jetbrains
+      volumeMounts:
+        - name: projector-volume
+          path: /projector
+      memoryLimit: 2048Mi
+      memoryRequest: 256Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
+      endpoints:
+        - name: intellij
+          attributes:
+            type: main
+            cookiesAuthEnabled: true
+            discoverable: false
+            urlRewriteSupported: true
+          targetPort: 8887
+          exposure: public
+          path: '/?backgroundColor=434343&wss'
+          secure: false
+          protocol: http
+    attributes:
+      app.kubernetes.io/component: che-pycharm-injector
+      app.kubernetes.io/part-of: che-pycharm.eclipse.org
+  - name: projector-volume
+    volume: {}
+  - name: che-pycharm-injector
+    container:
+      image: 'quay.io/che-incubator/che-pycharm:2020.3.2-next'
+      command: ["/projector/entrypoint-init-container.sh"]
+      env:
+        - name: PROJECTOR_VOLUME_MOUNT
+          value: /projector-volume
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+      volumeMounts:
+        - name: projector-volume
+          path: /projector-volume
+      memoryLimit: 128Mi
+      memoryRequest: 32Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
diff --git a/devfiles/next/che-pycharm/2020.3.3-next.yaml b/devfiles/next/che-pycharm/2020.3.3-next.yaml
index 02686bc5..4667ec20 100644
--- a/devfiles/next/che-pycharm/2020.3.3-next.yaml
+++ b/devfiles/next/che-pycharm/2020.3.3-next.yaml
@@ -1,7 +1,61 @@
+schemaVersion: 2.1.0
 metadata:
-  name: che-pycharm
+  name: PyCharm Community Edition
+commands:
+  - id: init-container-command
+    apply:
+      component: che-pycharm-injector
+events:
+  preStart:
+    - init-container-command
 components:
-  - type: cheEditor
-    reference: 'https://raw.githubusercontent.com/che-incubator/jetbrains-editor-images/meta/che-pycharm/next/2020.3.3.meta.yaml'
-    alias: che-pycharm
-apiVersion: 1.0.0
+  - name: che-pycharm-runtime-description
+    container:
+      image: 'quay.io/devfile/universal-developer-image:ubi8-eda6672'
+      command:
+        - /projector/entrypoint-volume.sh
+      env:
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+        - name: PROJECTOR_CONFIG_DIR
+          value: /home/user/.jetbrains
+      volumeMounts:
+        - name: projector-volume
+          path: /projector
+      memoryLimit: 2048Mi
+      memoryRequest: 256Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
+      endpoints:
+        - name: intellij
+          attributes:
+            type: main
+            cookiesAuthEnabled: true
+            discoverable: false
+            urlRewriteSupported: true
+          targetPort: 8887
+          exposure: public
+          path: '/?backgroundColor=434343&wss'
+          secure: false
+          protocol: http
+    attributes:
+      app.kubernetes.io/component: che-pycharm-injector
+      app.kubernetes.io/part-of: che-pycharm.eclipse.org
+  - name: projector-volume
+    volume: {}
+  - name: che-pycharm-injector
+    container:
+      image: 'quay.io/che-incubator/che-pycharm:2020.3.3-next'
+      command: ["/projector/entrypoint-init-container.sh"]
+      env:
+        - name: PROJECTOR_VOLUME_MOUNT
+          value: /projector-volume
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+      volumeMounts:
+        - name: projector-volume
+          path: /projector-volume
+      memoryLimit: 128Mi
+      memoryRequest: 32Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
diff --git a/devfiles/next/che-pycharm/2020.3.4-next.yaml b/devfiles/next/che-pycharm/2020.3.4-next.yaml
index 4434764f..0978918f 100644
--- a/devfiles/next/che-pycharm/2020.3.4-next.yaml
+++ b/devfiles/next/che-pycharm/2020.3.4-next.yaml
@@ -1,7 +1,61 @@
+schemaVersion: 2.1.0
 metadata:
-  name: che-pycharm
+  name: PyCharm Community Edition
+commands:
+  - id: init-container-command
+    apply:
+      component: che-pycharm-injector
+events:
+  preStart:
+    - init-container-command
 components:
-  - type: cheEditor
-    reference: 'https://raw.githubusercontent.com/che-incubator/jetbrains-editor-images/meta/che-pycharm/next/2020.3.4.meta.yaml'
-    alias: che-pycharm
-apiVersion: 1.0.0
+  - name: che-pycharm-runtime-description
+    container:
+      image: 'quay.io/devfile/universal-developer-image:ubi8-eda6672'
+      command:
+        - /projector/entrypoint-volume.sh
+      env:
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+        - name: PROJECTOR_CONFIG_DIR
+          value: /home/user/.jetbrains
+      volumeMounts:
+        - name: projector-volume
+          path: /projector
+      memoryLimit: 2048Mi
+      memoryRequest: 256Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
+      endpoints:
+        - name: intellij
+          attributes:
+            type: main
+            cookiesAuthEnabled: true
+            discoverable: false
+            urlRewriteSupported: true
+          targetPort: 8887
+          exposure: public
+          path: '/?backgroundColor=434343&wss'
+          secure: false
+          protocol: http
+    attributes:
+      app.kubernetes.io/component: che-pycharm-injector
+      app.kubernetes.io/part-of: che-pycharm.eclipse.org
+  - name: projector-volume
+    volume: {}
+  - name: che-pycharm-injector
+    container:
+      image: 'quay.io/che-incubator/che-pycharm:2020.3.4-next'
+      command: ["/projector/entrypoint-init-container.sh"]
+      env:
+        - name: PROJECTOR_VOLUME_MOUNT
+          value: /projector-volume
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+      volumeMounts:
+        - name: projector-volume
+          path: /projector-volume
+      memoryLimit: 128Mi
+      memoryRequest: 32Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
diff --git a/devfiles/next/che-pycharm/2020.3.5-next.yaml b/devfiles/next/che-pycharm/2020.3.5-next.yaml
index dc5168bf..1e7eb258 100644
--- a/devfiles/next/che-pycharm/2020.3.5-next.yaml
+++ b/devfiles/next/che-pycharm/2020.3.5-next.yaml
@@ -1,7 +1,61 @@
+schemaVersion: 2.1.0
 metadata:
-  name: che-pycharm
+  name: PyCharm Community Edition
+commands:
+  - id: init-container-command
+    apply:
+      component: che-pycharm-injector
+events:
+  preStart:
+    - init-container-command
 components:
-  - type: cheEditor
-    reference: 'https://raw.githubusercontent.com/che-incubator/jetbrains-editor-images/meta/che-pycharm/next/2020.3.5.meta.yaml'
-    alias: che-pycharm
-apiVersion: 1.0.0
+  - name: che-pycharm-runtime-description
+    container:
+      image: 'quay.io/devfile/universal-developer-image:ubi8-eda6672'
+      command:
+        - /projector/entrypoint-volume.sh
+      env:
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+        - name: PROJECTOR_CONFIG_DIR
+          value: /home/user/.jetbrains
+      volumeMounts:
+        - name: projector-volume
+          path: /projector
+      memoryLimit: 2048Mi
+      memoryRequest: 256Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
+      endpoints:
+        - name: intellij
+          attributes:
+            type: main
+            cookiesAuthEnabled: true
+            discoverable: false
+            urlRewriteSupported: true
+          targetPort: 8887
+          exposure: public
+          path: '/?backgroundColor=434343&wss'
+          secure: false
+          protocol: http
+    attributes:
+      app.kubernetes.io/component: che-pycharm-injector
+      app.kubernetes.io/part-of: che-pycharm.eclipse.org
+  - name: projector-volume
+    volume: {}
+  - name: che-pycharm-injector
+    container:
+      image: 'quay.io/che-incubator/che-pycharm:2020.3.5-next'
+      command: ["/projector/entrypoint-init-container.sh"]
+      env:
+        - name: PROJECTOR_VOLUME_MOUNT
+          value: /projector-volume
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+      volumeMounts:
+        - name: projector-volume
+          path: /projector-volume
+      memoryLimit: 128Mi
+      memoryRequest: 32Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
diff --git a/devfiles/released/che-idea/2020.3.1.yaml b/devfiles/released/che-idea/2020.3.1.yaml
index 98770805..e0bc35b4 100644
--- a/devfiles/released/che-idea/2020.3.1.yaml
+++ b/devfiles/released/che-idea/2020.3.1.yaml
@@ -1,7 +1,61 @@
+schemaVersion: 2.1.0
 metadata:
-  name: che-idea
+  name: IntelliJ IDEA Community Edition
+commands:
+  - id: init-container-command
+    apply:
+      component: che-idea-injector
+events:
+  preStart:
+    - init-container-command
 components:
-  - type: cheEditor
-    reference: 'https://raw.githubusercontent.com/che-incubator/jetbrains-editor-images/meta/che-idea/2020.3.1.meta.yaml'
-    alias: che-idea
-apiVersion: 1.0.0
+  - name: che-idea-runtime-description
+    container:
+      image: 'quay.io/devfile/universal-developer-image:ubi8-eda6672'
+      command:
+        - /projector/entrypoint-volume.sh
+      env:
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+        - name: PROJECTOR_CONFIG_DIR
+          value: /home/user/.jetbrains
+      volumeMounts:
+        - name: projector-volume
+          path: /projector
+      memoryLimit: 2048Mi
+      memoryRequest: 256Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
+      endpoints:
+        - name: intellij
+          attributes:
+            type: main
+            cookiesAuthEnabled: true
+            discoverable: false
+            urlRewriteSupported: true
+          targetPort: 8887
+          exposure: public
+          path: '/?backgroundColor=434343&wss'
+          secure: false
+          protocol: http
+    attributes:
+      app.kubernetes.io/component: che-idea-injector
+      app.kubernetes.io/part-of: che-idea.eclipse.org
+  - name: projector-volume
+    volume: {}
+  - name: che-idea-injector
+    container:
+      image: 'quay.io/che-incubator/che-idea:2020.3.1'
+      command: ["/projector/entrypoint-init-container.sh"]
+      env:
+        - name: PROJECTOR_VOLUME_MOUNT
+          value: /projector-volume
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+      volumeMounts:
+        - name: projector-volume
+          path: /projector-volume
+      memoryLimit: 128Mi
+      memoryRequest: 32Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
diff --git a/devfiles/released/che-idea/2020.3.2.yaml b/devfiles/released/che-idea/2020.3.2.yaml
index 8ef5044a..e7658284 100644
--- a/devfiles/released/che-idea/2020.3.2.yaml
+++ b/devfiles/released/che-idea/2020.3.2.yaml
@@ -1,7 +1,61 @@
+schemaVersion: 2.1.0
 metadata:
-  name: che-idea
+  name: IntelliJ IDEA Community Edition
+commands:
+  - id: init-container-command
+    apply:
+      component: che-idea-injector
+events:
+  preStart:
+    - init-container-command
 components:
-  - type: cheEditor
-    reference: 'https://raw.githubusercontent.com/che-incubator/jetbrains-editor-images/meta/che-idea/2020.3.2.meta.yaml'
-    alias: che-idea
-apiVersion: 1.0.0
+  - name: che-idea-runtime-description
+    container:
+      image: 'quay.io/devfile/universal-developer-image:ubi8-eda6672'
+      command:
+        - /projector/entrypoint-volume.sh
+      env:
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+        - name: PROJECTOR_CONFIG_DIR
+          value: /home/user/.jetbrains
+      volumeMounts:
+        - name: projector-volume
+          path: /projector
+      memoryLimit: 2048Mi
+      memoryRequest: 256Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
+      endpoints:
+        - name: intellij
+          attributes:
+            type: main
+            cookiesAuthEnabled: true
+            discoverable: false
+            urlRewriteSupported: true
+          targetPort: 8887
+          exposure: public
+          path: '/?backgroundColor=434343&wss'
+          secure: false
+          protocol: http
+    attributes:
+      app.kubernetes.io/component: che-idea-injector
+      app.kubernetes.io/part-of: che-idea.eclipse.org
+  - name: projector-volume
+    volume: {}
+  - name: che-idea-injector
+    container:
+      image: 'quay.io/che-incubator/che-idea:2020.3.2'
+      command: ["/projector/entrypoint-init-container.sh"]
+      env:
+        - name: PROJECTOR_VOLUME_MOUNT
+          value: /projector-volume
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+      volumeMounts:
+        - name: projector-volume
+          path: /projector-volume
+      memoryLimit: 128Mi
+      memoryRequest: 32Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
diff --git a/devfiles/released/che-idea/2020.3.3.yaml b/devfiles/released/che-idea/2020.3.3.yaml
index 68f18c48..f5ee5fd8 100644
--- a/devfiles/released/che-idea/2020.3.3.yaml
+++ b/devfiles/released/che-idea/2020.3.3.yaml
@@ -1,7 +1,61 @@
+schemaVersion: 2.1.0
 metadata:
-  name: che-idea
+  name: IntelliJ IDEA Community Edition
+commands:
+  - id: init-container-command
+    apply:
+      component: che-idea-injector
+events:
+  preStart:
+    - init-container-command
 components:
-  - type: cheEditor
-    reference: 'https://raw.githubusercontent.com/che-incubator/jetbrains-editor-images/meta/che-idea/2020.3.3.meta.yaml'
-    alias: che-idea
-apiVersion: 1.0.0
+  - name: che-idea-runtime-description
+    container:
+      image: 'quay.io/devfile/universal-developer-image:ubi8-eda6672'
+      command:
+        - /projector/entrypoint-volume.sh
+      env:
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+        - name: PROJECTOR_CONFIG_DIR
+          value: /home/user/.jetbrains
+      volumeMounts:
+        - name: projector-volume
+          path: /projector
+      memoryLimit: 2048Mi
+      memoryRequest: 256Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
+      endpoints:
+        - name: intellij
+          attributes:
+            type: main
+            cookiesAuthEnabled: true
+            discoverable: false
+            urlRewriteSupported: true
+          targetPort: 8887
+          exposure: public
+          path: '/?backgroundColor=434343&wss'
+          secure: false
+          protocol: http
+    attributes:
+      app.kubernetes.io/component: che-idea-injector
+      app.kubernetes.io/part-of: che-idea.eclipse.org
+  - name: projector-volume
+    volume: {}
+  - name: che-idea-injector
+    container:
+      image: 'quay.io/che-incubator/che-idea:2020.3.3'
+      command: ["/projector/entrypoint-init-container.sh"]
+      env:
+        - name: PROJECTOR_VOLUME_MOUNT
+          value: /projector-volume
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+      volumeMounts:
+        - name: projector-volume
+          path: /projector-volume
+      memoryLimit: 128Mi
+      memoryRequest: 32Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
diff --git a/devfiles/released/che-idea/2020.3.4.yaml b/devfiles/released/che-idea/2020.3.4.yaml
index 339968e3..a0eba0e9 100644
--- a/devfiles/released/che-idea/2020.3.4.yaml
+++ b/devfiles/released/che-idea/2020.3.4.yaml
@@ -1,7 +1,61 @@
+schemaVersion: 2.1.0
 metadata:
-  name: che-idea
+  name: IntelliJ IDEA Community Edition
+commands:
+  - id: init-container-command
+    apply:
+      component: che-idea-injector
+events:
+  preStart:
+    - init-container-command
 components:
-  - type: cheEditor
-    reference: 'https://raw.githubusercontent.com/che-incubator/jetbrains-editor-images/meta/che-idea/2020.3.4.meta.yaml'
-    alias: che-idea
-apiVersion: 1.0.0
+  - name: che-idea-runtime-description
+    container:
+      image: 'quay.io/devfile/universal-developer-image:ubi8-eda6672'
+      command:
+        - /projector/entrypoint-volume.sh
+      env:
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+        - name: PROJECTOR_CONFIG_DIR
+          value: /home/user/.jetbrains
+      volumeMounts:
+        - name: projector-volume
+          path: /projector
+      memoryLimit: 2048Mi
+      memoryRequest: 256Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
+      endpoints:
+        - name: intellij
+          attributes:
+            type: main
+            cookiesAuthEnabled: true
+            discoverable: false
+            urlRewriteSupported: true
+          targetPort: 8887
+          exposure: public
+          path: '/?backgroundColor=434343&wss'
+          secure: false
+          protocol: http
+    attributes:
+      app.kubernetes.io/component: che-idea-injector
+      app.kubernetes.io/part-of: che-idea.eclipse.org
+  - name: projector-volume
+    volume: {}
+  - name: che-idea-injector
+    container:
+      image: 'quay.io/che-incubator/che-idea:2020.3.4'
+      command: ["/projector/entrypoint-init-container.sh"]
+      env:
+        - name: PROJECTOR_VOLUME_MOUNT
+          value: /projector-volume
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+      volumeMounts:
+        - name: projector-volume
+          path: /projector-volume
+      memoryLimit: 128Mi
+      memoryRequest: 32Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
diff --git a/devfiles/released/che-pycharm/2020.3.1.yaml b/devfiles/released/che-pycharm/2020.3.1.yaml
index 4827dba7..83337a1b 100644
--- a/devfiles/released/che-pycharm/2020.3.1.yaml
+++ b/devfiles/released/che-pycharm/2020.3.1.yaml
@@ -1,7 +1,61 @@
+schemaVersion: 2.1.0
 metadata:
-  name: che-pycharm
+  name: PyCharm Community Edition
+commands:
+  - id: init-container-command
+    apply:
+      component: che-pycharm-injector
+events:
+  preStart:
+    - init-container-command
 components:
-  - type: cheEditor
-    reference: 'https://raw.githubusercontent.com/che-incubator/jetbrains-editor-images/meta/che-pycharm/2020.3.1.meta.yaml'
-    alias: che-pycharm
-apiVersion: 1.0.0
+  - name: che-pycharm-runtime-description
+    container:
+      image: 'quay.io/devfile/universal-developer-image:ubi8-eda6672'
+      command:
+        - /projector/entrypoint-volume.sh
+      env:
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+        - name: PROJECTOR_CONFIG_DIR
+          value: /home/user/.jetbrains
+      volumeMounts:
+        - name: projector-volume
+          path: /projector
+      memoryLimit: 2048Mi
+      memoryRequest: 256Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
+      endpoints:
+        - name: intellij
+          attributes:
+            type: main
+            cookiesAuthEnabled: true
+            discoverable: false
+            urlRewriteSupported: true
+          targetPort: 8887
+          exposure: public
+          path: '/?backgroundColor=434343&wss'
+          secure: false
+          protocol: http
+    attributes:
+      app.kubernetes.io/component: che-pycharm-injector
+      app.kubernetes.io/part-of: che-pycharm.eclipse.org
+  - name: projector-volume
+    volume: {}
+  - name: che-pycharm-injector
+    container:
+      image: 'quay.io/che-incubator/che-pycharm:2020.3.1'
+      command: ["/projector/entrypoint-init-container.sh"]
+      env:
+        - name: PROJECTOR_VOLUME_MOUNT
+          value: /projector-volume
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+      volumeMounts:
+        - name: projector-volume
+          path: /projector-volume
+      memoryLimit: 128Mi
+      memoryRequest: 32Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
diff --git a/devfiles/released/che-pycharm/2020.3.2.yaml b/devfiles/released/che-pycharm/2020.3.2.yaml
index 4973e0be..eb375058 100644
--- a/devfiles/released/che-pycharm/2020.3.2.yaml
+++ b/devfiles/released/che-pycharm/2020.3.2.yaml
@@ -1,7 +1,61 @@
+schemaVersion: 2.1.0
 metadata:
-  name: che-pycharm
+  name: PyCharm Community Edition
+commands:
+  - id: init-container-command
+    apply:
+      component: che-pycharm-injector
+events:
+  preStart:
+    - init-container-command
 components:
-  - type: cheEditor
-    reference: 'https://raw.githubusercontent.com/che-incubator/jetbrains-editor-images/meta/che-pycharm/2020.3.2.meta.yaml'
-    alias: che-pycharm
-apiVersion: 1.0.0
+  - name: che-pycharm-runtime-description
+    container:
+      image: 'quay.io/devfile/universal-developer-image:ubi8-eda6672'
+      command:
+        - /projector/entrypoint-volume.sh
+      env:
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+        - name: PROJECTOR_CONFIG_DIR
+          value: /home/user/.jetbrains
+      volumeMounts:
+        - name: projector-volume
+          path: /projector
+      memoryLimit: 2048Mi
+      memoryRequest: 256Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
+      endpoints:
+        - name: intellij
+          attributes:
+            type: main
+            cookiesAuthEnabled: true
+            discoverable: false
+            urlRewriteSupported: true
+          targetPort: 8887
+          exposure: public
+          path: '/?backgroundColor=434343&wss'
+          secure: false
+          protocol: http
+    attributes:
+      app.kubernetes.io/component: che-pycharm-injector
+      app.kubernetes.io/part-of: che-pycharm.eclipse.org
+  - name: projector-volume
+    volume: {}
+  - name: che-pycharm-injector
+    container:
+      image: 'quay.io/che-incubator/che-pycharm:2020.3.2'
+      command: ["/projector/entrypoint-init-container.sh"]
+      env:
+        - name: PROJECTOR_VOLUME_MOUNT
+          value: /projector-volume
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+      volumeMounts:
+        - name: projector-volume
+          path: /projector-volume
+      memoryLimit: 128Mi
+      memoryRequest: 32Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
diff --git a/devfiles/released/che-pycharm/2020.3.3.yaml b/devfiles/released/che-pycharm/2020.3.3.yaml
index 1eea68d5..7b139193 100644
--- a/devfiles/released/che-pycharm/2020.3.3.yaml
+++ b/devfiles/released/che-pycharm/2020.3.3.yaml
@@ -1,7 +1,61 @@
+schemaVersion: 2.1.0
 metadata:
-  name: che-pycharm
+  name: PyCharm Community Edition
+commands:
+  - id: init-container-command
+    apply:
+      component: che-pycharm-injector
+events:
+  preStart:
+    - init-container-command
 components:
-  - type: cheEditor
-    reference: 'https://raw.githubusercontent.com/che-incubator/jetbrains-editor-images/meta/che-pycharm/2020.3.3.meta.yaml'
-    alias: che-pycharm
-apiVersion: 1.0.0
+  - name: che-pycharm-runtime-description
+    container:
+      image: 'quay.io/devfile/universal-developer-image:ubi8-eda6672'
+      command:
+        - /projector/entrypoint-volume.sh
+      env:
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+        - name: PROJECTOR_CONFIG_DIR
+          value: /home/user/.jetbrains
+      volumeMounts:
+        - name: projector-volume
+          path: /projector
+      memoryLimit: 2048Mi
+      memoryRequest: 256Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
+      endpoints:
+        - name: intellij
+          attributes:
+            type: main
+            cookiesAuthEnabled: true
+            discoverable: false
+            urlRewriteSupported: true
+          targetPort: 8887
+          exposure: public
+          path: '/?backgroundColor=434343&wss'
+          secure: false
+          protocol: http
+    attributes:
+      app.kubernetes.io/component: che-pycharm-injector
+      app.kubernetes.io/part-of: che-pycharm.eclipse.org
+  - name: projector-volume
+    volume: {}
+  - name: che-pycharm-injector
+    container:
+      image: 'quay.io/che-incubator/che-pycharm:2020.3.3'
+      command: ["/projector/entrypoint-init-container.sh"]
+      env:
+        - name: PROJECTOR_VOLUME_MOUNT
+          value: /projector-volume
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+      volumeMounts:
+        - name: projector-volume
+          path: /projector-volume
+      memoryLimit: 128Mi
+      memoryRequest: 32Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
diff --git a/devfiles/released/che-pycharm/2020.3.4.yaml b/devfiles/released/che-pycharm/2020.3.4.yaml
index cee5a5fe..c962122b 100644
--- a/devfiles/released/che-pycharm/2020.3.4.yaml
+++ b/devfiles/released/che-pycharm/2020.3.4.yaml
@@ -1,7 +1,61 @@
+schemaVersion: 2.1.0
 metadata:
-  name: che-pycharm
+  name: PyCharm Community Edition
+commands:
+  - id: init-container-command
+    apply:
+      component: che-pycharm-injector
+events:
+  preStart:
+    - init-container-command
 components:
-  - type: cheEditor
-    reference: 'https://raw.githubusercontent.com/che-incubator/jetbrains-editor-images/meta/che-pycharm/2020.3.4.meta.yaml'
-    alias: che-pycharm
-apiVersion: 1.0.0
+  - name: che-pycharm-runtime-description
+    container:
+      image: 'quay.io/devfile/universal-developer-image:ubi8-eda6672'
+      command:
+        - /projector/entrypoint-volume.sh
+      env:
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+        - name: PROJECTOR_CONFIG_DIR
+          value: /home/user/.jetbrains
+      volumeMounts:
+        - name: projector-volume
+          path: /projector
+      memoryLimit: 2048Mi
+      memoryRequest: 256Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
+      endpoints:
+        - name: intellij
+          attributes:
+            type: main
+            cookiesAuthEnabled: true
+            discoverable: false
+            urlRewriteSupported: true
+          targetPort: 8887
+          exposure: public
+          path: '/?backgroundColor=434343&wss'
+          secure: false
+          protocol: http
+    attributes:
+      app.kubernetes.io/component: che-pycharm-injector
+      app.kubernetes.io/part-of: che-pycharm.eclipse.org
+  - name: projector-volume
+    volume: {}
+  - name: che-pycharm-injector
+    container:
+      image: 'quay.io/che-incubator/che-pycharm:2020.3.4'
+      command: ["/projector/entrypoint-init-container.sh"]
+      env:
+        - name: PROJECTOR_VOLUME_MOUNT
+          value: /projector-volume
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+      volumeMounts:
+        - name: projector-volume
+          path: /projector-volume
+      memoryLimit: 128Mi
+      memoryRequest: 32Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
diff --git a/devfiles/released/che-pycharm/2020.3.5.yaml b/devfiles/released/che-pycharm/2020.3.5.yaml
index 95a8aa97..b33f2af8 100644
--- a/devfiles/released/che-pycharm/2020.3.5.yaml
+++ b/devfiles/released/che-pycharm/2020.3.5.yaml
@@ -1,7 +1,61 @@
+schemaVersion: 2.1.0
 metadata:
-  name: che-pycharm
+  name: PyCharm Community Edition
+commands:
+  - id: init-container-command
+    apply:
+      component: che-pycharm-injector
+events:
+  preStart:
+    - init-container-command
 components:
-  - type: cheEditor
-    reference: 'https://raw.githubusercontent.com/che-incubator/jetbrains-editor-images/meta/che-pycharm/2020.3.5.meta.yaml'
-    alias: che-pycharm
-apiVersion: 1.0.0
+  - name: che-pycharm-runtime-description
+    container:
+      image: 'quay.io/devfile/universal-developer-image:ubi8-eda6672'
+      command:
+        - /projector/entrypoint-volume.sh
+      env:
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+        - name: PROJECTOR_CONFIG_DIR
+          value: /home/user/.jetbrains
+      volumeMounts:
+        - name: projector-volume
+          path: /projector
+      memoryLimit: 2048Mi
+      memoryRequest: 256Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
+      endpoints:
+        - name: intellij
+          attributes:
+            type: main
+            cookiesAuthEnabled: true
+            discoverable: false
+            urlRewriteSupported: true
+          targetPort: 8887
+          exposure: public
+          path: '/?backgroundColor=434343&wss'
+          secure: false
+          protocol: http
+    attributes:
+      app.kubernetes.io/component: che-pycharm-injector
+      app.kubernetes.io/part-of: che-pycharm.eclipse.org
+  - name: projector-volume
+    volume: {}
+  - name: che-pycharm-injector
+    container:
+      image: 'quay.io/che-incubator/che-pycharm:2020.3.5'
+      command: ["/projector/entrypoint-init-container.sh"]
+      env:
+        - name: PROJECTOR_VOLUME_MOUNT
+          value: /projector-volume
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+      volumeMounts:
+        - name: projector-volume
+          path: /projector-volume
+      memoryLimit: 128Mi
+      memoryRequest: 32Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
diff --git a/devfiles/released/che-pycharm/2020.3.yaml b/devfiles/released/che-pycharm/2020.3.yaml
index 635dadb8..faeadc0d 100644
--- a/devfiles/released/che-pycharm/2020.3.yaml
+++ b/devfiles/released/che-pycharm/2020.3.yaml
@@ -1,7 +1,61 @@
+schemaVersion: 2.1.0
 metadata:
-  name: che-pycharm
+  name: PyCharm Community Edition
+commands:
+  - id: init-container-command
+    apply:
+      component: che-pycharm-injector
+events:
+  preStart:
+    - init-container-command
 components:
-  - type: cheEditor
-    reference: 'https://raw.githubusercontent.com/che-incubator/jetbrains-editor-images/meta/che-pycharm/2020.3.meta.yaml'
-    alias: che-pycharm
-apiVersion: 1.0.0
+  - name: che-pycharm-runtime-description
+    container:
+      image: 'quay.io/devfile/universal-developer-image:ubi8-eda6672'
+      command:
+        - /projector/entrypoint-volume.sh
+      env:
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+        - name: PROJECTOR_CONFIG_DIR
+          value: /home/user/.jetbrains
+      volumeMounts:
+        - name: projector-volume
+          path: /projector
+      memoryLimit: 2048Mi
+      memoryRequest: 256Mi
+      cpuLimit: 500m
+      cpuRequest: 30m
+      endpoints:
+        - name: intellij
+          attributes:
+            type: main
+            cookiesAuthEnabled: true
+            discoverable: false
+            urlRewriteSupported: true
+          targetPort: 8887
+          exposure: public
+          path: '/?backgroundColor=434343&wss'
+          secure: false
+          protocol: http
+    attributes:
+      app.kubernetes.io/component: che-pycharm-injector
+      app.kubernetes.io/part-of: che-pycharm.eclipse.org
+  - name: projector-volume
+    volume: {}
+  - name: che-pycharm-injector
+    container:
+      image: 'quay.io/che-incubator/che-pycharm:2020.3'
+      command: ["/projector/entrypoint-init-container.sh"]
+      env:
+        - name: PROJECTOR_VOLUME_MOUNT
+          value: /projector-volume
+        - name: PROJECTOR_ASSEMBLY_DIR
+          value: /projector
+      volumeMounts:
+        - name: projector-volume
+          path: /projector-volume
+      memoryLimit: 128Mi
+      memoryRequest: 32Mi
+      cpuLimit: 500m
+      cpuRequest: 30m